diff options
| author | Marius Halden <marius.h@lden.org> | 2016-05-28 13:49:00 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-05-28 13:49:00 +0200 |
| commit | 6791ce86ae15adbded24bd814a78cc0e87f404fa (patch) | |
| tree | 99af5da31e4db091350a09bcdee913c99abc2fc3 | |
| parent | 6c1118dbf2c4b15bcfcd77600d36f2389428c75e (diff) | |
| parent | 89b0efeb94631c4c31ce33e7f98297e754dd226d (diff) | |
Merge tag 'v1.8.2' into fiksgatami-dev
403 files changed, 11536 insertions, 19168 deletions
diff --git a/.travis.yml b/.travis.yml index 6a2085785..37460292c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,6 @@ before_install: install: - .travis/install before_script: - - ./bin/make_po FixMyStreet-EmptyHomes - - ./bin/emptyhomes/make_welsh_po - commonlib/bin/gettext-makemo FixMyStreet script: "bin/run-tests t" after_success: @@ -40,6 +40,37 @@ We've extracted all of the mobile apps from this repository into the ## Releases +* v1.8.2 (3rd May 2016) + - Security: + - Fix vulnerability in image upload that allowed external + command execution. + - New features + - Twitter social login. #1377 + - PNG image upload support. #1302 #1361 + - Front end improvements: + - Switch list item heading from h4 to h3. #1348 + - Preserve category when clicking elsewhere on map. + - Optimize store logo PNGs. + - Admin improvements + - Default new category creation to confirmed. #1266 + - Use better link to reports on admin body page. + - Bugfixes: + - Show right body user form value for fixed reports. #1369 + - Cope with a '/' in body name slug. #574 + - Ignore empty entries in the image upload IDs. + - Use transparent border in tips/change_location. #1380 + - Development improvements: + - Allow cobrands to control front page number colours. + - Refactor email handling to use Email::MIME alone. #1366 + - Improve testing on Mac OS X. + - Prevent dev sites auto-creating session. + - Display used send method in debug line. + - Remove unused cobrands. #1383 + - Finally combine remaining base/fixmystreet templates. + - Don't warn on bad photo hashes. + - Skip fetched updates if they're out of date range. #1390 + - Store Open311 error in report on failure. #1391 + * v1.8.1 (23rd March 2016) - Front end improvements: - Remember user's last anonymous state. #150 diff --git a/bin/emptyhomes/canonicalise-eha b/bin/emptyhomes/canonicalise-eha deleted file mode 100755 index 1030982fa..000000000 --- a/bin/emptyhomes/canonicalise-eha +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/perl -w - -# canonicalise-eha: -# Convert provided TSV file into one with standard names for MaPit -# -# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. -# Email: matthew@mysociety.org. WWW: http://www.mysociety.org -# -# $Id: canonicalise-eha,v 1.1 2009-05-27 11:11:18 matthew Exp $ - -use strict; -require 5.8.0; - -# Horrible boilerplate to set up appropriate library paths. -use FindBin; -use lib "$FindBin::Bin/../perllib"; -use lib "$FindBin::Bin/../commonlib/perllib"; - -use mySociety::Config; -use mySociety::MaPit; -use mySociety::VotingArea; - -BEGIN { - mySociety::Config::set_file("$FindBin::Bin/../conf/general"); - mySociety::MaPit::configure(); -} - -my %councils; -open(FP, "$FindBin::Bin/../data/eha_listN"); -while (<FP>) { - s/\r?\n//g; - my ($name, $email) = split /\s*\t+\s*/; - $email ||= ''; - #$name = 'Blackburn' if $name eq 'Blackburn with Darwen'; - $name =~ s/^St /St. /; - $name =~ s/-(upon|on|le)-/ $1 /; - $name =~ s/^LB //; - $name =~ s/ BC| DC| MDC| MBC| (Metropolitan|Borough|District|County|City) Council| Council//; - print "Already have $name\n" if $councils{$name}; - $councils{$name} = $email; -} -close(FP); - -my @types = grep { $_ !~ /CTY|LGD/ } @$mySociety::VotingArea::council_parent_types; -my (%out); -foreach my $type (@types) { - my $areas = mySociety::MaPit::get_areas_by_type($type); - my $areas_info = mySociety::MaPit::get_voting_areas_info($areas); - foreach my $id (keys %$areas_info) { - my $area_info = $areas_info->{$id}; - next if $area_info->{country} eq 'S'; - my $name = $area_info->{name}; - if ($name eq 'Durham City Council') { - $out{$id} = $councils{'Durham City'}; - delete $councils{'Durham City'}; - next; - #} elsif ($name eq 'Durham County Council') { - # $out{$id} = $councils{'Durham County'}; - # next; - } - $name =~ s/( (Borough|City|District|County))* Council//; - if ($councils{$name} && $councils{$name} =~ /@/) { - $out{$id} = $councils{$name}; - delete $councils{$name}; - } else { - print "Problem: $name $area_info->{country}\n"; - } - } -} - -foreach (sort keys %councils) { - print "Not matched: $_ $councils{$_}\n"; -} - -# Output emails to canonical CSV -open(FP, ">$FindBin::Bin/../data/eha.csv"); -foreach (sort keys %out) { - print FP "$_," . $out{$_} . "\n"; -} -close FP; diff --git a/bin/emptyhomes/make_welsh_po b/bin/emptyhomes/make_welsh_po deleted file mode 100755 index 568ccdcde..000000000 --- a/bin/emptyhomes/make_welsh_po +++ /dev/null @@ -1,116 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; - -# Given a translation of the Empty Homes version of the FixMyStreet .po file, -# fix it all up to go direct from FixMyStreet -> EH translation. - -use POSIX; -use FindBin; -use lib "$FindBin::Bin/../../perllib"; -use PoChange; - -chdir("$FindBin::Bin/../../locale"); - -# First read in translation and match up. -open(INPO, 'cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po') or die $!; - -my $state = 'start'; -my $msgid = ''; -my $fuzzy = 0; -my $msgstr; -my %lookup; -while (<INPO>) { - if (m/^#, fuzzy/) { - $fuzzy = 1; - } elsif (m/^#/) { - # comment or blank line - } elsif (m/^\s+$/) { - # blank line separates translations - $msgid =~ s/"\n"//g; - $lookup{$msgid} = [ $msgstr, $fuzzy ]; - $state = 'msgid'; - $msgid = ""; - $fuzzy = 0; - } elsif ($state eq 'msgid' && (m/^msgstr "/ || m/^msgstr\[0\] "/)) { - $msgstr = $_; - $state = 'msgstr'; - } elsif ($state eq 'msgstr') { - $msgstr .= $_; - } elsif ($state eq 'msgid') { - $msgid .= $_; - } -} -$lookup{$msgid} = [ $msgstr, $fuzzy ]; -close INPO; - -mkdir("en_GB.UTF-8"); -mkdir("en_GB.UTF-8/LC_MESSAGES"); -mkdir("cy_GB.UTF-8"); -mkdir("cy_GB.UTF-8/LC_MESSAGES"); - -open(MAINPO, 'FixMyStreet.po') or die; -open(OUTPO, ">cy_GB.UTF-8/LC_MESSAGES/FixMyStreet-EmptyHomes.po") or die; - -print OUTPO "# AUTOMATICALLY GENERATED by make_welsh_po, do not edit\n\n"; - -my $buffer = ""; -my $start = 0; -while(<MAINPO>) { - if (!$start) { - s/#, fuzzy/#/; - } - if (m/"Last-Translator: FULL NAME/) { - $_ = '"Last-Translator: mysociety/bin/emptyhomes/make_welsh_po\\n"'."\n"; - } - if (m/"PO-Revision-Date: YEAR-MO-DA/) { - my $time = POSIX::strftime("%Y-%m-%d %H:%M%z", localtime(time())); - $_ = '"PO-Revision-Date: '.$time.'\\n"'."\n"; - } - if (m/"Language-Team: LANGUAGE/) { - $_ = '"Language-Team: mySociety\\n"'."\n"; - } - if (m/"Plural-Forms: nplurals=/) { - $_ = '"Plural-Forms: nplurals=2; plural=n != 1;\\n"'."\n"; - } - - if (m/^#/) { - # comment or blank line - print OUTPO $_; - } elsif (m/^\s+$/) { - # blank line - $start = 1; - $buffer = ""; - print OUTPO $_; - } elsif ($start && (m/^msgstr "/ || m/^msgstr\[0\] "/)) { - # start of translated text - translate English into Empty Homes language - my $new_buffer = PoChange::fixmystreet_to_reportemptyhomes($buffer); - $new_buffer =~ s/"\n"//g; - - if ($lookup{$new_buffer} && $lookup{$new_buffer}[1]) { - print OUTPO "#, fuzzy\n"; - } - - print OUTPO $buffer; - if ($lookup{$new_buffer}) { - print OUTPO $lookup{$new_buffer}[0]; - } else { - if (m/^msgstr\[0\] ""/) { - $new_buffer =~ s/^msgid "/msgstr[0] "/m; - $new_buffer =~ s/^msgid_plural "/msgstr[1] "/m; - $_ = <MAINPO>; # skip untranslated plural - } else { - $new_buffer =~ s/^msgid "/msgstr "/; - } - print OUTPO $new_buffer; - } - - $buffer = ""; - } elsif (!$start) { - print OUTPO $_; - } else { - $buffer .= $_; - } -} - diff --git a/bin/gettext-extract b/bin/gettext-extract index ca37e9d6d..1c0771f9e 100755 --- a/bin/gettext-extract +++ b/bin/gettext-extract @@ -20,7 +20,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 -name '*.html' > template_list +find templates/web/base 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 @@ -34,6 +34,3 @@ bin/update_po_header.bash $PO echo "$( bin/gettext-nget-patch )" >> $PO -#bin/make_po FixMyStreet-EmptyHomes -#bin/make_po FixMyBarangay - diff --git a/bin/gettext-merge b/bin/gettext-merge index b84708ece..373b39b31 100755 --- a/bin/gettext-merge +++ b/bin/gettext-merge @@ -14,11 +14,6 @@ do then cd $X/LC_MESSAGES echo $X - if [ -e EmptyHomes.po ] - then - msgmerge --no-wrap -o New.po EmptyHomes.po ../../FixMyStreet-EmptyHomes.po - mv New.po EmptyHomes.po - fi if [ -e FixMyStreet.po ] then msgmerge --no-wrap -o New.po FixMyStreet.po ../../FixMyStreet.po diff --git a/bin/handlemail b/bin/handlemail index e91a8a3a0..55a053963 100755 --- a/bin/handlemail +++ b/bin/handlemail @@ -22,7 +22,6 @@ BEGIN { use FixMyStreet; use FixMyStreet::DB; use FixMyStreet::Email; -use mySociety::Email; use mySociety::EmailUtil; use mySociety::HandleMail; use mySociety::SystemMisc qw(print_log); @@ -168,14 +167,13 @@ sub handle_non_bounce_to_null_address { $fp->close; # We generate this as a bounce. - my $mail = mySociety::Email::construct_email({ + my $mail = FixMyStreet::Email::construct_email({ From => [ FixMyStreet->config('CONTACT_EMAIL'), 'FixMyStreet' ], To => $data{return_path}, _template_ => $template, _parameters_ => { }, - _line_indent => '', }); - send_mail($mail, '<>', $data{return_path}); + send_mail($mail->as_string, '<>', $data{return_path}); } sub forward_on_to { diff --git a/bin/install-as-user b/bin/install-as-user index 0e1c151fb..297efc1f3 100755 --- a/bin/install-as-user +++ b/bin/install-as-user @@ -133,8 +133,6 @@ echo $DONE_MSG # Generate po and mo files (these invocations taken from Kagee's script): echo "Creating locale .mo files" -bin/make_po FixMyStreet-EmptyHomes -bin/emptyhomes/make_welsh_po commonlib/bin/gettext-makemo FixMyStreet echo $DONE_MSG diff --git a/bin/problem-creation-graph b/bin/problem-creation-graph index a8554058a..d1fe08fd4 100755 --- a/bin/problem-creation-graph +++ b/bin/problem-creation-graph @@ -34,7 +34,6 @@ my %config = ( my $base_url = FixMyStreet->config('BASE_URL'); $config{date} = '2007-02-01'; $config{date} = '2011-03-03' if $base_url =~ /fiksgatami/; -$config{date} = '2008-10-01' if $base_url =~ /emptyhomes/; my %sources; sub grab_data { diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index d20a15ea2..8cca28650 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.8.1} +VERSION=${VERSION_OVERRIDE:-v1.8.2} PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh diff --git a/bin/update-all-reports b/bin/update-all-reports index d951756e4..6691ff4f0 100755 --- a/bin/update-all-reports +++ b/bin/update-all-reports @@ -81,14 +81,6 @@ while ( my @problem = $problems->next ) { } } -if ( FixMyStreet->config('BASE_URL') =~ /emptyhomes/ ) { - my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('emptyhomes')->new(); - my $stats = $cobrand->old_site_stats; - foreach (keys %$stats) { - $open{$_}{unknown} += $stats->{$_}; - } -} - my $body = encode_json( { fixed => \%fixed, open => \%open, diff --git a/bin/zurich/update_report_descriptions.sql b/bin/zurich/update_report_descriptions.sql new file mode 100644 index 000000000..13616aeac --- /dev/null +++ b/bin/zurich/update_report_descriptions.sql @@ -0,0 +1,23 @@ +-- Zurich would like to update the detail text of a whole bunch +-- of reports on the site. They've provided a CSV file with the report id +-- and the new detail text for the reports in question. +-- This script applies the new details to the database +-- from the file 'report_updates.txt'. This file must be stripped +-- of its header row or errors will occur. +BEGIN; + +CREATE TEMP TABLE report_updates (id int, detail text); + +\copy report_updates FROM 'report_updates.txt' WITH (FORMAT CSV) + +UPDATE problem +SET detail = report_updates.detail +FROM report_updates +WHERE problem.id = report_updates.id +-- Only update a report if its detail field has actually changed: +AND problem.detail != report_updates.detail; + + +DROP TABLE report_updates; + +COMMIT; @@ -51,7 +51,6 @@ requires 'Digest::SHA'; requires 'Email::MIME'; requires 'Email::Send'; requires 'Email::Send::SMTP'; -requires 'Email::Simple'; requires 'Email::Valid'; requires 'Error'; requires 'FCGI'; @@ -97,7 +96,7 @@ requires 'XML::Simple'; requires 'YAML'; feature 'uk', 'FixMyStreet.com specific requirements' => sub { - # East Hampshire + # East Hampshire & Angus requires 'SOAP::Lite'; }; diff --git a/data/angus/openlayers.angus.cfg b/data/angus/openlayers.angus.cfg new file mode 100644 index 000000000..c8e18dee8 --- /dev/null +++ b/data/angus/openlayers.angus.cfg @@ -0,0 +1,50 @@ +# This file includes the OpenLayers code that FixMyStreet currently uses. + +[first] + +[last] + +[include] +# Have to include the renderers manually +OpenLayers/Renderer/Canvas.js +OpenLayers/Renderer/SVG.js +OpenLayers/Renderer/VML.js +OpenLayers/Strategy/Fixed.js +OpenLayers/Strategy/BBOX.js +OpenLayers/Control/ArgParser.js +OpenLayers/Control/Attribution.js +OpenLayers/Control/DragFeature.js +OpenLayers/Control/Navigation.js +OpenLayers/Control/PanZoom.js +OpenLayers/Control/PinchZoom.js +OpenLayers/Control/Permalink.js +OpenLayers/Control/SelectFeature.js +OpenLayers/Format/JSON.js +OpenLayers/Format/KML.js +OpenLayers/Handler/Click.js +OpenLayers/Feature/Vector.js +OpenLayers/Rule.js +OpenLayers/Style.js +OpenLayers/StyleMap.js +OpenLayers/Geometry/Point.js +OpenLayers/Protocol/HTTP.js +OpenLayers/Layer/Vector.js +OpenLayers/Layer/OSM.js +OpenLayers/Popup/FramedCloud.js +# Needed by Protocol/HTTP (for Strategy/BBOX bbox) +# This loads in needed Filters too. +OpenLayers/Format/QueryStringFilter.js +# For Angus cobrand +OpenLayers/Format/WFS.js +OpenLayers/Format/WFSCapabilities.js +OpenLayers/Format/WFSCapabilities/v1.js +OpenLayers/Format/WFSCapabilities/v1_0_0.js +OpenLayers/Format/WFSCapabilities/v1_1_0.js +OpenLayers/Format/WFSDescribeFeatureType.js +OpenLayers/Protocol/WFS.js +OpenLayers/Protocol/WFS/v1.js +OpenLayers/Protocol/WFS/v1_0_0.js +OpenLayers/Protocol/WFS/v1_1_0.js + +[exclude] + diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index f0fcc789b..a58f8d855 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "" @@ -78,7 +78,7 @@ msgstr "" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -97,10 +97,6 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -150,7 +146,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "" @@ -162,11 +158,11 @@ msgstr "" msgid "(sent to both)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 perllib/FixMyStreet/DB/Result/Problem.pm:410 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 perllib/FixMyStreet/DB/Result/Problem.pm:416 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -195,19 +191,15 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 templates/web/zurich/auth/general.html:51 +#: templates/web/base/auth/general.html:97 templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/auth/general.html:70 templates/web/base/report/new/form_user_loggedout_password.html:3 templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/auth/general.html:80 templates/web/base/report/new/form_user_loggedout_password.html:3 templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/about/about-en-gb.html:1 templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "" - -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:35 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -234,7 +226,7 @@ msgstr "" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "" @@ -254,7 +246,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "" @@ -266,7 +258,7 @@ msgstr "" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 templates/web/zurich/nav_over_content.html:6 +#: templates/web/base/footer.html:32 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "" @@ -350,7 +342,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 perllib/FixMyStreet/Cobrand/Zurich.pm:392 templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 perllib/FixMyStreet/Cobrand/Zurich.pm:392 templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -374,7 +366,7 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/admin/body.html:68 templates/web/base/admin/index.html:54 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 +#: templates/web/base/admin/body.html:68 templates/web/base/admin/index.html:54 templates/web/base/report/new/category.html:7 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 "" @@ -382,7 +374,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 templates/web/base/admin/category_edit.html:23 templates/web/base/admin/report_edit.html:56 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/report_edit-sdm.html:70 templates/web/zurich/admin/report_edit.html:98 +#: templates/web/base/admin/body.html:137 templates/web/base/admin/category_edit.html:23 templates/web/base/admin/report_edit.html:56 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/report_edit-sdm.html:70 templates/web/zurich/admin/report_edit.html:98 msgid "Category:" msgstr "" @@ -394,19 +386,19 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -417,7 +409,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -451,11 +443,11 @@ msgstr "" msgid "Click the link in our confirmation email to sign in." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 perllib/FixMyStreet/Cobrand/Zurich.pm:969 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/admin/report_blocks.html:25 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:16 templates/web/zurich/admin/stats.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 perllib/FixMyStreet/Cobrand/Zurich.pm:969 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/admin/report_blocks.html:25 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:16 templates/web/zurich/admin/stats.html:31 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -479,7 +471,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 templates/web/base/admin/config_page.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -503,7 +495,7 @@ msgstr "" 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:92 templates/web/zurich/admin/stats.html:40 +#: templates/web/base/admin/body.html:164 templates/web/base/admin/body.html:79 templates/web/base/admin/category_edit.html:37 templates/web/base/admin/category_edit.html:92 templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "" @@ -516,7 +508,7 @@ msgid "Confirmed:" msgstr "" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -532,7 +524,7 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "" @@ -548,7 +540,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -564,7 +556,7 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/base/admin/body.html:208 templates/web/zurich/admin/body.html:59 +#: templates/web/base/admin/body.html:206 templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "" @@ -600,19 +592,19 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 templates/web/zurich/admin/template_edit.html:33 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: 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:93 +#: templates/web/base/admin/bodies.html:27 templates/web/base/admin/body.html:175 templates/web/base/admin/body.html:81 templates/web/base/admin/category_edit.html:42 templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "" -#: templates/web/base/report/new/form_report.html:45 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/base/report/new/form_report.html:47 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:68 +#: templates/web/base/js/translation_strings.html:34 templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "" @@ -633,7 +625,7 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 templates/web/base/report/new/form_user_loggedout.html:18 templates/web/base/report/new/oauth_email_form.html:18 templates/web/base/report/update-form.html:29 templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/auth/general.html:58 templates/web/base/report/new/form_user_loggedout.html:28 templates/web/base/report/new/oauth_email_form.html:18 templates/web/base/report/update-form.html:29 templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -649,7 +641,7 @@ msgstr "" msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:36 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -665,7 +657,7 @@ msgstr "" msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:220 templates/web/zurich/admin/body.html:71 +#: templates/web/base/admin/body.html:218 templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -685,15 +677,15 @@ msgstr "" msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:23 templates/web/base/admin/category_edit.html:91 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users.html:16 templates/web/base/auth/general.html:39 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:91 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users.html:16 templates/web/base/auth/general.html:49 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:24 templates/web/zurich/auth/general.html:54 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -705,15 +697,11 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "" - -#: templates/web/base/admin/category_edit.html:31 templates/web/base/admin/report_edit.html:62 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/zurich/admin/body.html:47 +#: templates/web/base/admin/category_edit.html:31 templates/web/base/admin/report_edit.html:62 templates/web/base/admin/update_edit.html:33 templates/web/base/admin/user-form.html:20 templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "" @@ -721,26 +709,6 @@ msgstr "" msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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" @@ -780,15 +748,11 @@ msgstr "" 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:99 templates/web/base/report/new/form_user_loggedout_by_email.html:38 templates/web/base/report/update/form_user_loggedout_by_email.html:13 templates/web/zurich/auth/general.html:65 +#: templates/web/base/auth/general.html:109 templates/web/base/report/new/form_user_loggedout_by_email.html:38 templates/web/base/report/update/form_user_loggedout_by_email.html:13 templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "" @@ -808,7 +772,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -840,11 +804,7 @@ msgstr "" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "" - -#: templates/web/base/admin/index.html:54 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:24 templates/web/base/admin/report_blocks.html:9 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/banner.html:12 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:38 +#: templates/web/base/admin/index.html:54 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:24 templates/web/base/admin/report_blocks.html:9 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/banner.html:12 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "" @@ -868,7 +828,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 templates/web/base/admin/users.html:19 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -888,7 +848,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -916,15 +876,15 @@ msgstr "" msgid "GeoRSS on Google Maps" msgstr "" -#: templates/web/base/report/display_tools.html:11 templates/web/fixmystreet/around/_updates.html:3 +#: templates/web/base/around/_updates.html:3 templates/web/base/report/display_tools.html:11 msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:3 templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:11 templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -936,7 +896,7 @@ msgstr "" msgid "Glad to hear it’s been fixed!" msgstr "" -#: templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:16 templates/web/base/reports/_list-filters.html:28 templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:13 templates/web/base/reports/_list-filters.html:28 templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "" @@ -960,7 +920,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/fixmystreet/footer.html:38 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:22 templates/web/zurich/nav_over_content.html:8 +#: templates/web/base/footer.html:38 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:22 templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "" @@ -968,7 +928,7 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "" @@ -976,11 +936,11 @@ msgstr "" msgid "Hidden" msgstr "" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "" @@ -1000,10 +960,6 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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 "" @@ -1012,7 +968,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1026,7 +982,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1046,7 +1002,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1078,7 +1034,7 @@ msgstr "" 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_update.html:34 templates/web/base/report/update/form_update.html:36 +#: templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "" @@ -1122,7 +1078,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "" @@ -1130,11 +1086,11 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:5 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:143 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:35 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:5 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "" @@ -1154,7 +1110,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 templates/web/base/report/new/form_user_loggedout_password.html:16 templates/web/base/report/update/form_user_loggedout_password.html:15 templates/web/zurich/auth/general.html:40 +#: templates/web/base/auth/general.html:90 templates/web/base/report/new/form_user_loggedout_password.html:16 templates/web/base/report/update/form_user_loggedout_password.html:15 templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "" @@ -1182,7 +1138,7 @@ msgstr "" 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 +#: templates/web/base/alert/choose.html:1 templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" msgstr "" @@ -1190,11 +1146,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "" @@ -1246,7 +1202,7 @@ msgstr "" msgid "Month" 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/auth/general.html:89 templates/web/base/report/new/form_user_loggedin.html:9 templates/web/base/report/new/form_user_loggedout_by_email.html:7 templates/web/base/report/update/form_name.html:4 templates/web/base/reports/index.html:20 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:82 +#: 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/auth/general.html:99 templates/web/base/report/new/form_user_loggedin.html:9 templates/web/base/report/new/form_user_loggedout_by_email.html:7 templates/web/base/report/update/form_name.html:5 templates/web/base/reports/index.html:20 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:84 msgid "Name" msgstr "" @@ -1266,7 +1222,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1288,7 +1244,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1340,7 +1296,7 @@ msgstr "" 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:59 templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:25 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:101 templates/web/base/questionnaire/index.html:53 +#: 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:59 templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:25 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:102 templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "" @@ -1398,7 +1354,7 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:37 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1426,7 +1382,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:186 templates/web/base/admin/category_edit.html:52 templates/web/zurich/admin/body.html:53 +#: templates/web/base/admin/body.html:184 templates/web/base/admin/category_edit.html:52 templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "" @@ -1438,11 +1394,11 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 templates/web/base/report/new/form_user_loggedout.html:2 templates/web/base/report/new/oauth_email_form.html:17 +#: templates/web/base/report/new/form_user_loggedout.html:2 templates/web/base/report/new/form_user_loggedout.html:24 templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:28 templates/web/base/report/update/form_user_loggedout.html:13 templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update-form.html:28 templates/web/base/report/update/form_user_loggedout.html:2 templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1470,7 +1426,7 @@ msgstr "" msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:176 perllib/FixMyStreet/Cobrand/Zurich.pm:909 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:23 templates/web/base/admin/report_blocks.html:4 templates/web/base/admin/update_edit.html:28 templates/web/base/dashboard/index.html:142 templates/web/base/report/update/form_update.html:34 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:176 perllib/FixMyStreet/Cobrand/Zurich.pm:909 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:23 templates/web/base/admin/report_blocks.html:4 templates/web/base/admin/update_edit.html:28 templates/web/base/dashboard/index.html:140 templates/web/base/report/update/form_update.html:36 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "" @@ -1502,7 +1458,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:1055 perllib/FixMyStreet/App/Controller/Report/New.pm:668 perllib/FixMyStreet/App/Controller/Report/New.pm:669 perllib/FixMyStreet/DB/Result/Problem.pm:558 perllib/FixMyStreet/DB/Result/Problem.pm:568 perllib/FixMyStreet/DB/Result/Problem.pm:578 perllib/FixMyStreet/DB/Result/Problem.pm:590 perllib/FixMyStreet/Script/Reports.pm:175 perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/DB/Result/Problem.pm:562 perllib/FixMyStreet/DB/Result/Problem.pm:572 perllib/FixMyStreet/DB/Result/Problem.pm:582 perllib/FixMyStreet/DB/Result/Problem.pm:594 perllib/FixMyStreet/Script/Reports.pm:175 perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "" @@ -1522,11 +1478,11 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:92 templates/web/base/report/new/form_user_loggedout_by_email.html:31 templates/web/base/report/update/form_user_loggedout_by_email.html:6 templates/web/zurich/auth/general.html:32 templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/general.html:102 templates/web/base/report/new/form_user_loggedout_by_email.html:31 templates/web/base/report/update/form_user_loggedout_by_email.html:6 templates/web/zurich/auth/general.html:32 templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" -#: templates/web/base/auth/change_password.html:25 templates/web/base/auth/general.html:72 +#: templates/web/base/auth/change_password.html:25 templates/web/base/auth/general.html:82 msgid "Password:" msgstr "" @@ -1534,7 +1490,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1546,7 +1502,7 @@ msgstr "" msgid "Phone:" msgstr "" -#: templates/web/base/questionnaire/index.html:75 templates/web/base/report/new/form_report.html:23 templates/web/base/report/update/form_update.html:6 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:45 +#: templates/web/base/questionnaire/index.html:75 templates/web/base/questionnaire/index.html:89 templates/web/base/questionnaire/index.html:91 templates/web/base/report/new/form_report.html:23 templates/web/base/report/new/form_report.html:38 templates/web/base/report/new/form_report.html:40 templates/web/base/report/update/form_update.html:20 templates/web/base/report/update/form_update.html:22 templates/web/base/report/update/form_update.html:6 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:45 templates/web/zurich/report/new/fill_in_details_form.html:61 templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "" @@ -1566,7 +1522,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:949 perllib/FixMyStreet/Cobrand/Zurich.pm:955 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:6 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 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:949 perllib/FixMyStreet/Cobrand/Zurich.pm:955 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:6 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 msgid "Planned" msgstr "" @@ -1578,11 +1534,11 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 templates/web/base/auth/general.html:33 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:9 +#: templates/web/base/auth/general.html:37 templates/web/base/auth/general.html:43 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 perllib/FixMyStreet/App/Controller/Report/New.pm:878 perllib/FixMyStreet/App/Controller/Report/New.pm:943 perllib/FixMyStreet/DB/Result/Problem.pm:412 templates/web/base/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 perllib/FixMyStreet/App/Controller/Report/New.pm:856 perllib/FixMyStreet/App/Controller/Report/New.pm:921 perllib/FixMyStreet/DB/Result/Problem.pm:412 templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" @@ -1590,7 +1546,7 @@ msgstr "" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1609,7 +1565,7 @@ msgstr "" msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" msgstr "" @@ -1621,7 +1577,7 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 perllib/FixMyStreet/App/Controller/Admin.pm:1142 perllib/FixMyStreet/App/Controller/Admin.pm:345 perllib/FixMyStreet/DB/Result/User.pm:133 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 perllib/FixMyStreet/App/Controller/Admin.pm:1130 perllib/FixMyStreet/App/Controller/Admin.pm:345 perllib/FixMyStreet/DB/Result/User.pm:143 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" msgstr "" @@ -1633,11 +1589,11 @@ msgstr "" msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:113 perllib/FixMyStreet/DB/Result/User.pm:130 templates/web/base/auth/general.html:27 templates/web/base/auth/general.html:32 templates/web/base/js/translation_strings.html:11 templates/web/base/js/translation_strings.html:15 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 perllib/FixMyStreet/DB/Result/User.pm:140 templates/web/base/auth/general.html:37 templates/web/base/auth/general.html:42 templates/web/base/js/translation_strings.html:11 templates/web/base/js/translation_strings.html:15 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_email.html:7 templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "" @@ -1649,7 +1605,7 @@ msgstr "" msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:122 perllib/FixMyStreet/DB/Result/Problem.pm:406 perllib/FixMyStreet/DB/Result/User.pm:126 templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:122 perllib/FixMyStreet/DB/Result/Problem.pm:406 perllib/FixMyStreet/DB/Result/User.pm:136 templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1673,7 +1629,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -1681,7 +1637,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -1705,15 +1661,15 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -1729,19 +1685,19 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 perllib/FixMyStreet/App/Model/PhotoSet.pm:145 perllib/FixMyStreet/App/Model/PhotoSet.pm:147 templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 perllib/FixMyStreet/App/Model/PhotoSet.pm:150 perllib/FixMyStreet/App/Model/PhotoSet.pm:152 templates/web/base/js/translation_strings.html:53 +msgid "Please upload an image only" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "" @@ -1769,7 +1725,7 @@ msgstr "" msgid "Previous" msgstr "" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -1777,7 +1733,7 @@ msgstr "" msgid "Privacy and cookies" 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:77 +#: templates/web/base/admin/body.html:200 templates/web/base/admin/body.html:85 templates/web/base/admin/category_edit.html:45 templates/web/base/admin/report_edit.html:77 msgid "Private" msgstr "" @@ -1801,7 +1757,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "" @@ -1813,10 +1769,6 @@ msgstr "" msgid "Problems" msgstr "" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" @@ -1833,11 +1785,11 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:663 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 perllib/FixMyStreet/Cobrand/UK.pm:208 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 perllib/FixMyStreet/Cobrand/UK.pm:222 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -1854,15 +1806,11 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -1890,11 +1838,11 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" -#: templates/web/base/alert/_list.html:22 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display_tools.html:34 templates/web/base/reports/_rss.html:1 templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/base/alert/_list.html:22 templates/web/base/alert/updates.html:9 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display_tools.html:34 msgid "RSS feed" msgstr "" @@ -1918,15 +1866,11 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:664 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 perllib/FixMyStreet/Cobrand/UK.pm:215 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -1934,11 +1878,11 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/base/report/display_tools.html:34 templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/base/alert/updates.html:9 templates/web/base/report/display_tools.html:34 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 templates/web/base/report/display_tools.html:36 templates/web/fixmystreet/alert/updates.html:14 +#: templates/web/base/alert/updates.html:14 templates/web/base/report/display_tools.html:36 msgid "Receive email when updates are left on this problem." msgstr "" @@ -1971,11 +1915,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 templates/web/fixmystreet/header_logo.html:2 templates/web/zurich/footer.html:18 templates/web/zurich/nav_over_content.html:4 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 templates/web/zurich/footer.html:18 templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" @@ -1983,7 +1927,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -1995,7 +1939,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2003,7 +1947,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 templates/web/base/contact/index.html:59 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2015,27 +1959,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2051,7 +1995,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 perllib/FixMyStreet/Cobrand/Zurich.pm:384 templates/web/zurich/header.html:60 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 perllib/FixMyStreet/Cobrand/Zurich.pm:384 templates/web/zurich/header.html:60 msgid "Reports" msgstr "" @@ -2087,11 +2031,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 perllib/FixMyStreet/App/Controller/Admin.pm:1508 templates/web/base/admin/report_edit.html:90 templates/web/base/admin/update_edit.html:64 templates/web/zurich/admin/report_edit.html:116 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 perllib/FixMyStreet/App/Controller/Admin.pm:1496 templates/web/base/admin/report_edit.html:90 templates/web/base/admin/update_edit.html:64 templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 templates/web/base/admin/report_edit.html:91 templates/web/base/admin/update_edit.html:65 templates/web/zurich/admin/report_edit.html:117 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 templates/web/base/admin/report_edit.html:91 templates/web/base/admin/update_edit.html:65 templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2103,7 +2047,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 templates/web/base/admin/category_edit.html:84 templates/web/zurich/admin/body.html:59 templates/web/zurich/admin/template_edit.html:29 +#: templates/web/base/admin/body.html:206 templates/web/base/admin/category_edit.html:84 templates/web/zurich/admin/body.html:59 templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -2151,7 +2095,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2167,19 +2111,19 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:23 templates/web/base/report/new/form_user_loggedout_by_email.html:22 templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/new/form_user_loggedin.html:23 templates/web/base/report/new/form_user_loggedout_by_email.html:22 templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:76 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 +#: templates/web/base/auth/general.html:110 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:86 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 msgid "Sign in" msgstr "" @@ -2234,19 +2178,15 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -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/base/report/update/form_update.html:32 +#: 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/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2254,7 +2194,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 perllib/FixMyStreet/Cobrand/Zurich.pm:387 templates/web/base/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 perllib/FixMyStreet/Cobrand/Zurich.pm:387 templates/web/base/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 msgid "Stats" msgstr "" @@ -2286,7 +2226,7 @@ msgstr "" msgid "Subject:" msgstr "" -#: templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/form_user_loggedin.html:36 templates/web/base/report/new/form_user_loggedout_by_email.html:39 templates/web/base/report/new/form_user_loggedout_password.html:11 templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/form_user_loggedin.html:34 templates/web/base/report/new/form_user_loggedout_by_email.html:39 templates/web/base/report/new/form_user_loggedout_password.html:11 templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "" @@ -2302,7 +2242,7 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 templates/web/base/report/display_tools.html:41 templates/web/fixmystreet/alert/updates.html:23 +#: templates/web/base/alert/updates.html:23 templates/web/base/report/display_tools.html:41 msgid "Subscribe" msgstr "" @@ -2310,7 +2250,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/base/admin/bodies.html:25 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:13 templates/web/zurich/header.html:57 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/base/admin/bodies.html:25 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:13 templates/web/zurich/header.html:57 msgid "Summary" msgstr "" @@ -2318,7 +2258,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2370,7 +2310,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2378,7 +2318,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2386,11 +2326,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2402,7 +2342,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -2526,7 +2466,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 perllib/FixMyStreet/App/Controller/Report/Update.pm:138 templates/web/base/auth/general.html:43 templates/web/zurich/auth/general.html:28 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 perllib/FixMyStreet/App/Controller/Report/Update.pm:138 templates/web/base/auth/general.html:53 templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -2584,7 +2524,7 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 perllib/FixMyStreet/App/Controller/Report/New.pm:990 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 perllib/FixMyStreet/Cobrand/UK.pm:44 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 perllib/FixMyStreet/App/Controller/Report/New.pm:935 perllib/FixMyStreet/App/Controller/Report/New.pm:977 perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -2596,11 +2536,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "" @@ -2632,7 +2572,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 templates/web/base/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2668,7 +2608,7 @@ msgstr "" msgid "Try emailing us directly:" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:12 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:37 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:12 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -2680,7 +2620,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -2692,7 +2632,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -2740,7 +2680,7 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 perllib/FixMyStreet/App/Controller/Admin.pm:1108 perllib/FixMyStreet/App/Controller/Admin.pm:1156 perllib/FixMyStreet/App/Controller/Admin.pm:821 perllib/FixMyStreet/Cobrand/Zurich.pm:771 perllib/FixMyStreet/Cobrand/Zurich.pm:796 perllib/FixMyStreet/Cobrand/Zurich.pm:866 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 perllib/FixMyStreet/App/Controller/Admin.pm:1096 perllib/FixMyStreet/App/Controller/Admin.pm:1144 perllib/FixMyStreet/App/Controller/Admin.pm:809 perllib/FixMyStreet/Cobrand/Zurich.pm:771 perllib/FixMyStreet/Cobrand/Zurich.pm:796 perllib/FixMyStreet/Cobrand/Zurich.pm:866 msgid "Updated!" msgstr "" @@ -2761,7 +2701,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -2769,11 +2709,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -2781,11 +2721,11 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 perllib/FixMyStreet/Cobrand/Zurich.pm:399 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 perllib/FixMyStreet/Cobrand/Zurich.pm:399 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 perllib/FixMyStreet/App/Controller/Admin.pm:412 perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 perllib/FixMyStreet/App/Controller/Admin.pm:410 perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -2821,7 +2761,7 @@ msgstr "" msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 templates/web/base/report/new/form_user_loggedout_by_email.html:28 +#: templates/web/base/report/new/form_user_loggedin.html:30 templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -2829,7 +2769,7 @@ msgstr "" 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -2865,10 +2805,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -2885,7 +2821,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -2901,7 +2837,7 @@ msgstr "" 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:58 templates/web/base/admin/report_edit.html:75 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:51 templates/web/base/questionnaire/index.html:99 +#: 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:58 templates/web/base/admin/report_edit.html:75 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:100 templates/web/base/questionnaire/index.html:51 msgid "Yes" msgstr "" @@ -3003,11 +2939,11 @@ msgstr "" msgid "Your Reports" msgstr "" -#: templates/web/base/alert/_list.html:89 templates/web/base/contact/index.html:83 templates/web/base/report/display_tools.html:38 templates/web/base/report/display_tools.html:40 templates/web/base/report/new/form_user_loggedin.html:3 templates/web/base/report/new/form_user_loggedout_email.html:1 templates/web/base/report/update/form_user_loggedout_email.html:1 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/base/alert/_list.html:89 templates/web/base/alert/updates.html:19 templates/web/base/alert/updates.html:22 templates/web/base/contact/index.html:83 templates/web/base/report/display_tools.html:38 templates/web/base/report/display_tools.html:40 templates/web/base/report/new/form_user_loggedin.html:3 templates/web/base/report/new/form_user_loggedout_email.html:1 templates/web/base/report/update/form_user_loggedout_email.html:1 templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:45 templates/web/base/report/update/form_user_loggedout_email.html:7 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:58 +#: templates/web/base/auth/general.html:55 templates/web/base/report/update/form_user_loggedout_email.html:7 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" @@ -3015,11 +2951,11 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 templates/web/base/contact/index.html:76 templates/web/base/report/new/form_user_loggedin.html:18 templates/web/base/report/new/form_user_loggedout_by_email.html:17 templates/web/base/report/update/form_name.html:11 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/base/auth/general.html:100 templates/web/base/contact/index.html:76 templates/web/base/report/new/form_user_loggedin.html:18 templates/web/base/report/new/form_user_loggedout_by_email.html:17 templates/web/base/report/update/form_name.html:12 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "" -#: templates/web/base/auth/general.html:75 templates/web/base/report/new/form_user_loggedout_password.html:10 templates/web/base/report/update/form_user_loggedout_password.html:9 templates/web/zurich/auth/general.html:34 +#: templates/web/base/auth/general.html:85 templates/web/base/report/new/form_user_loggedout_password.html:10 templates/web/base/report/update/form_user_loggedout_password.html:9 templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "" @@ -3027,7 +2963,7 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:27 templates/web/base/report/new/form_user_loggedout_by_email.html:26 templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/base/report/new/form_user_loggedin.html:27 templates/web/base/report/new/form_user_loggedout_by_email.html:26 templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "" @@ -3035,11 +2971,11 @@ msgstr "" msgid "Your report" msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" @@ -3063,7 +2999,7 @@ msgstr "" msgid "didn't use map" msgstr "" -#: templates/web/base/alert/index.html:33 templates/web/base/around/postcode_form.html:15 +#: templates/web/base/alert/index.html:33 templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3151,7 +3087,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3226,7 +3162,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po index a727fd0bf..6af9a22a6 100644 --- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,16 +6,16 @@ # Translators: # Abdullah Aldebas <demo@adebas.net>, 2015 # AR C2 <e2f458fd4s512@outlook.com>, 2015 -# Khaled Saleem Baleesh <Kbaleesh@gmail.com>, 2015 +# Khaled Saleem Baleesh <Kbaleesh@gmail.com>, 2015-2016 # 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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-11-25 14:17+0000\n" -"Last-Translator: AR C2 <e2f458fd4s512@outlook.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-04-13 19:08+0000\n" +"Last-Translator: Khaled Saleem Baleesh <Kbaleesh@gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/mysociety/fixmystreet/language/ar/)\n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "Ùˆ" @@ -56,9 +56,8 @@ msgid "%s admin:" msgstr "مسؤول %s:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "الهيئات" +msgstr "%s الهيئات" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -67,7 +66,7 @@ msgstr "%s تنبيهات مؤكدة ØŒ %s غير مؤكدة" #: templates/web/base/status/stats.html:27 #: templates/web/zurich/admin/index.html:6 msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%s معلومات الاتصال – %s مؤكدة, %s غير مؤكدة" +msgstr "%s معلومات اتصال المجلس – %s مؤكدة, %s غير مؤكدة" #. ("%s is the site name") #: templates/web/base/alert/index.html:7 @@ -77,7 +76,7 @@ msgid "" "problems within a certain distance of a particular location." msgstr "" "%s لديه مجموعة متنوعة من مواجز RSS وتنبيهات البريد الإلكتروني\n" -"لمشكلات Ù…Øلية، تشمل تنبيهات لكل المشكلات الواقعة بدائرة معينة، أو كل\n" +"للمشكلات المØلية، تشمل تنبيهات لكل المشكلات الواقعة بدائرة معينة، أو كل\n" "المشكلات الواقعة ضمن مساÙØ© معينة من موقع معين." #. ("%s is the site name") @@ -87,8 +86,8 @@ msgid "" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"%s لديه مجموعة متنوعة من مواجز RSS وتنبيهات البريد الإلكتروني لمشكلات Ù…Øلية، تشمل\n" -"تنبيهات لكل المشكلات الواقعة بدائرة معينة أو مجلس معين، أو كل المشكلات\n" +"%s لديه مجموعة متنوعة من مواجز RSS وتنبيهات البريد الإلكتروني للمشكلات المØلية، تشمل\n" +"تنبيهات لكل المشكلات الواقعة بدائرة أو مجلس معين، أو كل المشكلات\n" "الواقعة ضمن مساÙØ© معينة من موقع معين." #: templates/web/base/status/stats.html:23 @@ -99,9 +98,9 @@ msgstr "%s تØديثات مباشرة" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s الأسئلة المرسلة – %s المجابة (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" -msgstr "مرجع %s: %s" +msgstr "مرجع: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 @@ -124,10 +123,6 @@ msgstr "" msgid "%s ward, %s" msgstr "دائرة %sØŒ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, تم التقرير إلى %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%sØŒ ضمن دائرة %s" @@ -182,7 +177,7 @@ msgstr "( مثل الكتابة على الجدران ØŒ رمي النÙايات msgid "(not sent to council)" msgstr "(لم ترسل الى الجهة المسئولة)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(إختياري)" @@ -194,12 +189,11 @@ msgstr "(عام)" msgid "(sent to both)" msgstr "(أرسل لكليهما)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "--إختر تصنيÙ--" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- إختر نوع العقار--" @@ -234,26 +228,21 @@ msgstr "<strong>لا</strong> دعني أؤكّد بلاغي بالبريد" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>لا</strong> دعني أؤكّد تØديثي بالبريد" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: 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:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>نعم</strong> لدي كلمة المرور" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "نبذة عنا" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "نشاط تم جدولته" @@ -287,7 +276,7 @@ msgstr "أض٠تصنيÙاً" msgid "Add user" msgstr "إضاÙØ© مستخدم" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Ø£Ùضي٠%s" @@ -307,7 +296,7 @@ msgstr "تØذير %d أنشيء لـ %sØŒ نوع %sØŒ معاملات %s \\ %s" msgid "Alert %d disabled (created %s)" msgstr "التØذير %d ألغي تÙعيله (أنشيء %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "نبهني بأØدث المستجدات" @@ -320,7 +309,7 @@ msgstr "كل التقرير" msgid "All Reports as CSV" msgstr "جميع التقارير بتنسيق CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -364,7 +353,7 @@ msgstr "هل انت مطور ØŸ" #: templates/web/base/js/translation_strings.html:52 msgid "Are you sure you want to cancel this upload?" -msgstr "" +msgstr "هل أنت متأكد أنك تريد إلغاء الرÙع؟" #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 @@ -419,7 +408,7 @@ msgstr "الخلÙ" msgid "Ban email address" msgstr "Øظر البريد الإلكتروني" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -450,7 +439,7 @@ msgstr "لا يمكنك رؤية الخريطة؟ <em>تجاوز هذه الخط #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -465,7 +454,7 @@ msgstr "تصنيÙ" msgid "Category fix rate for problems > 4 weeks old" msgstr "معدل إصلاØات الÙئة للمشكلات التي مضى عليها أكثر من 4 أسابيع" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -485,7 +474,7 @@ msgstr "تصنيÙ: %s" msgid "Change password" msgstr "تغيير كلمة المرور" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -493,7 +482,7 @@ msgstr "" "Øدد <strong>تم تأكيده</strong> للإشارة أن عنوان الإتصال هذا قد تم تأكيده.\n" "إذا لم تكن متأكدأ من مصدر أو صلاØية عنوان الإتصال, اترك هذ الخيار بل تØديد." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 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." @@ -501,7 +490,7 @@ msgstr "" "Øدد <strong>Ù…ØذوÙ</strong> Ù„Øذ٠هذا التصنيÙ.\n" "هذ التصني٠لن يكون متوÙرا ÙÙŠ القائمة المنسدلة ÙÙŠ صÙØØ© إبلاغ-عن-مشكلة." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -517,7 +506,7 @@ msgstr "" "لتعرض كبلاغ. ÙÙŠ المملكة المتØدة، نستخدمها للخدمات مثل طلب Øاوية Ù†Ùايات\n" "إضاÙية لعنوان Ù…Øدد." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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,8 +549,8 @@ msgstr "انقر Ùوق الارتباط المرÙÙ‚ ÙÙŠ رسالة البري #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -570,7 +559,7 @@ msgstr "انقر Ùوق الارتباط المرÙÙ‚ ÙÙŠ رسالة البري msgid "Closed" msgstr "مغلق" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "مغلق من الجهة المسئولة" @@ -596,7 +585,7 @@ msgstr "بيانات العلامة التجارية المشتركة:" msgid "Cobrand:" msgstr "علامة تجارية مشتركة:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "إعدادت" @@ -615,9 +604,8 @@ msgstr "أكد الØساب" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "الرجاء التأكيد عبر البريد الإلكتروني أدناه، كما يرجى تقديم كلمة مرور جديدة عند هذه النقطة. بعد التأكيد، سيتم تØديث كلمة المرور." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -627,7 +615,7 @@ msgstr "الرجاء التأكيد عبر البريد الإلكتروني Ø£Ø msgid "Confirmation" msgstr "تأكيد" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -646,7 +634,7 @@ msgid "Confirmed:" msgstr "مؤكد:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "اتصل بـ %s" @@ -665,8 +653,8 @@ msgstr "اتصل بÙريق العمل" msgid "Coordinates:" msgstr "الإØداثيات:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "لم يتمكن من إيجاد المستخدم" @@ -684,7 +672,7 @@ msgstr "المجلس" msgid "Council contacts for %s" msgstr "جهات اتصال المجلس لـ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "مرجع المجلس: %s" @@ -703,7 +691,7 @@ msgstr "العدد" msgid "Create a report" msgstr "انشئ بلاغ" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "انشء تصنيÙ" @@ -747,20 +735,20 @@ msgstr "صÙØØ© المستخدم" msgid "Dealt with by subdivision within 5 working days" msgstr "تم التعامل بواسطة القسم الÙرعي ÙÙŠ غضون 5 أيام عمل" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Øذ٠القالب" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Ù…ØذوÙ" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -768,7 +756,7 @@ msgid "Description" msgstr "الوصÙ" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "التÙاصيل" @@ -793,11 +781,11 @@ msgid "Diligency prize league table" msgstr "جدول رابطة جائزة العناية بالدقة" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "هل لديك كلمة مرور %sØŸ" @@ -811,12 +799,12 @@ msgstr "هل تØب النماذج؟" #: templates/web/base/js/translation_strings.html:51 msgid "Drag and drop photos here or <u>click to upload</u>" -msgstr "" +msgstr "اسØب الصور واسقطها هنا أو <u>انقر للرÙع</u>" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "مكرر" @@ -839,7 +827,7 @@ msgstr "" msgid "Edit" msgstr "تعديل" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "تعديل تÙاصيل الجهة المسئولة" @@ -869,7 +857,7 @@ msgstr "المØرر" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -877,11 +865,11 @@ msgstr "المØرر" msgid "Email" msgstr "البريد الإلكتروني" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "البريد أضي٠إلى لائØØ© المسيئين" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "عنوان البريد الإلكتروني:" @@ -893,19 +881,14 @@ msgstr "تم إنشاء الإخطار بالبريد" msgid "Email alert deleted" msgstr "تم Øذ٠الإخطار بالبريد" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "البريد موجودا سابقا ÙÙŠ لائØØ© المسيئين" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "راسلني عن المشاكل المØلية الجديدة" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "البريد الإلكتروني:" @@ -914,26 +897,6 @@ msgstr "البريد الإلكتروني:" msgid "Email: %s" msgstr "البريد الإلكتروني: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "شقة أو ÙˆØدة سكنية Ùارغة" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "منزل أو بنغَل Ùارغ" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "مكتب أو عقار تجاري مهجور" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Øانة مهجورة" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -984,18 +947,14 @@ msgstr "أدخل أقرب صندوق بريد، أو اسم الشارع ÙˆØ§Ù„Ø 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "أدخل كلمة المرور:" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "أدخل تÙاصيل البلاغ" @@ -1021,7 +980,7 @@ msgstr "مثال لصندوق البريد %s" msgid "Examples:" msgstr "أمثلة:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Ø£Ø´Ø±Ø Ù…Ø§ الخطأ، وبالضبط أين هو، وكم من المدة وهو هناك..." @@ -1058,19 +1017,15 @@ msgstr "أول مرة" 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:26 -msgid "FixMyStreet" -msgstr "Ø£ØµÙ„Ø Ø´Ø§Ø±Ø¹ÙŠ" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "تم الإصلاØ" @@ -1097,7 +1052,7 @@ msgstr "مشار كمØذوÙ" msgid "Flag user" msgstr "مستخدم مشار إليه" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "مشار إليهم" @@ -1119,8 +1074,7 @@ msgstr "المستخدمين المشار إليهم غير Ù…Øظورين بأ٠msgid "Flagged:" msgstr "مشار إليه:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "اتبع ارتباط الدائرة لعرض التقارير الواقعة ضمن تلك الدائرة Ùقط." @@ -1151,18 +1105,18 @@ msgstr "الأسئلة الشائعة" msgid "GeoRSS on Google Maps" msgstr "موجز GeoRSS على خرائط Google" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "اØصل على التØديثات" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "اØصل على التØديثات للمشاكل ÙÙŠ هذه %s" @@ -1175,7 +1129,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "سعيد لسماع أنها أصلØت!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1201,7 +1155,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1212,8 +1166,7 @@ msgstr "المساعدة" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "هذه أنواع التØذيرات للمشاكل المØلية ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "مرØبا %s" @@ -1229,11 +1182,11 @@ msgstr "مرØبا %s" msgid "Hidden" msgstr "مخÙÙŠ" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "أخÙÙŠ القديم" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "أخÙÙŠ المثبتة" @@ -1253,10 +1206,6 @@ msgstr "كي٠تبلغ عن مشكلة" msgid "How to send successful reports" msgstr "كي٠ترسل بلاغات ناجØØ©" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1267,7 +1216,7 @@ msgstr "لقد أبلغت الآن عن مشكلة على @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "لقد Øدثت الآن مشكلة على @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "نعتذر لك لم نستطع تØديد مشكلتك ÙÙŠ قاعدة البيانات.\n" @@ -1291,7 +1240,7 @@ msgstr "" "الرجاء تØديد <strong>عنصر رئيسي</strong> إذا كانت هذه الهيئة Ù†Ùسها جزءًا من هيئة أخرى.\n" " Ùيما يتعلق بالأنظمة الأساسية المثبتة، Ùإنك لا تØتاج إلى ضم الهيئات بهذه الطريقة." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1316,7 +1265,7 @@ msgstr "" "إذا كنت ترغب ÙÙŠ ترك تØديث عام عن المشكلة، Ùالرجاء إدخاله هنا\n" "(الرجاء ملاØظة أنه لن ÙŠÙرسل إلى المجلس)." -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 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) أو المعر٠المقابل له هنا." @@ -1359,10 +1308,10 @@ msgstr "معر٠غير صالØ" msgid "Illegal feed selection" msgstr "اختيار موجز غير صالØ" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "قيد التقدم" @@ -1413,7 +1362,7 @@ msgstr "Ø¥Øالة داخلية" msgid "Invalid agency_responsible value %s" msgstr "قيمة agency_responsible غير صالØØ© %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "تاريخ نهاية غير صالØ" @@ -1421,16 +1370,16 @@ msgstr "تاريخ نهاية غير صالØ" msgid "Invalid format %s specified." msgstr "التنسيق المØدد %s غير صالØ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "تاريخ البداية غير صالØ" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "جار٠التØقق" @@ -1452,7 +1401,7 @@ msgstr "الصلاØية القضائية غير معروÙØ©" msgid "Jurisdiction unknown" msgstr "الصلاØية القضائية غير معروÙØ©" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1490,7 +1439,6 @@ msgstr "جار٠التØميل..." #: 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 "مواجز RSS وتنبيهات البريد الإلكتروني المØلية" @@ -1499,11 +1447,11 @@ msgstr "مواجز RSS وتنبيهات البريد الإلكتروني الم msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "مواجز RSS وتنبيهات البريد الإلكتروني المØلية لـ ’%s‘" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "التنبيهات المØلية" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "تØديد موقع المشكلة على خريطة المنطقة" @@ -1563,14 +1511,14 @@ msgstr "الشهر" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "الاسم" @@ -1594,8 +1542,8 @@ msgstr "أقرب طريق مسمى للدبوس الموضوع على الخري msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "أقرب رمز بريدي للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا): %s (على بعد %s متر)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "أقرب شارع مسمى للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا باستخدام خرائط Bing): %s" @@ -1617,7 +1565,7 @@ msgstr "المشكلات <br>الجديدة" msgid "New body added" msgstr "تمت إضاÙØ© هيئة جديدة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "تمت إضاÙØ© جهة اتصال جديدة للÙئة" @@ -1682,7 +1630,7 @@ msgstr "التالي" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "لا" @@ -1753,8 +1701,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "غير مسؤول" @@ -1787,7 +1735,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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1801,15 +1749,15 @@ msgstr "ملاØظة: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "ملاØظات من رئيس المنطقة الÙرعية لرئيس المنطقة:" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "الآن Øان وقت تقديم التقرير…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "الآن Øان وقت تقديم التØديث…" @@ -1843,8 +1791,8 @@ msgstr "ملخص من سطر واØد" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1879,13 +1827,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1910,7 +1858,7 @@ msgstr "العنصر الرئيسي" msgid "Partial" msgstr "جزئي" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1919,7 +1867,7 @@ msgid "Password (optional)" msgstr "كلمة المرور (اختياري)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "كلمة المرور:" @@ -1927,7 +1875,7 @@ msgstr "كلمة المرور:" msgid "Permalink" msgstr "الارتباط الثابت" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "رقم الهاتÙ" @@ -1943,13 +1891,21 @@ msgid "Phone:" msgstr "الهاتÙ:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "الصورة" @@ -1973,8 +1929,8 @@ msgstr "وضع دبوس على الخريطة" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1990,16 +1946,16 @@ msgstr "الرجاء التØلي بالأدب والاختصار والتركي msgid "Please check the passwords and try again" msgstr "الرجاء التØقق من كلمات المرور وإعادة المØاولة" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "الرجاء التØقق من أن عنوان البريد الإلكتروني صØÙŠØ" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2009,7 +1965,7 @@ msgstr "الرجاء اختيار Ùئة" msgid "Please choose a property type" msgstr "الرجاء اختيار نوع العقار" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "الرجاء تصØÙŠØ Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ التالية" @@ -2033,9 +1989,8 @@ msgstr "الرجاء عدم إساءة الاستعمال؛ Ùإساءة Ø§Ø³ØªØ msgid "Please enter a message" msgstr "الرجاء إدخال رسالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" msgstr "الرجاء إدخال اسمك" @@ -2051,10 +2006,10 @@ msgstr "الرجاء إدخال كلمة مرور" msgid "Please enter a subject" msgstr "الرجاء إدخال موضوع" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2071,9 +2026,9 @@ msgid "Please enter some details" msgstr "الرجاء إدخال بعض التÙاصيل" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2082,7 +2037,7 @@ msgid "Please enter your email" msgstr "الرجاء إدخال البريد الإلكتروني" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "الرجاء إدخال عنوان بريدك الإلكتروني" @@ -2098,7 +2053,7 @@ msgstr "الرجاء إدخال الاسم الكامل؛ Ùالمجالس تØØ #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "الرجاء إدخال اسمك" @@ -2125,7 +2080,7 @@ msgstr "الرجاء ألا تتردد ÙÙŠ <a href=\"%s\">تسجيل الدخو msgid "Please fill in details of the problem below." msgstr "الرجاء تعبئة تÙاصيل المشكلة بالأسÙÙ„." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "الرجاء تعبئة تÙاصيل المشكلة." @@ -2134,7 +2089,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "الرجاء الإشارة إلى ما إذا كنت تريد المشاركة ÙÙŠ استبيان آخر أم لا" @@ -2143,9 +2098,8 @@ msgid "Please note that updates are not sent to the council." msgstr "الرجاء ملاØظة أن التØديثات لا يتم إرسالها إلى المجلس." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "الرجاء ملاØظة أن التقرير <strong>لم يتم إرساله</strong>. اختر Ùئة وأض٠مزيدًا من المعلومات بالأسÙÙ„ØŒ ثم قدّم التقرير." +msgstr "يرجى ملاØظة أن تقريرك <strong>لم يتم إرساله بعد</strong>." #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2154,23 +2108,23 @@ msgstr "الرجاء ملاØظة أن التقرير <strong>لم يتم إرس #: templates/web/base/report/display.html:26 msgid "Please note your update has <strong>not yet been posted</strong>." -msgstr "" +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:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "الرجاء ØªÙˆØ¶ÙŠØ Ø£Ø³Ø¨Ø§Ø¨ تقديم هذا التقرير" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "الرجاء إضاÙØ© بعض التوضيØات وصورة" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "الرجاء ذكر ما إذا كنت قد أبلغت عن مشكلة إلى المجلس من قبل أم لا" @@ -2186,22 +2140,23 @@ msgstr "الرجاء تØديد الموجز الذي تريده" msgid "Please select the type of alert you want" msgstr "الرجاء تØديد نوع التنبيه الذي تريده" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "الرجاء تØديد ما إذا كانت المشكلة قد تم Øلها أم لا" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "الرجاء تØميل صورة JPEG Ùقط" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "الرجاء كتابة رسالة" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "الرجاء كتابة التØديث هنا" @@ -2232,7 +2187,7 @@ msgstr "مشغّل بواسطة <a class=\"platform-logo\" href=\"http://fixmyst msgid "Previous" msgstr "السابق" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "الخصوصية" @@ -2242,7 +2197,7 @@ msgstr "الخصوصية" msgid "Privacy and cookies" msgstr "الخصوصية وملÙات تعري٠الارتباط" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2271,7 +2226,7 @@ msgstr "تم إرسال المشكلة %s إلى المجلس %s" msgid "Problem breakdown by state" msgstr "تصني٠المشكلة Øسب الØالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "تم وضع علامة \"Ù…ÙتوØ\" على المشكلة." @@ -2283,10 +2238,6 @@ msgstr "يتم تغيير Øالة المشكلة Øسب نتائج الاستط msgid "Problems" msgstr "المشكلات" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "المشكلات ÙÙŠ هذه المنطقة" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "المشكلات القريبة" @@ -2304,13 +2255,11 @@ msgid "Problems within %.1fkm of this location" msgstr "المشكلات الموجودة ضمن %.1f كم من هذا الموقع" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "المشكلات ضمن Øدود %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "المشكلات ضمن Øدود دائرة %s" @@ -2329,15 +2278,11 @@ msgstr "المشكلات ضمن Øدود:" msgid "Property address:" msgstr "عنوان الملكية:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "نوع العقار:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "قدّم تØديثًا" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "تقديم الاسم وكلمة المرور اختياري، ولكن Ùعل ذلك ÙŠØªÙŠØ Ù„Ùƒ الإبلاغ عن المشكلات وإضاÙØ© التØديثات وإدارة التقارير بسهولة أكبر." @@ -2371,16 +2316,15 @@ msgstr "تمت الإجابة عن الاستبيان %d للمشكلة %dØŒ Ù…Ù msgid "Questionnaire %d sent for problem %d" msgstr "تم إرسال الاستبيان %d للمشكلة %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "تمت تعبئة الاستبيان بواسطة المبلّغ عن المشكلة" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "موجز RSS" @@ -2408,18 +2352,12 @@ msgstr "موجز RSS لـ %sØŒ ضمن Øدود دائرة %s" msgid "RSS feed of nearby problems" msgstr "موجز RSS للمشكلات القريبة" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "موجز RSS للمشكلات الموجودة ضمن %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "موجز RSS للمشكلات الموجودة ضمن Øدود %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "موجز RSS للمشكلات الموجودة ضمن Øدود دائرة %s" @@ -2429,14 +2367,13 @@ msgstr "موجز RSS للمشكلات الموجودة ضمن Øدود Ø¯Ø§Ø¦Ø±Ø msgid "RSS feed of recent local problems" msgstr "موجز RSS للمشكلات المØلية الØديثة" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "موجز RSS للتØديثات على هذه المشكلة" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "استلام بريد إلكتروني عند ترك تØديثات لهذه المشكلة." @@ -2472,12 +2409,11 @@ msgstr "إزالة الصورة (لا يمكن التراجع عن هذا الإ msgid "Reply to user:" msgstr "رد على المستخدم:" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "إبلاغ" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2487,7 +2423,7 @@ msgstr "الإبلاغ عن مشكلة" msgid "Report abuse" msgstr "الإبلاغ عن إساءة" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "الإبلاغ على %s" @@ -2502,7 +2438,7 @@ msgstr "الإبلاغ عن المشكلة" msgid "Report, view, or discuss local problems" msgstr "الإبلاغ عن المشكلات المØلية أو عرضها أو مناقشتها" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "تم الإبلاغ عنها بدون تØديد الهوية ÙÙŠ %s" @@ -2512,7 +2448,7 @@ msgstr "تم الإبلاغ عنها بدون تØديد الهوية ÙÙŠ %s" msgid "Reported before" msgstr "تم الإبلاغ عنها من قبل" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "تم الإبلاغ عنها بواسطة %s ÙÙŠ %s" @@ -2526,27 +2462,27 @@ msgstr "تم الإبلاغ عنها بواسطة:" msgid "Reported in the %s category" msgstr "تم الإبلاغ عنها ÙÙŠ الÙئة %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "تم الإبلاغ عنها ÙÙŠ الÙئة %s بدون تØديد الهوية ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "تم البلاغ ÙÙŠ التصني٠%s بواسطة %s ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "تم الإبلاغ عنها بواسطة %s بدون تØديد الهوية ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "تم الإبلاغ عنها عبر %s بواسطة %s ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "تم الإبلاغ عنها عبر %s ÙÙŠ الÙئة %s بدون تØديد الهوية ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "تم الإبلاغ عنها عبر %s ÙÙŠ الÙئة %s بواسطة %s ÙÙŠ %s" @@ -2567,7 +2503,7 @@ msgstr "تم الإبلاغ:" msgid "Reporting a problem" msgstr "الإبلاغ عن مشكلة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2610,15 +2546,15 @@ msgstr "مشغل الطرق لهذا الطريق المسمى (يتم Ø§Ø´ØªÙ‚Ø msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "مشغل الطرق لهذا الطريق المسمى (من OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "تدوير لليسار" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2633,7 +2569,7 @@ msgstr "سيؤدي تدوير هذه الصورة إلى تجاهل التغيي msgid "Satellite" msgstr "القمر الصناعي" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2689,7 +2625,7 @@ msgstr "Øدد نوع التنبيه الذي تريده وانقر Ùوق Ø§Ù„Ø msgid "Sent report back" msgstr "تمت إعادة إرسال التقرير" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "تم الإرسال إلى %s %s لاØقًا" @@ -2708,21 +2644,21 @@ msgstr "مشاركة" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "إظهار اسمي للعامة" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "إظهار القديم" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "إظهار الدبابيس" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2783,9 +2719,8 @@ msgstr "عذرًا، لم نستطع العثور على هذا الموقع." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "عذرًا، لم نستطع تØليل ذلك الموقع. الرجاء إعادة المØاولة." +msgstr "عذرا، لم نتمكن من تسجيل دخولك. يرجى ملئ النموذج بالأسÙÙ„." #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2793,15 +2728,10 @@ msgstr "عذرًا، لم نستطع تØليل ذلك الموقع. Ø§Ù„Ø±Ø¬Ø§Ø msgid "Sorry, we could not parse that location. Please try again." msgstr "عذرًا، لم نستطع تØليل ذلك الموقع. الرجاء إعادة المØاولة." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "عذرًا، لم نستطع ØÙظ الصورة (الصور)ØŒ الرجاء إعادة المØاولة." -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Øدثت مشكلة أثناء عرض هذه الصÙØØ©. الرجاء إعادة المØاولة لاØقًا." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "تاريخ البداية:" @@ -2810,7 +2740,7 @@ msgstr "تاريخ البداية:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "الØالة" @@ -2823,7 +2753,7 @@ msgstr "الØالة" msgid "State:" msgstr "الØالة:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2863,10 +2793,10 @@ msgid "Subject:" msgstr "الموضوع:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "تقديم" @@ -2894,9 +2824,8 @@ msgstr "تقديم الاستبيان" msgid "Submitted" msgstr "تم اضاÙتها" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "اشتراك" @@ -2904,7 +2833,7 @@ msgstr "اشتراك" msgid "Subscribe me to an email alert" msgstr "اشتراك ÙÙŠ تنبيه البريد الإلكتروني" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2923,7 +2852,7 @@ msgstr "ملخص" msgid "Summary reports" msgstr "ملخص التقارير" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "استطلاع" @@ -2980,7 +2909,7 @@ msgstr "شكرًا لك على تØميل الصورة. Ù†ØÙ† Ù†Øتاج الآ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "شكرًا لك، يسعدنا معرÙØ© أن المشكلة قد ØÙلت! هل يمكنا أن نسألك عما إذا كنت قد أبلغت عن مشكلة للمجلس من قبل؟" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "يبدو أنه لم يتم تØميل هذه الصورة بصورة سليمة (%s)ØŒ الرجاء إعادة المØاولة." @@ -2988,7 +2917,7 @@ msgstr "يبدو أنه لم يتم تØميل هذه الصورة بصورة س msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "لا يبدو أن هذا الموقع ضمن صلاØيات المجلس؛ ربما يكون موقعًا بØريًا أو خارج Øدود المØاÙظة. الرجاء إعادة المØاÙظة." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "لا يبدو أن هذا الموقع يقع ÙÙŠ المملكة المتØدة؛ الرجاء إعادة المØاولة." @@ -2998,11 +2927,11 @@ msgstr "لا يبدو أن هذا الموقع يقع ÙÙŠ المملكة الم msgid "That postcode was not recognised, sorry." msgstr "لم يتم التعر٠على هذا الرمز البريدي، عذرًا." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "تم وضع علامة على هذه المشكلة بأنها Ø£Ùرسلت." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "ستتم إعادة إرسال هذه المشكلة الآن." @@ -3014,7 +2943,7 @@ msgstr "لا يمكن عرض هذا التقرير على %s." msgid "That report has been removed from FixMyStreet." msgstr "تمت إزالة هذا التقرير من FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3166,9 +3095,9 @@ msgstr "Øدثت مشكلة أثناء عرض صÙØØ© \"كل التقارير\" msgid "There was a problem showing this page. Please try again later." msgstr "Øدثت مشكلة أثناء عرض هذه الصÙØØ©. الرجاء إعادة المØاولة لاØقًا." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Øدثت مشكلة ÙÙŠ توليÙØ© البريد الإلكتروني/كلمة المرور. إذا كنت لا تستطيع تذكر كلمة المرور، أو كنت لا تمتلك كلمة مرور، Ùالرجاء تعبئة قسم ‘تسجيل الدخول بواسطة البريد الإلكتروني’ ÙÙŠ النموذج." @@ -3239,9 +3168,9 @@ msgstr "Ø£Ùرسلت رسالة البريد الإلكتروني إلى كلا msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Ø£Ùرسلت رسالة البريد الإلكتروني إلى عدة مجالس تغطي موقع المشكلة، وبما أن الÙئة المØددة مدخلة لجميع المجالس، Ùالرجاء تجاهل المشكلة إذا لم تكن المجلس المختص بالتعامل معها." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "هذه المعلومات مطلوبة" @@ -3254,11 +3183,11 @@ msgstr "هذا موقع مطور، وقد تتعطل الأمور ÙÙŠ أي وق msgid "This is a summary of all reports on this site." msgstr "هذا ملخص لكل التقارير الموجودة على هذا الموقع." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "تم Ø¥ØµÙ„Ø§Ø Ù‡Ø°Ù‡ المشكلة" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "لم يتم Ø¥ØµÙ„Ø§Ø Ù‡Ø°Ù‡ المشكلة" @@ -3295,7 +3224,7 @@ msgstr "تØتوي صÙØØ© الويب هذه على صورة للمشكلة، Ø msgid "Time spent (in minutes):" msgstr "الوقت المستغرق (بالدقائق):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "المخطط الزمني" @@ -3340,8 +3269,8 @@ msgstr "جرّب إرسال البريد الإلكتروني إلينا Ù…Ø¨Ø§Ø #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "يتعذر الإصلاØ" @@ -3358,7 +3287,7 @@ msgstr "غير مؤكد" msgid "Unknown" msgstr "غير معروÙ" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "نوع تنبيه غير معروÙ" @@ -3373,7 +3302,7 @@ msgstr "خطأ غير معروÙ" msgid "Unknown problem ID" msgstr "معر٠المشكلة غير معروÙ" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "تØديث" @@ -3425,10 +3354,10 @@ msgstr "Øالات التØديث" msgid "Updated" msgstr "تم التØديث" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3455,7 +3384,7 @@ msgstr "التØديثات على {{title}}" msgid "Updates to this problem, %s" msgstr "التØديثات على هذه المشكلة، %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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> لتسجيل التÙاصيل التي لا تÙعرض إلا ÙÙŠ الإدارة. لا تÙعرض الملاØظات بصورة عامة، ولا تÙرسل إلى الهيئة." @@ -3464,11 +3393,11 @@ msgstr "استخدم <strong>الملاØظة</strong> لتسجيل التÙاص msgid "Used map" msgstr "تم استخدام الخريطة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "تمت إزالة إشارة المستخدم" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "تم وضع إشارة للمستخدم" @@ -3476,16 +3405,16 @@ msgstr "تم وضع إشارة للمستخدم" msgid "User search finds matches in users' names and email addresses." msgstr "عثر البØØ« الذي Ù†Ùذه المستخدم على مطابقات ÙÙŠ أسماء المستخدمين وعناوين البريد الإلكتروني." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "المستخدمون" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "تم تØديث القيم" @@ -3522,16 +3451,15 @@ msgstr "عثرنا على أكثر من مطابقة لهذا الموقع. Ù†Ø #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "لا نظهر عنوان البريد الإلكتروني أو رقم الهات٠مطلقًا." +msgstr "Ù†Øتاج إلى بريدك الإلكتروني، يرجى كتابته بالأسÙÙ„." #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "لن نظهر البريد الإلكتروني مطلقًا" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "لا نظهر عنوان البريد الإلكتروني أو رقم الهات٠مطلقًا." @@ -3540,7 +3468,7 @@ msgstr "لا نظهر عنوان البريد الإلكتروني أو رقم Ø 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Ù†ØÙ† نرسل ذلك إلى المجلس نيابةً عنك" @@ -3578,10 +3506,6 @@ msgstr "عند الإرسال" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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> مجانًا." @@ -3601,7 +3525,7 @@ msgstr "مع عمليات البØØ« عن الطلبات، يمكن أيضًا Ø 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "هل تريد المشاركة ÙÙŠ استبيان آخر خلال 4 أسابيع Ùنذكرك بالتØقق من الØالة؟" @@ -3631,8 +3555,8 @@ msgstr "السنة" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "نعم" @@ -3702,9 +3626,8 @@ msgstr "لقد أرÙقت صورًا بهذا التقرير من قبل. Ù„Ø§Ø #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "لقد أرÙقت صورًا بهذا التقرير من قبل. لاØظ أنه يمكنك إرÙاق 3 صور ÙƒØد أقصى بهذا التقرير (إذا Øاولت تØميل المزيد من الصور، Ùسيتم Øذ٠الصور القديمة)." +msgstr "لقد أرÙقت صورًا لهذا التØديث من قبل. لاØظ أنه يمكنك إرÙاق 3 صور ÙƒØد أقصى بهذا التØديث (إذا Øاولت تØميل المزيد من الصور، Ùسيتم Øذ٠أقدم صورة)." #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3753,19 +3676,19 @@ msgid "Your Reports" msgstr "التقارير" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "البريد الإلكتروني" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3776,17 +3699,17 @@ msgstr "عنوان البريد الإلكتروني" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "لن يتم استخدام معلوماتك إلا ÙˆÙقًا <a href=\"/privacy\">لسياسة الخصوصية</a> الخاصة بنا" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "الاسم" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3799,20 +3722,19 @@ msgstr "تم تغيير كلمة المرور" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "رقم الهاتÙ" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "التقارير" +msgstr "تقريرك" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "التقارير" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "التØديثات" @@ -3838,7 +3760,7 @@ msgid "didn't use map" msgstr "لم يتم استخدام الخريطة" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "على سبيل المثال، ’%s‘ أو ’%s‘" @@ -3944,8 +3866,7 @@ msgstr "مناطق أخرى:" msgid "reopened" msgstr "تمت إعادة الÙتØ" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "تسجيل الخروج" @@ -4043,7 +3964,7 @@ msgstr[3] "<big>%s</big> من التØديثات على التقارير" msgstr[4] "<big>%s</big> من التØديثات على التقارير" msgstr[5] "<big>%s</big> من التØديثات على التقارير" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -4109,86 +4030,50 @@ msgstr[3] "<strong>لا</strong> توجد لدينا تÙاصيل عن Ø§Ù„Ù…Ø¬Ø msgstr[4] "<strong>لا</strong> توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." msgstr[5] "<strong>لا</strong> توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(لن نقوم بعرض بريدك الإلكتروني او رقم هاتÙÙƒ المØمول)" - -#~ msgid "(we never show your email)" -#~ msgstr "(لن نقوم بعرض بريدك الإلكتروني)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>لا</strong> دعني أؤكّد بلاغي عبر البريد:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>لا</strong> دعني أؤكّد تØديثي عبر البريد:" - -#~ msgid "Email me updates" -#~ msgstr "راسلني عن التØديثات" - -#~ msgid "Enter a new password:" -#~ msgstr "أدخل كلمة مرور جديدة:" - -#~ 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 "عذرًا، لم نستطع تدقيق هذا الرمز. إذا كنت قد نسخت عنوان URL من رسالة بريد إلكتروني، Ùالرجاء التØقق من أنك نسخته بصورة صØÙŠØØ© تمامًا.\n" - -#~ 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 "إذا كنت تستخدم البريد الإلكتروني عن طريق المتصÙØ Ø£Ùˆ لديك Ù…Ø±Ø´Ø Ù„Ù„Ø§Ø±Ø³Ø§Ø¦Ù„ الغير هامة، ربما تود تÙقد مجلد الرسائل الغير هامة: بعض الأØيان، رسائلنا يشار إليها بذلك." - -#~ msgid "Message:" -#~ msgstr "الرسالة:" - -#~ msgid "More problems nearby" -#~ msgstr "مزيد من المشكلات القريبة" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "أوشكنا على الانتهاء! راجع البريد الإلكتروني الآن..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "عدواني؟ غير لائق؟ أخبرنا" - -#~ msgid "Photo:" -#~ msgstr "الصورة:" +#~ msgid "%s, reported at %s" +#~ msgstr "%sØŒ Ø£Ùبلغ ÙÙŠ %s" -#~ msgid "Please check your email" -#~ msgstr "الرجاء التØقق من البريد الإلكتروني" +#~ msgid "About us" +#~ msgstr "نبذة عنا" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "الرجاء ملاØظة أن التØديثات لا يتم إرسالها إلى المجلس. Ùإذا تركت اسمك Ùسيظهر للعامة. سيتم استخدام معلوماتك ÙˆÙقًا لـ <a href=\"/faq#privacy\">سياسة الخصوصية</a> الخاصة بنا Ùقط" +#~ msgid "Email me new local problems" +#~ msgstr "راسلني عن المشاكل المØلية الجديدة" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "قد يكون سبب ذلك أن الارتباط قديم جدًا أو اÙستخدÙÙ… بالÙعل، أو أن العنوان لم ÙŠÙنسخ بصورة صØÙŠØØ©." +#~ msgid "Empty flat or maisonette" +#~ msgstr "شقة أو ÙˆØدة سكنية Ùارغة" -#~ msgid "This problem has been closed" -#~ msgstr "تم إغلاق هذه المشكلة" +#~ msgid "Empty house or bungalow" +#~ msgstr "منزل أو بنغَل Ùارغ" -#~ msgid "This problem is in progress" -#~ msgstr "معالجة المشكلة قيد التقدم" +#~ msgid "Empty office or other commercial" +#~ msgstr "مكتب أو عقار تجاري مهجور" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "هذه المشكلة قديمة ÙˆØالتها غير معروÙØ©." +#~ msgid "Empty pub or bar" +#~ msgstr "Øانة مهجورة" -#~ msgid "Update:" -#~ msgstr "التØديث:" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "مبنى عام مهجور - مدرسة، مستشÙى، إلخ." -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "تعذر علينا تأكيد الØساب - عذرًا." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "أدخل أقرب اسم شارع ÙˆØÙŠ أو صندوق بريد أو منطقة ÙÙŠ دلهي" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "لقد أرسلنا إليك رسالة بريد إلكتروني تØتوي على ارتباط لتأكيد الØساب." +#~ msgid "FixMyStreet" +#~ msgstr "Ø£ØµÙ„Ø Ø´Ø§Ø±Ø¹ÙŠ" -#~ 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>:" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "آس٠لايمكنك تأكيد البلاغات الغير مؤكدة." -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "لقد أرÙقت صورة بهذا التقرير من قبل، وسيؤدي إرÙاق صورة أخرى إلى استبدال الصورة الأولى." +#~ msgid "Problems in this area" +#~ msgstr "المشكلات ÙÙŠ هذه المنطقة" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "لقد أرÙقت صورة بهذا التØديث من قبل، وسيؤدي إرÙاق صورة أخرى إلى استبدال الصورة الأولى." +#~ msgid "Property type:" +#~ msgstr "نوع العقار:" -#~ msgid "Your email:" -#~ msgstr "البريد الإلكتروني:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "موجز RSS للمشكلات الموجودة ضمن %s" -#~ msgid "Your name:" -#~ msgstr "الاسم:" +#~ msgid "Sorry, you can not log in with Facebook. Please try again later." +#~ msgstr "عذرا، لا يمكنك تسجيل الدخول بالÙيسبوك. Øاول مرة أخرى لاØقا." -#~ msgid "Your email:" -#~ msgstr "البريد الإلكتروني:" +#~ msgid "Whole block of empty flats" +#~ msgstr "مجموعة كاملة من الشقق الÙارغة" diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po index 19ebd0aa8..626a8de22 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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:34+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/mysociety/fixmystreet/language/bg_BG/)\n" "Language: bg_BG\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "и" @@ -53,9 +53,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Райони" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -90,7 +89,7 @@ msgstr "%s обновÑване в реално време" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s изпратени анкети – %s отговорени (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s номер: %s" @@ -109,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s квартал, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, Ñъобщено на %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, в %s квартал" @@ -167,7 +162,7 @@ msgstr "(като графити, дупки по улицата, Ñчупено msgid "(not sent to council)" msgstr "(не е изпратен към общината)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(незадължително)" @@ -179,12 +174,11 @@ msgstr "" msgid "(sent to both)" msgstr "(изпратен към двата района)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Изберете ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Изберете подходÑщ тип --" @@ -216,26 +210,21 @@ msgstr "<strong>Ðе</strong> Ðека Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ñигнала чрез msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Ðе</strong> Ðека Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ð°ÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñта чрез имейл" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: 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:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Да</strong> Имам парола" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "За наÑ" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Сигналът Ñе обработва" @@ -269,7 +258,7 @@ msgstr "ДобавÑне на нова категориÑ" msgid "Add user" msgstr "Добавете потребител" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Добавено %s" @@ -289,7 +278,7 @@ msgstr "Създадено извеÑтие %d за %s, тип %s, Ñ Ð¿Ð°Ñ€Ð°Ð¼ msgid "Alert %d disabled (created %s)" msgstr "ИзвеÑтието %d е изключено (Ñъздадено на %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "ИзвеÑÑ‚Ñвай ме за бъдещи актуализиации" @@ -302,7 +291,7 @@ msgstr "Вички Ñигнали" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -401,7 +390,7 @@ msgstr "Ðазад" msgid "Ban email address" msgstr "Забрана на имейл адреÑа" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -432,7 +421,7 @@ msgstr "Ðе виждате картата? <em>ПропуÑнете тази Ñ #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -447,7 +436,7 @@ msgstr "КатегориÑ" msgid "Category fix rate for problems > 4 weeks old" msgstr "Сигнали подадени преди повече от 4 Ñедмици" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -467,7 +456,7 @@ msgstr "КатегориÑ: %s" msgid "Change password" msgstr "ПромÑна на парола" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -475,7 +464,7 @@ msgstr "" "Изберете <strong>потвърден</strong> за да отбележите, че този контакт е бил потвърден и коректен. \n" "Ðко не Ñте Ñигурни за първоизточника или валидноÑтта на контакта, оÑтавете полето немаркирано." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 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." @@ -483,7 +472,7 @@ msgstr "" "Маркирайте <strong>изтриване</strong>, за да премахнете категориÑта.\n" "Ð’ този Ñлучай Ñ‚Ñ Ð½Ñма да бъде доÑтъпна в ÑпиÑъка Ñ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¸ на Ñтраницата за подаване на нов Ñигнал." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -499,7 +488,7 @@ msgstr "" "<br>\n" "Тази Ð¾Ð¿Ñ†Ð¸Ñ Ðµ подходÑща за Ñигнали, които вÑички биха могли да подават, но които не предÑтавлÑват Ð¸Ð½Ñ‚ÐµÑ€ÐµÑ Ð·Ð° оÑтаналите. Ðапример да Ñи изиÑка допълнителен контейнер за боклук за даден адреÑ." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -540,8 +529,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -550,7 +539,7 @@ msgstr "" msgid "Closed" msgstr "Затворен" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Затворен от общината" @@ -576,7 +565,7 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° меÑтната имплементциÑ:" msgid "Cobrand:" msgstr "МеÑтна имплементциÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "КонфигурациÑ" @@ -595,9 +584,8 @@ msgstr "Потвърждаване на акаунта" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Потвърдете Ñигнала, въвеждайки имейла Ñи по-долу и въведете нова парола. Когато потвърдите имейла, паролата Ви ще Ñе Ñмени автоматично." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -607,7 +595,7 @@ msgstr "Потвърдете Ñигнала, въвеждайки имейла Ñ msgid "Confirmation" msgstr "Потвърждение" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -626,7 +614,7 @@ msgid "Confirmed:" msgstr "Потвърдени:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -645,8 +633,8 @@ msgstr "Връзка Ñ Ñ‚Ð¸Ð¼Ð°" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "ПотребителÑÑ‚ не е намерен" @@ -664,7 +652,7 @@ msgstr "Община" msgid "Council contacts for %s" msgstr "Контакти на общината за %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "входÑщ номер в общината: %s" @@ -683,7 +671,7 @@ msgstr "Брой" msgid "Create a report" msgstr "Подай Ñигнал" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Създай категориÑ" @@ -727,20 +715,20 @@ msgstr "Табло" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Изтрит" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -748,7 +736,7 @@ msgid "Description" msgstr "ОпиÑание" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "ИнформациÑ" @@ -773,11 +761,11 @@ msgid "Diligency prize league table" msgstr "Таблица Ñ Ñ€Ð°Ð¹Ð¾Ð½Ð¸Ñ‚Ðµ в СофиÑ" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -795,8 +783,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Вече ÑъщеÑтвува" @@ -820,7 +808,7 @@ msgstr "" msgid "Edit" msgstr "Редактиране" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Редактиране на информациÑта за района" @@ -850,7 +838,7 @@ msgstr "Редактирано от" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -858,11 +846,11 @@ msgstr "Редактирано от" msgid "Email" msgstr "Имейл" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Имейлът е добавен в ÑпиÑъка ÑÑŠÑ Ð·Ð»Ð¾ÑƒÐ¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Имейл адреÑ:" @@ -874,19 +862,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Имейлът е в ÑпиÑъка ÑÑŠÑ Ð·Ð»Ð¾ÑƒÐ¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Съобщавай ми новите Ñигнали" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "Имейл:" @@ -895,26 +878,6 @@ msgstr "Имейл:" msgid "Email: %s" msgstr "Имейл: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -958,18 +921,14 @@ msgstr "Въведете пощенÑки код или име на улица Ð 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Въведете парола" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Въведете Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема" @@ -995,7 +954,7 @@ msgstr "Примерен пощенÑки Ð°Ð´Ñ€ÐµÑ %s" msgid "Examples:" msgstr "Примери:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1032,19 +991,15 @@ msgstr "За първи път" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "ПоправиСофиÑ" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Поправено" @@ -1071,7 +1026,7 @@ msgstr "Означен като \"изтрит\"" msgid "Flag user" msgstr "Означаване на потребител" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Означен" @@ -1093,8 +1048,7 @@ msgstr "Означените потребители нÑмат реÑтрикцРmsgid "Flagged:" msgstr "Означен:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "ПоÑледвайте линка за района, за да видите Ñигнали Ñамо за този район." @@ -1125,18 +1079,18 @@ msgstr "ЧеÑто задавани въпроÑи" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "ИзтеглÑне на актуализациите" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "ИзтеглÑне на актуализациите за Ñигналите в %s" @@ -1149,7 +1103,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1177,7 +1131,7 @@ msgstr "" "Подавали ли Ñте Ñигнал за нередноÑÑ‚ към общината преди или Ñега \n" "подавате за първи път?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1188,8 +1142,7 @@ msgstr "Помощ" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Това Ñа типовете извеÑÑ‚Ð¸Ñ Ð·Ð° нови Ñигнали за ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Здравей %s" @@ -1205,11 +1158,11 @@ msgstr "Здравей %s" msgid "Hidden" msgstr "Скрити" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Скрий Ñтарите" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Скрий кабърчетата" @@ -1229,10 +1182,6 @@ msgstr "Как да Ñигнализирате за проблем" msgid "How to send successful reports" msgstr "Как да подавате Ñигнали уÑпешно" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1243,7 +1192,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "ВашиÑÑ‚ Ñигнал не беше намерен.\n" @@ -1265,7 +1214,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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 +1235,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1321,10 +1270,10 @@ msgstr "ÐеÑъщеÑтвуващ номер" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Ð’ Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° обработка" @@ -1375,7 +1324,7 @@ msgstr "Вътрешен номер" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "ÐевÑрна дата" @@ -1383,16 +1332,16 @@ msgstr "ÐевÑрна дата" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "ÐевÑрна дата" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Сигналът Ñе разглежда" @@ -1414,7 +1363,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1452,7 +1401,6 @@ msgstr "Зареждане..." #: 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 "RSS и имейл извеÑÑ‚Ð¸Ñ Ð·Ð° Ñигнали" @@ -1461,11 +1409,11 @@ msgstr "RSS и имейл извеÑÑ‚Ð¸Ñ Ð·Ð° Ñигнали" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS и имейл извеÑÑ‚Ð¸Ñ Ð·Ð° Ñигнали за ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "ИзвеÑтиÑ" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Локализирайте проблема на картата" @@ -1525,14 +1473,14 @@ msgstr "МеÑец" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Име" @@ -1556,8 +1504,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1579,7 +1527,7 @@ msgstr "Ðови <br>Ñигнали" msgid "New body added" msgstr "Районът е добавен" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "КатегориÑта е добавена" @@ -1644,7 +1592,7 @@ msgstr "Слеващ" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Ðе" @@ -1709,8 +1657,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1743,7 +1691,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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1757,15 +1705,15 @@ msgstr "Бележка: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Сега да изпратим Ð’Ð°ÑˆÐ¸Ñ Ñигнал…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Изпратете актуализациÑта…" @@ -1799,8 +1747,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1835,13 +1783,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1866,7 +1814,7 @@ msgstr "Община" msgid "Partial" msgstr "ЧаÑтичен" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1875,7 +1823,7 @@ msgid "Password (optional)" msgstr "Парола (незадължително)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Парола:" @@ -1883,7 +1831,7 @@ msgstr "Парола:" msgid "Permalink" msgstr "Връзка" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Телефонен номер" @@ -1899,13 +1847,21 @@ msgid "Phone:" msgstr "Телефон:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Снимка" @@ -1929,8 +1885,8 @@ msgstr "ПоÑтавете кабърче върху картата" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1946,16 +1902,16 @@ msgstr "ÐœÐ¾Ð»Ñ Ð±ÑŠÐ´ÐµÑ‚Ðµ учтиви, кратки и Ñе придържРmsgid "Please check the passwords and try again" msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ паролите и пробвайте отново" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ дали Ñте въвели коректен имейл адреÑ" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1965,7 +1921,7 @@ msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ категориÑ" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1986,11 +1942,10 @@ msgstr "ÐœÐ¾Ð»Ñ Ð½Ðµ обиждайте никого - обиждайки ÐžÐ±Ñ msgid "Please enter a message" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ñъобщение" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ име" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2004,10 +1959,10 @@ msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ парола" msgid "Please enter a subject" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ тема" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2024,9 +1979,9 @@ msgid "Please enter some details" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ информациÑ" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2035,7 +1990,7 @@ msgid "Please enter your email" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ имейл" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ имейл адреÑ" @@ -2051,7 +2006,7 @@ msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ цÑлото Ñи име, общината ÑÐ #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ име" @@ -2078,7 +2033,7 @@ msgstr "Можете да <a href=\"%s\">влезете отново</a> или msgid "Please fill in details of the problem below." msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема." @@ -2087,7 +2042,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "ÐœÐ¾Ð»Ñ Ð¾Ñ‚Ð±ÐµÐ»ÐµÐ¶ÐµÑ‚Ðµ дали бихте иÑкали да учаÑтвате в друга анкета" @@ -2113,16 +2068,16 @@ msgstr "" msgid "Please note:" msgstr "Забележка:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð°Ñ‰Ð¾ отварÑте Ñигнала отново." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸ приложете Ñнимка." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "ÐœÐ¾Ð»Ñ Ð¾Ñ‚Ð³Ð¾Ð²Ð¾Ñ€ÐµÑ‚Ðµ дали нÑкога Ñте подавали Ñигнал към общината преди." @@ -2138,22 +2093,23 @@ msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ начин на извеÑÑ‚Ñване" msgid "Please select the type of alert you want" msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ тип извеÑтиÑ, които бихте иÑкали да получаваме" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ñочете дали проблемът е бил разрешен или не" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "ÐœÐ¾Ð»Ñ ÐºÐ°Ñ‡Ð²Ð°Ð¹Ñ‚Ðµ Ñамо JPEG изображениÑ" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ñъобщение" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ новото Ñъобщение тук" @@ -2184,7 +2140,7 @@ msgstr "" msgid "Previous" msgstr "Предишно" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2194,7 +2150,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2223,7 +2179,7 @@ msgstr "Сигналът %s е подаден към общината %s " msgid "Problem breakdown by state" msgstr "РазделÑне на Ñигналите по ÑтатуÑи" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Сигналът е маркиран като отворен." @@ -2235,10 +2191,6 @@ msgstr "СтатуÑÑŠÑ‚ на Ñигнала е променен на оÑнов msgid "Problems" msgstr "Сигнали" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Други Ñигнали на тази териториÑ" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Други Ñигнали наоколо" @@ -2256,13 +2208,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Сигнали в Ñ€Ð°Ð´Ð¸ÑƒÑ Ð¾Ñ‚ %.1fкм от това меÑтоположение" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Сигнали в %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Сигнали в квартал %s" @@ -2281,15 +2231,11 @@ msgstr "Сигнали в границите на:" msgid "Property address:" msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° имота:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Тип на имота:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Въведете Ð¸Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° актуализиране" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "Използването на потребителÑко име е опционално, но това ще ви позволи по-леÑно да подавате Ñигнали и да публикувате Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸ актуализации." @@ -2323,16 +2269,15 @@ msgstr "Ðнкетата %d е попълнена за проблем %d, %s дРmsgid "Questionnaire %d sent for problem %d" msgstr "Ðнкетата %d за проблем %d е изпратена" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Ðнкетата е попълнена от потребителÑ, подал Ñигнала" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS абонамент" @@ -2360,18 +2305,12 @@ msgstr "RSS абонамент за %s, в квартал %s" msgid "RSS feed of nearby problems" msgstr "RSS абонамент за поÑледни проблеми наоколо" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS абонамент за проблеми в този %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS абонамент за проблеми в %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS абонамент за проблеми в квартал %s" @@ -2381,14 +2320,13 @@ msgstr "RSS абонамент за проблеми в квартал %s" msgid "RSS feed of recent local problems" msgstr "RSS абонамент за поÑледни проблеми наоколо" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS абонамент за актуализации по този проблем" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Получаване на имейл при Ð°ÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° проблема." @@ -2424,12 +2362,11 @@ msgstr "Премахване на Ñнимката (необратимо Ð´ÐµÐ¹Ñ msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2439,7 +2376,7 @@ msgstr "Подайте Ñигнал" msgid "Report abuse" msgstr "Сигнализирай за неподходÑщо Ñъдържание" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Сигнал за %s " @@ -2454,7 +2391,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Сигнализирай, разгледай или коментирай проблеми" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2464,7 +2401,7 @@ msgstr "" msgid "Reported before" msgstr "Подавал Ñъм и преди" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2478,27 +2415,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Сигналът е подаден в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Сигналът е подаден в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s от %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно чрез %s в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сигналът е подаден чрез %s в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s от %s в %s" @@ -2519,7 +2456,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Сигнализиране за проблем" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2562,15 +2499,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Завъртане налÑво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2585,7 +2522,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2641,7 +2578,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Сигналът е подаден към %s преди %s" @@ -2660,21 +2597,21 @@ msgstr "Сподели" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Показвай името ми публично" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Показване на Ñтарите" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Покажи кабърчетата" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2742,15 +2679,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Възникна проблем при визуализирането на Ñтраницата. ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ по-къÑно." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Ðачална дата:" @@ -2759,7 +2691,7 @@ msgstr "Ðачална дата:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2772,7 +2704,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2812,10 +2744,10 @@ msgid "Subject:" msgstr "Тема:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Изпращане" @@ -2843,9 +2775,8 @@ msgstr "Изпращане на анкетата" msgid "Submitted" msgstr "Сигналът е потвърден" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Ðбониране" @@ -2853,7 +2784,7 @@ msgstr "Ðбониране" msgid "Subscribe me to an email alert" msgstr "Ðбониране за извеÑÑ‚Ñване по имейл" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2872,7 +2803,7 @@ msgstr "Обобщение" msgid "Summary reports" msgstr "Обобщена Ñправка" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Проучване" @@ -2929,7 +2860,7 @@ msgstr "Ð‘Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ð·Ð° предоÑтавената Ñнимка. ТъРmsgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "БлагодарÑ! Радваме Ñе, че този проблем е бил разрешен! Бихме иÑкли да Ви питаме подавали ли Ñте Ñигнали към общината и преди?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Прикачването на изображение е неуÑпешно (%s). ÐœÐ¾Ð»Ñ Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ отново." @@ -2937,7 +2868,7 @@ msgstr "Прикачването на изображение е неуÑпешн msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Ð’ момента за това меÑтоположение не може да Ñе подаде Ñигнал; може би вÑе още нÑмаме потвърждение от общината. ÐœÐ¾Ð»Ñ Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ отново по-къÑно." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2947,11 +2878,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "ÐœÐ¾Ð»Ñ Ð´Ð° ни извините, този пощенÑки код не беше разпознат." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Сигналът ще бъде препратен." @@ -2963,7 +2894,7 @@ msgstr "Сигналът не може да бъде разгледан %s." msgid "That report has been removed from FixMyStreet." msgstr "Този Ñигнал е бил изтрит от ПоправиСофиÑ." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3105,9 +3036,9 @@ msgstr "Възникна проблем при визуализирането н msgid "There was a problem showing this page. Please try again later." msgstr "Възникна проблем при визуализирането на Ñтраницата. ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ по-къÑно." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Възникна проблем Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñта имейл/парола. Ðко не можете да Ñи Ñпомните паролата или нÑмате такава, Ð¼Ð¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ ÑекциÑта ‘влизане чрез имейл’." @@ -3168,9 +3099,9 @@ msgstr "Този имейл е изпратен към двете общини Ð msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Този имейл е изпратен до нÑколко общини покриващи адреÑа на Ñигнала, тъй като категориÑта на Ñигнала Ñъвпада Ñ Ð²Ñички Ñ‚ÑÑ…. ÐœÐ¾Ð»Ñ Ð½Ðµ го взимайте под внимание ако не Ñте правилната община задължена за този тип проблеми." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ðµ необходима" @@ -3183,11 +3114,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "Това е обобщение на вÑички Ñигнали в Ñайта." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Този проблем е решен." -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Този проблем не е решен." @@ -3224,7 +3155,7 @@ msgstr "Тази Ñтраница Ñъдържа и Ñнимка, изпрате msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Времева линиÑ" @@ -3269,8 +3200,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3287,7 +3218,7 @@ msgstr "Ðепотвърден" msgid "Unknown" msgstr "ÐеизвеÑтен" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3302,7 +3233,7 @@ msgstr "Ðепозната грешка" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "ÐктуализациÑ" @@ -3354,10 +3285,10 @@ msgstr "ÐÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° ÑтатуÑите" msgid "Updated" msgstr "Ðктуализирано!" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3384,7 +3315,7 @@ msgstr "Ðктуализиране на {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3393,11 +3324,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3405,16 +3336,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Потребители" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Ðктуализиране на ÑтойноÑтите" @@ -3451,16 +3382,15 @@ msgstr "Ðамерихме повече от едно Ñъвпадение за #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Ðие никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или телефонен номер." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ðие никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð»" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ðие никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или телефонен номер." @@ -3469,7 +3399,7 @@ msgstr "Ðие никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Ðие ще го изпратим на общината вмеÑто ВаÑ" @@ -3507,10 +3437,6 @@ msgstr "Изпратен" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3530,7 +3456,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Бихте ли иÑкали да получите още една анкета Ñлед 4 Ñедмици, за да ви напомни да проверите ÑтатуÑа?" @@ -3560,8 +3486,8 @@ msgstr "Година" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Да" @@ -3678,19 +3604,19 @@ msgid "Your Reports" msgstr "Вашите Сигнали" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Имейл" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3701,17 +3627,17 @@ msgstr "Имейл адреÑ" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Вашата Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‰Ðµ бъде използва Ñамо ÑпрÑмо нашата <a href=\"/privacy\">Политика за поверителноÑÑ‚</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Име" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3724,20 +3650,19 @@ msgstr "Паролата Ви беше променена уÑпешно" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Телефонен номер" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Вашите Ñигнали" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Вашите Ñигнали" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Ðктуализации" @@ -3763,7 +3688,7 @@ msgid "didn't use map" msgstr "картата не е била използвана" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "напр. ‘%s’ или ‘%s’" @@ -3869,8 +3794,7 @@ msgstr "други територии:" msgid "reopened" msgstr "отново отворен" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "излизане" @@ -3948,7 +3872,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big>актуализиран Ñигнал" msgstr[1] "<big>%s</big>актуализирани Ñигнала" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3990,82 +3914,26 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Ð’Ñе още <strong>нÑмаме</strong> Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° общината, коÑто ÑтопаниÑва тази териториÑ." msgstr[1] "Ð’Ñе още <strong>нÑмаме</strong> Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° общините, които ÑтопаниÑват тази териториÑ." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(ние никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или телефонен номер)" - -#~ msgid "(we never show your email)" -#~ msgstr "(ние никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð»)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Ðе</strong> Ðека да Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ñигнала чрез имейл" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Ðе</strong> Ðека Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ð¿Ñ€Ð¾Ð¼Ñната чрез имейл:" - -#~ msgid "Email me updates" -#~ msgstr "Съобщавай ми за промени" - -#~ msgid "Enter a new password:" -#~ msgstr "Въведете нова парола:" - -#~ 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 "Ðко използвате уеб мейл клиент или имате наÑтроени филтри за нежелана поща, Ð¼Ð¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ папките ÑÑŠÑ Ñпам/нежелана поща. ПонÑкога ÑъобщениÑта ни биват маркирани като Ñпам." - -#~ msgid "Message:" -#~ msgstr "Съобщение:" - -#~ msgid "More problems nearby" -#~ msgstr "Още Ñигнали наоколо" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ имейл адреÑа" - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Обиден? ÐеподходÑщ? Кажете ни" - -#~ msgid "Photo:" -#~ msgstr "Снимка:" - -#~ msgid "Please check your email" -#~ msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ имейл адреÑа" - -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð¼Ð°Ð¹Ñ‚Ðµ предвид, че актуализациите не Ñе изпращат на Общината. Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ðµ публична и ще бъде използвана единÑтвено и Ñамо в ÑъответÑтвие Ñ Ð½Ð°ÑˆÐ°Ñ‚Ð° <a href=\"/privacy\">Политика за поверителноÑÑ‚.</a>" - -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Това може да е резултат от на оÑтарÑл или използва адреÑ, както и от грешно копиране на адреÑа." - -#~ msgid "This problem has been closed" -#~ msgstr "Този проблем е затворен." - -#~ msgid "This problem is in progress" -#~ msgstr "Този проблем е в Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° обработка." - -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Този Ñигнал е Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтен ÑтатуÑ." - -#~ msgid "Update:" -#~ msgstr "ÐктуализациÑ:" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, Ñъобщено на %s" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Изпратили Ñме Ви имейл, за да потвърдите Ñъздаването на профил." +#~ msgid "About us" +#~ msgstr "За наÑ" -#~ 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>:" +#~ msgid "Email me new local problems" +#~ msgstr "Съобщавай ми новите Ñигнали" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Вече Ñте прикачили Ñнимка към този Ñигнал. Ðко прикачите нова, то Ñ‚Ñ Ñ‰Ðµ замени ÑъщеÑтвуващата." +#~ msgid "FixMyStreet" +#~ msgstr "ПоправиСофиÑ" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Вече Ñте прикачили Ñнимка към актуализациÑта, прикачайки нова ще замените предходната." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Ðе можете да потвърдите непотвърден през имейла Ñигнал" -#~ msgid "Your email:" -#~ msgstr "Имейл:" +#~ msgid "Problems in this area" +#~ msgstr "Други Ñигнали на тази териториÑ" -#~ msgid "Your name:" -#~ msgstr "Име:" +#~ msgid "Property type:" +#~ msgstr "Тип на имота:" -#~ msgid "Your email:" -#~ msgstr "ВашиÑÑ‚ имейл:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS абонамент за проблеми в този %s" diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po index 05d448816..68d825492 100644 --- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cs_CZ.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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/mysociety/fixmystreet/language/cs_CZ/)\n" "Language: cs_CZ\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " a " @@ -51,9 +51,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Subjekty" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -88,7 +87,7 @@ msgstr "%s online aktualizace" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s dotaznÃky zaslány -%s odpovÄ›dÄ›lo (%s %%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -107,10 +106,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s, oddÄ›lenÃ, %" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, nahlášeno %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "% S, v% s oddÄ›lenÃ" @@ -165,7 +160,7 @@ msgstr "(napÅ™. graffiti, rozbité pouliÄnà osvÄ›tlenÃ, dÃry v komunikacÃch msgid "(not sent to council)" msgstr "(nenà odesláno na úřad)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(volitelnÄ›)" @@ -177,12 +172,11 @@ msgstr "(veÅ™ejné)" msgid "(sent to both)" msgstr "(odesláno dvoum??)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Vyberte kategorii --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Vyberte typ nemovitosti --" @@ -217,26 +211,21 @@ msgstr "<strong>Ne</strong> PotvrdÃm hlášenà e-mailem" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Ne</strong> PotvrdÃm aktualizaci e-mailem" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: 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:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ano</strong> Mám heslo" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "O nás" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Akce naplánována" @@ -270,7 +259,7 @@ msgstr "PÅ™idat novou kategorii" msgid "Add user" msgstr "PÅ™idat Uživatele" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "PÅ™idáno %s" @@ -290,7 +279,7 @@ msgstr "UpozornÄ›nà %d vytvoÅ™ené pro %s, typu %s, parametry %s / %s" msgid "Alert %d disabled (created %s)" msgstr "UpozornÄ›nà %d zruÅ¡eno (vytvoÅ™eno %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "UpozornÄ›te mÄ› na budoucà aktualizace" @@ -303,7 +292,7 @@ msgstr "VÅ¡echna hlášenÃ" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -402,7 +391,7 @@ msgstr "ZpÄ›t" msgid "Ban email address" msgstr "Zakázat emailovou adresu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -433,7 +422,7 @@ msgstr "NevidÃte mapu? <em>vynechte tento krok</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -448,7 +437,7 @@ msgstr "Katetorie" 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/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -468,7 +457,7 @@ msgstr "Kategorie: %s" msgid "Change password" msgstr "ZmÄ›nit heslo" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -476,7 +465,7 @@ 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 +#: templates/web/base/admin/body.html:169 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." @@ -484,7 +473,7 @@ 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 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -501,7 +490,7 @@ msgstr "" " 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 +#: templates/web/base/admin/body.html:129 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." @@ -544,8 +533,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -554,7 +543,7 @@ msgstr "" msgid "Closed" msgstr "UzavÅ™ena" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "UzavÅ™ena úřadem" @@ -580,7 +569,7 @@ msgstr "Data motivu:" msgid "Cobrand:" msgstr "Motiv:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "NastavenÃ" @@ -599,9 +588,8 @@ msgstr "Potvrdit úÄet" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, 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." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -611,7 +599,7 @@ msgstr "PotvrÄte hlášenà nÞe a zadejte si nové heslo. Jakmile potvrdÃte msgid "Confirmation" msgstr "PotvrzenÃ" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -630,7 +618,7 @@ msgid "Confirmed:" msgstr "Potvrzeno:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -649,8 +637,8 @@ msgstr "Kontaktujte nás!" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Uživatele nelze najÃt" @@ -668,7 +656,7 @@ msgstr "Úřad" msgid "Council contacts for %s" msgstr "Kontakty na úřad %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "ÄÃslo jednacÃ: %s" @@ -687,7 +675,7 @@ msgstr "PoÄet" msgid "Create a report" msgstr "VytvoÅ™it report" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "VytvoÅ™it kategorii" @@ -731,20 +719,20 @@ msgstr "PÅ™ehledy" msgid "Dealt with by subdivision within 5 working days" msgstr "Odbavované úřadem do 5 pracovnÃch dnů" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Smazána" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -752,7 +740,7 @@ msgid "Description" msgstr "Popis" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Podrobnosti" @@ -777,11 +765,11 @@ msgid "Diligency prize league table" msgstr "Tabulka VÞěhů" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -799,8 +787,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "DuplicitnÃ" @@ -820,7 +808,7 @@ msgstr "Každému kontaktu daného subjektu můžeme pÅ™idÄ›lit kategorii, kter msgid "Edit" msgstr "Upravit" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Editace podrobnostà subjektu" @@ -850,7 +838,7 @@ msgstr "Úprava" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -858,11 +846,11 @@ msgstr "Úprava" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "E-mail pÅ™idán do seznamu zneužÃvánÃ" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-mailová adresa:" @@ -874,19 +862,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 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/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "E-mail:" @@ -895,26 +878,6 @@ msgstr "E-mail:" msgid "Email: %s" msgstr "E-mail: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Prázdný byt nebo mesonet" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Prázdný dům nebo bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "ZavÅ™ená kancelář nebo komerÄnà prostory" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "ZavÅ™ená hospoda nebo bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -958,18 +921,14 @@ msgstr "Zadejte blÃzké poÅ¡tovnà smÄ›rovacà ÄÃslo nebo název ulice Äi o 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Zadejte heslo" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "UveÄte podrobnosti daného problému" @@ -995,7 +954,7 @@ msgstr "PÅ™Ãklad PSÄŒ %s" msgid "Examples:" msgstr "PÅ™Ãklady:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 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. ..." @@ -1032,19 +991,15 @@ msgstr "Poprvé" 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:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "VyÅ™eÅ¡ené" @@ -1071,7 +1026,7 @@ msgstr "OznaÄené za smazané" msgid "Flag user" msgstr "Sledovat uživatele" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "UrÄeno ke sledovánÃ" @@ -1093,8 +1048,7 @@ msgstr "OznaÄenà uživatelé nejsou žádným způsobem omezováni. Je to jen msgid "Flagged:" msgstr "Sledováno:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/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." @@ -1125,18 +1079,18 @@ msgstr "ÄŒasto kladené dotazy" msgid "GeoRSS on Google Maps" msgstr "GeoRSS na Google Mapách" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "ZasÃlánà aktualizacÃ" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "ZÃskat aktualizace hlášenà %s " @@ -1149,7 +1103,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1175,7 +1129,7 @@ msgstr "Byl tento problém vyÅ™eÅ¡en?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Už jste nÄ›kdy pÅ™ed tÃm hlásili problém úřadu a nebo je toto VaÅ¡e hlášenà poprvé?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1186,8 +1140,7 @@ msgstr "NápovÄ›da" 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/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "PÅ™ihlášená osoba: %s" @@ -1203,11 +1156,11 @@ msgstr "PÅ™ihlášená osoba: %s" msgid "Hidden" msgstr "Skrytý" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Skrýt staré" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Schovat znaÄky" @@ -1227,10 +1180,6 @@ msgstr "Jak nahlásit problém" msgid "How to send successful reports" msgstr "Anleitung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1241,7 +1190,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1265,7 +1214,7 @@ 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 +#: templates/web/base/admin/body.html:132 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 +1237,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 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." @@ -1326,10 +1275,10 @@ msgstr "Neplatné ID" msgid "Illegal feed selection" msgstr "Neplatný výbÄ›r zdoje" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "v Å™eÅ¡enÃ" @@ -1380,7 +1329,7 @@ msgstr "Internà postoupenÃ" msgid "Invalid agency_responsible value %s" msgstr "Chybná agency_responsible hodnota %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Chybný koneÄný datum" @@ -1388,16 +1337,16 @@ msgstr "Chybný koneÄný datum" msgid "Invalid format %s specified." msgstr "Chybný formát %s specified." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Chybné poÄáteÄnà datum" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Å etÅ™enÃ" @@ -1419,7 +1368,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1457,7 +1406,6 @@ msgstr "NahrávánÃ..." #: 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Ã" @@ -1466,11 +1414,11 @@ msgstr "Lokálnà RSS kanály a mailové upozornÄ›nÃ" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokálnà RSS kanály a mailové upozornÄ›nà pro ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "MÃstnà upozornÄ›nÃ" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokalizujte vaÅ¡e hlášenà v mapÄ›" @@ -1530,14 +1478,14 @@ msgstr "MÄ›sÃc" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Jméno" @@ -1561,8 +1509,8 @@ msgstr "Nejbližšà pojmenovaná ulice k umÃstÄ›né znaÄce na mapÄ› (automati msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Nejbližšà PSÄŒ k umÃstÄ›né znaÄce na mapÄ› (automaticky generováno) %s (%sm away)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1586,7 +1534,7 @@ msgstr "Nová <br>hlášenÃ" msgid "New body added" msgstr "PÅ™idán nový subjekt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Do kategorie byl pÅ™idán nový kontakt" @@ -1651,7 +1599,7 @@ msgstr "DalÅ¡Ã" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Ne" @@ -1722,8 +1670,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "NezodpovÃdá" @@ -1756,7 +1704,7 @@ msgstr "Poznámka" 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/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1770,15 +1718,15 @@ msgstr "Poznámka: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "A teÄ staÄà hlášenà odeslat" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "A nynà pro odeslánà aktualizace…" @@ -1812,8 +1760,8 @@ msgstr "jednořádkový nadpis" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1848,13 +1796,13 @@ msgstr "Nebo problémy hlášené subjektu:" 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1879,7 +1827,7 @@ msgstr "NadÅ™azený subjekt" msgid "Partial" msgstr "ČásteÄnÄ›" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1888,7 +1836,7 @@ msgid "Password (optional)" msgstr "Heslo (volitelnÄ›)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Heslo:" @@ -1896,7 +1844,7 @@ msgstr "Heslo:" msgid "Permalink" msgstr "Trvalý odkaz" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnà ÄÃslo" @@ -1912,13 +1860,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Fotografie" @@ -1942,8 +1898,8 @@ msgstr "UmÃsti Å¡pendlÃk na mapu" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1959,16 +1915,16 @@ msgstr "BuÄte prosÃm zdvoÅ™ilÃ, struÄnà a vyjadÅ™ujte se k vÄ›ci." msgid "Please check the passwords and try again" msgstr "Zkontrolujte prosÃm hesla a zkuste znovu" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Zkontrolujte, zda je vaÅ¡e emailová adresa správná" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1978,7 +1934,7 @@ msgstr "Vyberte kategorii" msgid "Please choose a property type" msgstr "Zvolte typ nemovitosti" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Opravte prosÃm chyby uvedené nÞe" @@ -1999,11 +1955,10 @@ msgstr "NezneužÃvejte tento nástroj - zneužÃvánà vaÅ¡eho úřadu znehodno msgid "Please enter a message" msgstr "prosÃm zadejte zprávu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Zadejte vaÅ¡e jméno" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2017,10 +1972,10 @@ msgstr "ProsÃm zadejte heslo" msgid "Please enter a subject" msgstr "ProsÃm zadejte název" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2037,9 +1992,9 @@ msgid "Please enter some details" msgstr "ProsÃm zadejte podrobnosti" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2048,7 +2003,7 @@ msgid "Please enter your email" msgstr "ProsÃm zadejte váš e-mail" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "ProsÃm zadejte vaÅ¡i emailovou adresu" @@ -2064,7 +2019,7 @@ msgstr "Zadejte své celé jméno, úřad potÅ™ebuje tyto informace - jestliže #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Zadejte vaÅ¡e jméno" @@ -2091,7 +2046,7 @@ msgstr "Můžete se kdykoliv znovu <a href=\"%s\">pÅ™ipojit</a>, nebo pÅ™ejÃt 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:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "ProsÃm, vyplňte údaje o hlášeném problému." @@ -2100,7 +2055,7 @@ msgstr "ProsÃm, vyplňte údaje o hlášeném problému." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Vyplňte prosÃm nÞe uvedený formulář s údaji o problému, a popiÅ¡te mÃsto tak pÅ™esnÄ›, jak je to možné v poli podrobnosti." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "UveÄte, zda chcete dostat dalÅ¡Ã dotaznÃk" @@ -2109,9 +2064,8 @@ 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/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -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." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2127,16 +2081,16 @@ msgstr "" msgid "Please note:" msgstr "VezmÄ›te prosÃm na vÄ›domÃ:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "UveÄte prosÃm nÄ›jaké vysvÄ›tlenÃ, proÄ jste znovu otevÅ™eli toto hlášenÃ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 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:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "ProsÃm, Å™eknÄ›te, jestli jste nÄ›kdy pÅ™edtÃm hlásili problémy na váš úřad" @@ -2152,22 +2106,23 @@ msgstr "ProsÃm, vyberte kanál, který chcete" msgid "Please select the type of alert you want" msgstr "Vyberte typ upozornÄ›nÃ, které chcete" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "UveÄte, prosÃm, zda byl Äi nebyl problém vyÅ™eÅ¡en" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "ProsÃm, nahrávejte pouze obrázky ve formátu JPEG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "NapiÅ¡te zprávu" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Aktuálnà informace doplňte prosÃm zde" @@ -2198,7 +2153,7 @@ msgstr "" msgid "Previous" msgstr "PÅ™edcházejÃcÃ" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Ochrana osobnÃch údajů" @@ -2208,7 +2163,7 @@ msgstr "Ochrana osobnÃch údajů" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2237,7 +2192,7 @@ msgstr "Hlášenà %s bylo odesláno na úřad %s" msgid "Problem breakdown by state" msgstr "ÄŒlenÄ›nà hlášenà podle stavu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Hlášenà bylo oznaÄeno za otevÅ™ené." @@ -2249,10 +2204,6 @@ msgstr "Stav hlášenà byl zmÄ›nÄ›n na základÄ› výsledků Å¡etÅ™enÃ" 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/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Hlášenà v okolÃ" @@ -2270,13 +2221,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Hlášenà v okolà %.1fkm od tohoto mÃsta" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Hlášenà v oblasti %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Hlášenà v oblasti %s" @@ -2295,15 +2244,11 @@ msgstr "Hlášenà uvnitÅ™ oblasti:" 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:6 msgid "Provide an update" msgstr "PoskytnÄ›te aktuálnà informace" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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Ã." @@ -2337,16 +2282,15 @@ msgstr "DotaznÃk %d odpovÄ›dÄ›l na hlášenà %d, %s to %s" msgid "Questionnaire %d sent for problem %d" msgstr "DotaznÃk %d poslal k hlášenà %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 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:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS kanál" @@ -2374,18 +2318,12 @@ msgstr "RSS kanál pro %s, v oblasti %s " 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:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 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:221 msgid "RSS feed of problems within %s ward" msgstr "RSS kanál hlášenà v oblasti %s " @@ -2395,14 +2333,13 @@ msgstr "RSS kanál hlášenà v oblasti %s " msgid "RSS feed of recent local problems" msgstr "RSS kanál aktuálnÃch lokálnÃch hlášenÃ" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 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/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Dostávat e-mail, když je hlášenà aktualizováno." @@ -2438,12 +2375,11 @@ msgstr "Odstranit fotografii (nelze vrátit zpÄ›t!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2453,7 +2389,7 @@ msgstr "Nahlásit problém" msgid "Report abuse" msgstr "Nevhodný obsah" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Hlášenà na webu %s" @@ -2468,7 +2404,7 @@ msgstr "Nahlášenà problému" msgid "Report, view, or discuss local problems" msgstr "HlášenÃ, zobrazenà a diskuse nad lokálnÃmi problémy" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Nahlášeno anonymnÄ› v %s" @@ -2478,7 +2414,7 @@ msgstr "Nahlášeno anonymnÄ› v %s" msgid "Reported before" msgstr "Hlásil(a) jsem již dÅ™Ãve" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Nahlášeno uživatelem %s, urÄeno pro %s" @@ -2492,27 +2428,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Nahlášeno v kategorii %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Nahlášeno anonymnÄ› v %s v kategorii %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Nahlášeno prostÅ™ednictvÃm %s anonymnÄ› v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 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:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 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" @@ -2533,7 +2469,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Hlášenà problému" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2576,15 +2512,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "OtoÄit doleva" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2599,7 +2535,7 @@ msgstr "" msgid "Satellite" msgstr "SatelitnÃ" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2655,7 +2591,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "odesláno do %s o %s pozdÄ›ji" @@ -2674,21 +2610,21 @@ msgstr "SdÃlet" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Zobrazit moje jméno veÅ™ejnÄ›" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Zobrazit stará" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Zobrazit znaÄky" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2747,9 +2683,8 @@ msgstr "Nemůžeme bohužel nalézt tuto lokalitu." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Omlouváme se, nelze lokalizovat. Zkuste jeÅ¡tÄ› jednou." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2757,15 +2692,10 @@ msgstr "Omlouváme se, nelze lokalizovat. Zkuste jeÅ¡tÄ› jednou." msgid "Sorry, we could not parse that location. Please try again." msgstr "Omlouváme se, nelze lokalizovat. Zkuste jeÅ¡tÄ› jednou." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Nastal problém v zobrazenà této stránky. ProsÃm, zkuste pozdÄ›ji." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "PoÄáteÄnà datum:" @@ -2774,7 +2704,7 @@ msgstr "PoÄáteÄnà datum:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Stav" @@ -2787,7 +2717,7 @@ msgstr "Stav" msgid "State:" msgstr "Stav:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2827,10 +2757,10 @@ msgid "Subject:" msgstr "PÅ™edmÄ›t:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Odeslat" @@ -2858,9 +2788,8 @@ msgstr "Odeslat dotaznÃk" msgid "Submitted" msgstr "Odesláno" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "PÅ™ihlásit se k odbÄ›ru" @@ -2868,7 +2797,7 @@ msgstr "PÅ™ihlásit se k odbÄ›ru" 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:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2887,7 +2816,7 @@ msgstr "PÅ™ehled" msgid "Summary reports" msgstr "Souhrnný pÅ™ehled" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Průzkum" @@ -2944,7 +2873,7 @@ msgstr "DÄ›kujeme za nahránà fotografie. Nynà je tÅ™eba lokalizovat VaÅ¡e hlà msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "DÃky, rádi slyÅ¡Ãme, že to bylo vyÅ™eÅ¡eno! Můžeme se jeÅ¡tÄ› zeptat, jestli jste nÄ›kdy pÅ™edtÃm hlásili úřadům problém?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 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." @@ -2952,7 +2881,7 @@ msgstr "Zdá se, že se obrázek nenahrál správnÄ› (%s), zkuste to prosÃm zno msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Zdá se, že tato lokalita nepatřà do žádné mÄ›stské Äásti nebo obecnÃho úřadu na územà ČR. Možná se jedná o offshore nebo se nacházà v zahraniÄÃ. Zkuste to prosÃm znovu." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2962,11 +2891,11 @@ msgstr "To mÃsto se nezdá být v ÄŒeské republice; prosÃm zkuste to znovu." 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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Hlášenà bude nynà opÄ›t odesláno." @@ -2978,7 +2907,7 @@ msgstr "Tento report nemůže být zobrazen na %s." msgid "That report has been removed from FixMyStreet." msgstr "Toto hlášenà bylo vyjmuto z FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3126,9 +3055,9 @@ msgstr "Nastal problém v zobrazenà stránky VÅ¡echna hlášenÃ. ProsÃm, zkus msgid "There was a problem showing this page. Please try again later." msgstr "Nastal problém v zobrazenà této stránky. ProsÃm, zkuste pozdÄ›ji." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘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." @@ -3199,9 +3128,9 @@ msgstr "Tento e-mail byl odeslán na oba úřady působÃcà v dané lokalitÄ›, msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Tento e-mail byl odeslán na nÄ›kolik úřadů působÃcÃch v dané lokalitÄ›, protože zvolená kategorie hlášenà je uvedena pro vÅ¡echny z nich. ProsÃm ignorujte, pokud nejste oprávnÄ›ný úřad kompetentnà řeÅ¡it nahlášený problém." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Tato informace je vyžadována" @@ -3214,11 +3143,11 @@ msgstr "Toto je vývojářský web; vÄ›ci mohou kdykoli pÅ™estat fungovat, data 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/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Hlášenà bylo vyÅ™eÅ¡eno" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Hlášenà nemohlo být vyÅ™eÅ¡eno" @@ -3255,7 +3184,7 @@ msgstr "Webová stránka také obsahuje fotografii hlášenÃ, poskytnutou uživ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "ÄŒasová osa" @@ -3300,8 +3229,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Nelze opravit" @@ -3318,7 +3247,7 @@ msgstr "Nepotvrzeno" msgid "Unknown" msgstr "Neznámé" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Neznámý typ upozornÄ›nÃ" @@ -3333,7 +3262,7 @@ msgstr "Neznámá chyba" msgid "Unknown problem ID" msgstr "Neznámé ID hlášenÃ" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Aktualizovat" @@ -3385,10 +3314,10 @@ msgstr "Aktualizovat status" msgid "Updated" msgstr "Aktualizováno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3415,7 +3344,7 @@ msgstr "Aktualizace hlášenà {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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." @@ -3424,11 +3353,11 @@ msgstr "<strong> Poznámka </strong> sloužà pro záznam ifnormacÃ, které jso msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Uživatel vyjmut ze sledovánÃ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Uživatel sledován" @@ -3436,16 +3365,16 @@ msgstr "Uživatel sledován" 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:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Uživatelé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Hodnoty aktualizovány" @@ -3482,16 +3411,15 @@ msgstr "NaÅ¡li jsme vÃce než jednu shodu pro požadovanou lokalitu. NabÃzÃme #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "váš email nebude nezveÅ™ejnÄ›n" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny." @@ -3500,7 +3428,7 @@ msgstr "Váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny." 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "VaÅ¡e upozornÄ›nà poÅ¡leme kompetentnÃm úřadům v dané lokalitÄ›" @@ -3538,10 +3466,6 @@ msgstr "Odesláno:" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3561,7 +3485,7 @@ msgstr "V požadavku pro vyhledávánà je možné hledat s parametrem 'agency 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:96 +#: templates/web/base/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Ã?" @@ -3591,8 +3515,8 @@ msgstr "Rok" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ano" @@ -3711,19 +3635,19 @@ msgid "Your Reports" msgstr "VaÅ¡e hlášenÃ" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Váš e-mail" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3734,17 +3658,17 @@ msgstr "VaÅ¡e e-mailová adresa" 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/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "VaÅ¡e jméno a pÅ™ÃjmenÃ" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3757,20 +3681,19 @@ msgstr "VaÅ¡e heslo bylo zmÄ›nÄ›no" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "VaÅ¡e telefonnà ÄÃslo:" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "VaÅ¡e hlášenÃ" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "VaÅ¡e hlášenÃ" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "VaÅ¡e aktualizace" @@ -3796,7 +3719,7 @@ msgid "didn't use map" msgstr "bez mapy" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "napÅ™. ‘%s’ nebo ‘%s’" @@ -3902,8 +3825,7 @@ msgstr "ostatnà oblasti:" msgid "reopened" msgstr "znovu otevÅ™eno" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "odhlásit" @@ -3986,7 +3908,7 @@ 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 +#: templates/web/base/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." @@ -4034,86 +3956,47 @@ msgstr[0] "Doposud <strong>nemáme</strong> podrobnosti o dalÅ¡Ãm úřadÄ›, kt 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 "(we never show your email address or phone number)" -#~ msgstr "(váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny)" - -#~ msgid "(we never show your email)" -#~ msgstr "(váš email nebude nezveÅ™ejnÄ›n)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Ne</strong>, PotvrdÃm hlášenà prostÅ™ednictvÃm emailu:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Ne</strong>, potvrdÃm aktualizaci pomocà e-mailu:" - -#~ msgid "Email me updates" -#~ msgstr "ZaÅ¡lete aktualizace mailem" - -#~ msgid "Enter a new password:" -#~ msgstr "Zadejte nové heslo:" - -#~ 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" - -#~ 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." - -#~ msgid "Message:" -#~ msgstr "Zpráva:" - -#~ msgid "More problems nearby" -#~ msgstr "DalÅ¡Ã hlášenà z okolÃ" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Téměř hotovo! Nynà zkontrolujte svůj e-mail ..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Urážlivé? Nevhodné? ŘeknÄ›te nám" - -#~ msgid "Photo:" -#~ msgstr "Fotografie:" - -#~ msgid "Please check your email" -#~ msgstr "Zkontrolujte svůj mail" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, nahlášeno %s" -#~ 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>" +#~ msgid "About us" +#~ msgstr "O nás" -#~ 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." +#~ msgid "Email me new local problems" +#~ msgstr "Nová lokálnà hlášenà mi poÅ¡lete mailem" -#~ msgid "This problem has been closed" -#~ msgstr "Hlášenà bylo uzavÅ™eno" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Prázdný byt nebo mesonet" -#~ msgid "This problem is in progress" -#~ msgstr "ŘeÅ¡enà hlášenà probÃhá" +#~ msgid "Empty house or bungalow" +#~ msgstr "Prázdný dům nebo bungalow" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Hlášenà je zastaralé a nenà znám stav." +#~ msgid "Empty office or other commercial" +#~ msgstr "ZavÅ™ená kancelář nebo komerÄnà prostory" -#~ msgid "Update:" -#~ msgstr "Aktualizace:" +#~ msgid "Empty pub or bar" +#~ msgstr "ZavÅ™ená hospoda nebo bar" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Omlouváme se, nebyli jsme schopni potvrdit Váš úÄet." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Prázdná veÅ™ejná budova - Å¡kola, nemocnice a tp." -#~ 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." +#~ 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" -#~ 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>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ 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Ã." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Bohužel nemůžete potvrdit nepotvrzená hlášenÃ." -#~ 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Ã." +#~ msgid "Problems in this area" +#~ msgstr "Hlášenà v této oblasti" -#~ msgid "Your email:" -#~ msgstr "Váš e-mail:" +#~ msgid "Property type:" +#~ msgstr "Typ nemovitosti:" -#~ msgid "Your name:" -#~ msgstr "VaÅ¡e jméno:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS kanál hlášenà v oblasti %s" -#~ msgid "Your email:" -#~ msgstr "Váš e-mail:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Celý blok prázdných bytů" diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index 14f1829f5..4a46062e7 100644 --- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cy.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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Welsh (http://www.transifex.com/mysociety/fixmystreet/language/cy/)\n" "Language: cy\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "a" @@ -52,9 +52,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Cyrff" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -62,9 +61,8 @@ msgstr "%s hysbysiad wedi ei gadarnhau, %s heb ei gadarnhau" #: templates/web/base/status/stats.html:27 #: templates/web/zurich/admin/index.html:6 -#, fuzzy msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%s hysbysiad wedi ei gadarnhau, %s heb ei gadarnhau" +msgstr "" #. ("%s is the site name") #: templates/web/base/alert/index.html:7 @@ -90,7 +88,7 @@ msgstr "%s diweddariad byw" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -109,10 +107,6 @@ msgstr "" msgid "%s ward, %s" msgstr "ward %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, adroddwyd am %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, o fewn ward %s" @@ -167,7 +161,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(heb ei anfon at y cyngor)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(dewisol)" @@ -179,12 +173,11 @@ msgstr "(cyhoeddus)" msgid "(sent to both)" msgstr "(anfonwyd i'r ddau)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -216,26 +209,21 @@ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r adroddiad drwy e-bost msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Oes</strong>, mae gen i gyfrinair" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Amdanom" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -266,7 +254,7 @@ msgstr "Ychwanegu categori newydd" msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Ychwanegwyd %s" @@ -286,7 +274,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Rhoi gwybod am ddiweddariadau i ddod" @@ -299,7 +287,7 @@ msgstr "Pob adroddiad" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -398,7 +386,7 @@ msgstr "Yn ôl" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -429,7 +417,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -444,7 +432,7 @@ msgstr "Categori" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -464,19 +452,19 @@ msgstr "Categori: %s" msgid "Change password" msgstr "Newid cyfrinair" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -487,7 +475,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -528,8 +516,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -538,7 +526,7 @@ msgstr "" msgid "Closed" msgstr "Ar gau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Caewyd gan y cyngor" @@ -564,7 +552,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -583,9 +571,8 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Cadarnhewch drwy e-bost isod, gan ddarparu cyfrinair newydd bryd hynny. Diweddarir eich cyfrinair pan fyddwch yn cadarnhau." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -595,7 +582,7 @@ msgstr "Cadarnhewch drwy e-bost isod, gan ddarparu cyfrinair newydd bryd hynny. msgid "Confirmation" msgstr "" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -614,7 +601,7 @@ msgid "Confirmed:" msgstr "Cadarnhawyd:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -633,8 +620,8 @@ msgstr "Cysylltu â'r tîm" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" @@ -652,7 +639,7 @@ msgstr "Cyngor" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -671,7 +658,7 @@ msgstr "" msgid "Create a report" msgstr "Creu adroddiad" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Creu categori" @@ -715,20 +702,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Dilëwyd" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -736,7 +723,7 @@ msgid "Description" msgstr "Disgrifiad" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Manylion" @@ -761,11 +748,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -783,8 +770,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Lluosogi" @@ -804,7 +791,7 @@ msgstr "" msgid "Edit" msgstr "Golygu" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Golygu manylion y corff" @@ -834,7 +821,7 @@ msgstr "Golygydd" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -842,11 +829,11 @@ msgstr "Golygydd" msgid "Email" msgstr "E-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Cyfeiriad e-bost:" @@ -858,19 +845,14 @@ msgstr "Crëwyd hysbysiad e-bost" msgid "Email alert deleted" msgstr "Dilëwyd hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Rhoi gwybod i fi am broblemau lleol newydd drwy e-bost" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "E-bost:" @@ -879,26 +861,6 @@ msgstr "E-bost:" msgid "Email: %s" msgstr "E-bost: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Fflat wag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "TÅ· neu fyngalo gwag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Swyddfa neu adeilad masnachol arall gwag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Tafarn neu far gwag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -942,18 +904,14 @@ msgstr "Rhowch god post, neu enw stryd ac ardal" msgid "Enter a nearby street name and area" msgstr "Rhowch enw stryd ac ardal gerllaw" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Rhowch enw stryd ac ardal gerllaw, cod post neu ardal yn Delhi" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Rhowch gyfrinair" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Rhowch fanylion am y broblem" @@ -979,7 +937,7 @@ msgstr "Cod post enghreifftiol %s" msgid "Examples:" msgstr "Enghraifft:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Esboniwch beth sy'n bod, ble'n union mae'r broblem, ac ers faint o amser mae hi yna..." @@ -1016,19 +974,15 @@ msgstr "Tro cyntaf" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "" @@ -1055,7 +1009,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1077,8 +1031,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1109,18 +1062,18 @@ msgstr "Cwestiynau a ofynnir yn aml" msgid "GeoRSS on Google Maps" msgstr "GeoRSS ar Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Derbyn diweddariadau" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Derbyn diweddariadau am broblemau %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1133,7 +1086,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1159,7 +1112,7 @@ msgstr "Gafodd y broblem ei thrwsio?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Ydych chi wedi adrodd problem at y cyngor o'r blaen, neu ai dyma eich tro cyntaf?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1170,8 +1123,7 @@ msgstr "Cymorth" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Dyma'r mathau o hysbysiadau problemau lleol ar gyfer ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Helo %s" @@ -1187,11 +1139,11 @@ msgstr "Helo %s" msgid "Hidden" msgstr "Cudd" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Cuddio'r hen rai" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Cuddio'r piniau" @@ -1211,10 +1163,6 @@ msgstr "Sut i adrodd problem" msgid "How to send successful reports" msgstr "Sut i anfon adroddiadau llwyddiannus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Yn anffodus, ni allwch gadarnhau adroddiadau heb eu cadarnhau." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1225,7 +1173,7 @@ msgstr "Dwi newydd adrodd problem ar @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Dwi newydd ddiweddaru problem ar @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1247,7 +1195,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1268,7 +1216,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1303,10 +1251,10 @@ msgstr "ID annerbynniol" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Ar y gweill" @@ -1357,7 +1305,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Dyddiad dod i ben annilys" @@ -1365,16 +1313,16 @@ msgstr "Dyddiad dod i ben annilys" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Dyddiad cychwyn annilys" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "" @@ -1396,7 +1344,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1434,7 +1382,6 @@ msgstr "Wrthi'n llwytho..." #: 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 "Ffrydiau RSS lleol a hysbysiadau e-bost" @@ -1443,11 +1390,11 @@ msgstr "Ffrydiau RSS lleol a hysbysiadau e-bost" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Ffrydiau RSS lleol a hysbysiadau e-bost ar gyfer '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Hysbysiadau lleol" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lleoli'r broblem ar fap o'r ardal" @@ -1507,14 +1454,14 @@ msgstr "Mis" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Enw" @@ -1538,8 +1485,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1561,7 +1508,7 @@ msgstr "Problemau <br>newydd" msgid "New body added" msgstr "Ychwanegwyd corff newydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1626,7 +1573,7 @@ msgstr "Nesaf" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "" @@ -1691,8 +1638,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1725,7 +1672,7 @@ msgstr "Nodyn" 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/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1739,15 +1686,15 @@ msgstr "Nodyn: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Nawr i gyflwyno eich adroddiad…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Nawr i gyflwyno eich diweddariad…" @@ -1781,8 +1728,8 @@ msgstr "Crynodeb byr" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1817,13 +1764,13 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Neu gallwch danysgrifio i hysbysiad yn seiliedig ar eich ward neu etholaeth:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1848,7 +1795,7 @@ msgstr "Rhiant" msgid "Partial" msgstr "Rhannol" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1857,7 +1804,7 @@ msgid "Password (optional)" msgstr "Cyfrinair (dewisol)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Cyfrinair:" @@ -1865,7 +1812,7 @@ msgstr "Cyfrinair:" msgid "Permalink" msgstr "Dolen barhaol" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Rhif ffôn" @@ -1881,13 +1828,21 @@ msgid "Phone:" msgstr "Ffôn:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Llun" @@ -1911,8 +1866,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1928,16 +1883,16 @@ msgstr "Byddwch yn gwrtais, yn gryno ac yn berthnasol." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1947,7 +1902,7 @@ msgstr "" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1968,11 +1923,10 @@ msgstr "Peidiwch â bod yn sarhaus — byddai sarhau eich cyngor yn dib msgid "Please enter a message" msgstr "Rhowch neges" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Rhowch eich enw" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1986,10 +1940,10 @@ msgstr "Rhowch gyfrinair" msgid "Please enter a subject" msgstr "Rhowch bwnc" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2006,9 +1960,9 @@ msgid "Please enter some details" msgstr "Rhowch fanylion" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2017,7 +1971,7 @@ msgid "Please enter your email" msgstr "Rhowch eich e-bost" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Rhowch eich cyfeiriad e-bost" @@ -2033,7 +1987,7 @@ msgstr "Rhowch eich enw llawn, mae angen y wybodaeth hon ar y cyngor – os na h #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Rhowch eich enw" @@ -2060,7 +2014,7 @@ msgstr "Croeso i chi <a href=\"%s\">ailfewngofnodi</a>, neu fynd yn ôl i'r <a h msgid "Please fill in details of the problem below." msgstr "Rhowch fanylion am y broblem isod." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Rhowch fanylion am y broblem." @@ -2069,7 +2023,7 @@ msgstr "Rhowch fanylion am y broblem." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2095,16 +2049,16 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Rhowch destun yn ogystal â llun" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Dywedwch wrthym a ydych wedi adrodd problem i'ch cyngor o'r blaen" @@ -2120,22 +2074,23 @@ msgstr "Dewiswch y ffrwd hoffech chi ei chael" msgid "Please select the type of alert you want" msgstr "Dewiswch pa fath o hysbysiad hoffech chi ei gael" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Dywedwch a gafodd y broblem ei thrwsio" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Uwchlwythwch lun JPEG yn unig" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Ysgrifennwch neges" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Ysgrifennwch eich diweddariad yma" @@ -2166,7 +2121,7 @@ msgstr "" msgid "Previous" msgstr "Blaenorol" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Preifatrwydd" @@ -2176,7 +2131,7 @@ msgstr "Preifatrwydd" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2205,7 +2160,7 @@ msgstr "Anfonwyd y broblem %s at y cyngor" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "" @@ -2217,10 +2172,6 @@ msgstr "" msgid "Problems" msgstr "Problemau" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemau yn yr ardal hon" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemau gerllaw" @@ -2238,13 +2189,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemau yn %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemau yn ward %s" @@ -2263,15 +2212,11 @@ msgstr "Problemau o fewn ffiniau:" msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Math o eiddo:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Darparu diweddariad" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "Mae darparu enw a chyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." @@ -2305,16 +2250,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "Ffrwd RSS" @@ -2342,18 +2286,12 @@ msgstr "Ffrwd RSS %s, o fewn ward %s" msgid "RSS feed of nearby problems" msgstr "Ffrwd RSS o broblemau gerllaw" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Ffrwd RSS o broblemau yn %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Ffrwd RSS o broblemau o fewn ward %s" @@ -2363,14 +2301,13 @@ msgstr "Ffrwd RSS o broblemau o fewn ward %s" msgid "RSS feed of recent local problems" msgstr "Ffrwd RSS o broblemau lleol diweddar" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Derbyn e-bost pan fydd diweddariadau i'r broblem hon." @@ -2406,12 +2343,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2421,7 +2357,7 @@ msgstr "Adrodd problem" msgid "Report abuse" msgstr "Adrodd camddefnydd" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Adroddwyd ar %s" @@ -2436,7 +2372,7 @@ msgstr "Adrodd eich problem" msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddienw am %s" @@ -2446,7 +2382,7 @@ msgstr "Adroddwyd yn ddienw am %s" msgid "Reported before" msgstr "Adroddwyd eisoes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -2460,27 +2396,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddwyd yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd drwy %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd drwy %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Adroddwyd drwy %s yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Adroddwyd drwy %s yn y categori %s am %s" @@ -2501,7 +2437,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Adrodd problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2544,15 +2480,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Cylchdroi i'r chwith" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2567,7 +2503,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2623,7 +2559,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2642,21 +2578,21 @@ msgstr "Rhannu" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Dangos fy enw yn gyhoeddus" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Dangos yr hen rai" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Dangos piniau" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2724,15 +2660,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Dyddiad cychwyn:" @@ -2741,7 +2672,7 @@ msgstr "Dyddiad cychwyn:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Cyflwr" @@ -2754,7 +2685,7 @@ msgstr "Cyflwr" msgid "State:" msgstr "Cyflwr:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2794,10 +2725,10 @@ msgid "Subject:" msgstr "Pwnc:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Cyflwyno" @@ -2825,9 +2756,8 @@ msgstr "Cyflwyno'r holiadur" msgid "Submitted" msgstr "Cyflwynwyd" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Tanysgrifio" @@ -2835,7 +2765,7 @@ msgstr "Tanysgrifio" msgid "Subscribe me to an email alert" msgstr "Tanysgrifio i hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2854,7 +2784,7 @@ msgstr "Crynodeb" msgid "Summary reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Arolwg" @@ -2911,7 +2841,7 @@ msgstr "Diolch am uwchlwytho eich llun. Nawr mae'n rhaid i ni leoli eich problem msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Diolch, mae'n dda gennym glywed y cafodd ei drwsio! Gawn ni ofyn a ydych wedi adrodd problem i gyngor o'r blaen?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto." @@ -2919,7 +2849,7 @@ msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto." msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arni." @@ -2929,11 +2859,11 @@ msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arn msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." @@ -2945,7 +2875,7 @@ msgstr "Ni ellir gweld yr adroddiad hwnnw ar %s." msgid "That report has been removed from FixMyStreet." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3085,9 +3015,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Bu problem gyda'r e-bost neu gyfrinair. Os na allwch gofio eich cyfrinair, neu os nad oes un gennych, llenwch ddarn ‘mewngofnodi drwy e-bost’ y ffurflen." @@ -3148,9 +3078,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" @@ -3163,11 +3093,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "Dyma grynodeb o'r holl adroddiadau ar y wefan hon." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Trwsiwyd y broblem hon" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Ni thrwsiwyd y broblem hon" @@ -3204,7 +3134,7 @@ msgstr "Mae'r dudalen we hon yn cynnwys llun o'r broblem, a ddarparwyd gan y def msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" @@ -3249,8 +3179,8 @@ msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Methu trwsio" @@ -3267,7 +3197,7 @@ msgstr "Heb ei gadarnhau" msgid "Unknown" msgstr "Anhysbys" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3282,7 +3212,7 @@ msgstr "Gwall anhysbys" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3334,10 +3264,10 @@ msgstr "" msgid "Updated" msgstr "Diweddarwyd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3364,7 +3294,7 @@ msgstr "Diweddariadau ar {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "Defnyddiwch y <strong>nodyn</strong> i gofnodi manylion a ddangosir yma yn unig. Ni ddangosir nodiadau'n gyhoeddus, ac ni chânt eu hanfon at y corff." @@ -3373,11 +3303,11 @@ msgstr "Defnyddiwch y <strong>nodyn</strong> i gofnodi manylion a ddangosir yma msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3385,16 +3315,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Defnyddwyr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3431,16 +3361,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "(ni ddatgelir eich cyfeiriad e-bost na rhif ffôn)" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ni ddatgelir eich e-bost" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3449,7 +3378,7 @@ msgstr "" 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3487,10 +3416,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3510,7 +3435,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Hoffech chi dderbyn holiadur arall ymhen 4 wythnos, i'ch atgoffa i wirio'r statws?" @@ -3540,8 +3465,8 @@ msgstr "Blwyddyn" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -3655,19 +3580,19 @@ msgid "Your Reports" msgstr "Eich adroddiadau" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Eich e-bost" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3678,17 +3603,17 @@ msgstr "Eich cyfeiriad e-bost" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Eich enw" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3701,20 +3626,19 @@ msgstr "Newidiwyd eich cyfrinair" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Eich rhif ffôn" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Eich adroddiadau" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Eich adroddiadau" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Eich diweddariadau" @@ -3740,7 +3664,7 @@ msgid "didn't use map" msgstr "" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "e.e. '%s' neu '%s'" @@ -3846,8 +3770,7 @@ msgstr "ardaloedd eraill:" msgid "reopened" msgstr "ailagorwyd" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "allgofnodi" @@ -3935,7 +3858,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3989,68 +3912,41 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#~ msgid "(we never show your email)" -#~ msgstr "(ni ddatgelir eich e-bost)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r adroddiad drwy e-bost:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost:" - -#~ msgid "Email me updates" -#~ msgstr "Anfon diweddariadau ataf drwy e-bost" - -#~ msgid "Enter a new password:" -#~ msgstr "Rhowch gyfrinair newydd:" - -#~ 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 "Os ydych chi'n defnyddio e-bost drwy'r we neu os oes gennych chi hidlydd sothach, gwiriwch eich plygellau e-bost sothach: o bryd i'w gilydd, deuir o hyd i'n negeseuon yno." - -#~ msgid "Message:" -#~ msgstr "Neges:" - -#~ msgid "More problems nearby" -#~ msgstr "Rhagor o broblemau gerllaw" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Bron yna! Nawr gwiriwch eich e-bost..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Sarhaus? Anaddas? Dywedwch wrthym" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, adroddwyd am %s" -#~ msgid "Photo:" -#~ msgstr "Llun:" +#~ msgid "About us" +#~ msgstr "Amdanom" -#~ msgid "This problem has been closed" -#~ msgstr "Caewyd y broblem hon" +#~ msgid "Email me new local problems" +#~ msgstr "Rhoi gwybod i fi am broblemau lleol newydd drwy e-bost" -#~ msgid "This problem is in progress" -#~ msgstr "Mae'r broblem hon ar y gweill" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Fflat wag" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "mae'r broblem hon yn hen a'i statws yn anhysbys." +#~ msgid "Empty house or bungalow" +#~ msgstr "TÅ· neu fyngalo gwag" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Doedd hi ddim yn bosib i ni gadarnhau eich cyfrif - mae'n ddrwg gennym." +#~ msgid "Empty office or other commercial" +#~ msgstr "Swyddfa neu adeilad masnachol arall gwag" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Rydym wedi anfon e-bost atoch sy'n cynnwys dolen i gadarnhau eich cyfrif." +#~ msgid "Empty pub or bar" +#~ msgstr "Tafarn neu far gwag" -#~ 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 "Carem glywed eich barn am y wefan hon. Llenwch y ffurflen, neu anfonwch e-bost at <a href='mailto:%s'>%s</a>:" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Rydych wedi atodi llun i'r adroddiad hwn eisoes, byddai atodi un arall yn ei amnewid." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Rhowch enw stryd ac ardal gerllaw, cod post neu ardal yn Delhi" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Rydych wedi atodi llun i'r diweddariad hwn eisoes, byddai atodi un arall yn ei amnewid." +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "Your email:" -#~ msgstr "Eich e-bost:" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Yn anffodus, ni allwch gadarnhau adroddiadau heb eu cadarnhau." -#~ msgid "Your name:" -#~ msgstr "Eich enw:" +#~ msgid "Problems in this area" +#~ msgstr "Problemau yn yr ardal hon" -#~ msgid "Your email:" -#~ msgstr "Eich e-bost:" +#~ msgid "Property type:" +#~ msgstr "Math o eiddo:" diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po index b097e4ab1..14a384c40 100644 --- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/da_DK.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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:35+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Danish (Denmark) (http://www.transifex.com/mysociety/fixmystreet/language/da_DK/)\n" "Language: da_DK\n" @@ -24,7 +24,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " og " @@ -57,9 +57,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Administrationer" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -94,7 +93,7 @@ msgstr "%s aktive opdateringer" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s spørgeskemaer sendt – %s besvaret (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -113,10 +112,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, rapporteret %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, indefor bydel %s" @@ -171,7 +166,7 @@ msgstr "(som graffite, affald, hul i vejen, eller ødelagt gadelys)" msgid "(not sent to council)" msgstr "(ikke rapporteret til myndigheden)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(valgfrit)" @@ -183,12 +178,11 @@ msgstr "(offentlig)" msgid "(sent to both)" msgstr "(sendt til begge)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Vælg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Vælg en ejendomsstype --" @@ -220,26 +214,21 @@ msgstr "<strong>Nej</strong> Lad mig bekræfte min rapport med e-post" 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:87 +#: templates/web/base/auth/general.html:97 #: 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:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jeg har en adgangskode" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Om os" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Handling planlagt" @@ -270,7 +259,7 @@ msgstr "Tilføj ny kategori" msgid "Add user" msgstr "Tilføj bruger" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Tilføjede %s" @@ -290,7 +279,7 @@ msgstr "Varsel %d oprettet for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d koblet fra (oprettet %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Send mig varsel ved fremtidige opdateringer" @@ -303,7 +292,7 @@ msgstr "Alle rapporter" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -402,7 +391,7 @@ msgstr "Tilbage" msgid "Ban email address" msgstr "Bandlys epostadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -433,7 +422,7 @@ 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:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -448,7 +437,7 @@ msgstr "Kategori" 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/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -468,7 +457,7 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Skift adgangskode" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -476,7 +465,7 @@ 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 +#: templates/web/base/admin/body.html:169 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." @@ -484,7 +473,7 @@ 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 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -500,7 +489,7 @@ msgstr "" "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 +#: templates/web/base/admin/body.html:129 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,8 +530,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -551,7 +540,7 @@ msgstr "" msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Lukket af myndigheden" @@ -577,7 +566,7 @@ msgstr "Mærkevaresamarbejdsdata:" msgid "Cobrand:" msgstr "Mærkevaresamarbejde:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Opsætning" @@ -596,9 +585,8 @@ msgstr "Bekræft konto" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, 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." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -608,7 +596,7 @@ msgstr "Bekræft via epost nedenfor, og angiv en ny adgangskode der. NÃ¥r du har msgid "Confirmation" msgstr "Bekræftelse" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -627,7 +615,7 @@ msgid "Confirmed:" msgstr "Bekræftet:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -646,8 +634,8 @@ msgstr "Kontakt projektgruppen" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kunne ikke finde bruger" @@ -665,7 +653,7 @@ msgstr "Administration" msgid "Council contacts for %s" msgstr "Administrationskontakter for %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "myndighedsreference: %s" @@ -684,7 +672,7 @@ msgstr "Antal" msgid "Create a report" msgstr "Lav en rapport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Lav kategori" @@ -728,20 +716,20 @@ msgstr "Oversigt" msgid "Dealt with by subdivision within 5 working days" msgstr "Behandlet af underafdeling inden 5 arbejdsdage" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Slettet" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -749,7 +737,7 @@ msgid "Description" msgstr "Beskrivelse" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detaljer" @@ -774,11 +762,11 @@ msgid "Diligency prize league table" msgstr "Arbejdsheste" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -796,8 +784,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplikat" @@ -820,7 +808,7 @@ msgstr "" msgid "Edit" msgstr "Redigér" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Redigér detaljer for myndighed" @@ -850,7 +838,7 @@ msgstr "Opdateret af" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -858,11 +846,11 @@ msgstr "Opdateret af" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Epost lagt til misbrugsliste" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-postadresse:" @@ -874,19 +862,14 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 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/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "E-post:" @@ -895,26 +878,6 @@ msgstr "E-post:" msgid "Email: %s" msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Tom lejlighed" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Tomt hus eller bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Tomt kontor eller forretningsbygning" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Tom pub eller bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -964,18 +927,14 @@ msgstr "Indtast postnummer i nærheden, eller vejnavn og sted" 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Indtast en ny adgangskode" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Indtast detaljer om problemet" @@ -1001,7 +960,7 @@ msgstr "Eksempel-postnummer %s" msgid "Examples:" msgstr "Eksempler:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Forklar hvad som er galt, nøjagtigt hvor det er og hvor længe det har været galt..." @@ -1038,19 +997,15 @@ msgstr "Første gang" 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:26 -msgid "FixMyStreet" -msgstr "FixMinVej" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Løst" @@ -1077,7 +1032,7 @@ msgstr "Markér som slettet" msgid "Flag user" msgstr "Markér bruger" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Markeret:" @@ -1099,8 +1054,7 @@ msgstr "Markerede brugere er ikke begrænset pÃ¥ noget mÃ¥de. Dette er bare en msgid "Flagged:" msgstr "Markeret:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/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." @@ -1131,18 +1085,18 @@ msgstr "Ofte spurgte spørgsmÃ¥l" msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "FÃ¥ opdateringer" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "FÃ¥ opdateringer for problemer i denne %s" @@ -1155,7 +1109,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Glad for at høre at det er i orden!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1181,7 +1135,7 @@ msgstr "Er dette problem blevet løst?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Har du rapporteret et problem til en myndighed før, eller er dette første gang?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1192,8 +1146,7 @@ msgstr "Hjælp" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Her er de forskellige typer lokale problemvarsler for ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hej, %s" @@ -1209,11 +1162,11 @@ msgstr "Hej, %s" msgid "Hidden" msgstr "Skjul" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Skjul gamle" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Skjul nÃ¥le" @@ -1233,10 +1186,6 @@ msgstr "Hvordan rapporteres et problem" msgid "How to send successful reports" msgstr "Hvordan indsendes rapporter som er løst" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1247,7 +1196,7 @@ msgstr "Jeg rapporterede netop et problem pÃ¥ @fixminvej" msgid "I just updated a problem on @fixmystreet" msgstr "Jeg opdaterede netop et problem pÃ¥ @fixminvej" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1269,7 +1218,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "Identificér en <strong>parent</strong> hvis instansen selv er en del af en anden myndighed." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1290,7 +1239,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 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." @@ -1332,10 +1281,10 @@ msgstr "Ugyldigt ID" msgid "Illegal feed selection" msgstr "Ugyldigt valg af feed" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Under Udførelse" @@ -1386,7 +1335,7 @@ msgstr "Intern reference" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-værdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ugyldig slut-dato" @@ -1394,16 +1343,16 @@ msgstr "Ugyldig slut-dato" msgid "Invalid format %s specified." msgstr "Ugyldigt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Undersøges" @@ -1425,7 +1374,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1463,7 +1412,6 @@ msgstr "Indlæser..." #: 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" @@ -1472,11 +1420,11 @@ msgstr "Lokale RSS-strømme og e-postvarsler" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokale RSS-strømme og e-postvarsler" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokale varsler" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokalisér problemet pÃ¥ kortet over omrÃ¥det" @@ -1536,14 +1484,14 @@ msgstr "MÃ¥ned" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Navn" @@ -1567,8 +1515,8 @@ msgstr "Nærmeste navngivne vej til nÃ¥len placeret pÃ¥ kortet (automatisk gener msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Nærmeste postnummer for nÃ¥len placeret pÃ¥ kortet (automatisk genereret): %s (%sm væk)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1592,7 +1540,7 @@ msgstr "Nye <br>problemer" msgid "New body added" msgstr "Ny myndighed tilføjet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Ny kategorikontakt tilføjet" @@ -1657,7 +1605,7 @@ msgstr "Næste" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nej" @@ -1729,8 +1677,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Ikke ansvarlig" @@ -1763,7 +1711,7 @@ msgstr "Bemærk" 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/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1777,15 +1725,15 @@ msgstr "Note: <strong>%d</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "PÃ¥ tide at sende din rapport…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "PÃ¥ tide at registrere din opdatering…" @@ -1819,8 +1767,8 @@ msgstr "Enlinjers opsummering" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1855,13 +1803,13 @@ 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 baseret pÃ¥ bydel eller myndighed du hører ind under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1886,7 +1834,7 @@ msgstr "Forælder" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1895,7 +1843,7 @@ msgid "Password (optional)" msgstr "Adgangskode (valgfrit)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Adgangskode:" @@ -1903,7 +1851,7 @@ msgstr "Adgangskode:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnummer" @@ -1919,13 +1867,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Billed" @@ -1949,8 +1905,8 @@ msgstr "Placér tegnestiften pÃ¥ kortet" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1966,16 +1922,16 @@ msgstr "Vær høflig, præcis og kortfattet." msgid "Please check the passwords and try again" msgstr "Venligst kontrollér adgangskoderne og prøv igen" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "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:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1985,7 +1941,7 @@ msgstr "Vælg en kategori" msgid "Please choose a property type" msgstr "Vælg en type egenskab" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Husk at rette op pÃ¥ fejlene nedenfor." @@ -2006,11 +1962,10 @@ msgstr "Vær ikke ufin — at skælde ud pÃ¥ din myndighed skader værdien a msgid "Please enter a message" msgstr "Venligst indlæg en besked" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Angiv dit navn" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2024,10 +1979,10 @@ msgstr "Indtast en adgangskode" msgid "Please enter a subject" msgstr "Venligst angiv et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2044,9 +1999,9 @@ msgid "Please enter some details" msgstr "Angiv oplysninger om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2055,7 +2010,7 @@ msgid "Please enter your email" msgstr "Angiv din e-post" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Venligst angiv din e-postadresse" @@ -2071,7 +2026,7 @@ msgstr "Venligst angiv dit fulde navn, myndigheder som modtager dit problem har #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Angiv dit navn" @@ -2098,7 +2053,7 @@ msgstr "Du kan ogsÃ¥ <a href=\"%s\">logge ind igen</a> eller gÃ¥ tilbage til <a 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:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Venligst udfyld detaljer om problemet." @@ -2109,7 +2064,7 @@ msgstr "" "Venligst udfyld skemaet nedenfor med detaljerne om problemet,\n" "og beskriv placeringen sÃ¥ nøjagtigt som muligt i boksen for detaljer." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Venligst indikér om du ønsker at modtage et nyt spørgeskema" @@ -2118,9 +2073,8 @@ 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/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -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." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2136,16 +2090,16 @@ msgstr "" msgid "Please note:" msgstr "Venligst bemærk:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Venligst bidrag med en forklaring pÃ¥ hvorfor du genÃ¥bner denne problemrapport" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 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:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Venligst oplys om du har rapporteret et problem til din myndighed tidligere" @@ -2161,22 +2115,23 @@ msgstr "Vælg den kilde du ønsker" msgid "Please select the type of alert you want" msgstr "Venligst vælg hvilken type varsel du ønsker" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Venligs angiv om dette problem er blevet fikset eller ikke" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Venligst læg kun JPEG-bilder op" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Indtast en besked" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Indtast venligst din opdatering her" @@ -2207,7 +2162,7 @@ msgstr "" msgid "Previous" msgstr "Forrige" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Personliv" @@ -2217,7 +2172,7 @@ msgstr "Personliv" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2246,7 +2201,7 @@ msgstr "Problem %s sendt til myndighed %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling af problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem markeret som Ã¥bent." @@ -2258,10 +2213,6 @@ msgstr "Problemtilstandsændring baseret pÃ¥ spørgeundersøgelsesresultater" msgid "Problems" msgstr "Problemer" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemer i dette omrÃ¥de" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemer i nærheden" @@ -2279,13 +2230,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemer indenfor %.1fkm fra denne positionen" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemer indenfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemer indenfor %s bydel" @@ -2304,15 +2253,11 @@ msgstr "Problemer indenfor grænserne af:" 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:6 msgid "Provide an update" msgstr "Bidrag med en opdatering" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2346,16 +2291,15 @@ msgstr "Spørgeskema %d udfyldt for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørgeskema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Spørgeskema udfyldt af fejlrapportøren" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-strøm" @@ -2383,18 +2327,12 @@ msgstr "RSS-strøm af %s, indenfor %s bydel" 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:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 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:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer indenfor %s bydel" @@ -2404,14 +2342,13 @@ msgstr "RSS-strøm for problemer indenfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 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/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Modtag e-post nÃ¥r der er opdateringer pÃ¥ dette problem" @@ -2447,12 +2384,11 @@ msgstr "Fjern billede (kan ikke fortrydes!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Rapport" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2462,7 +2398,7 @@ msgstr "Rapportér et problem" msgid "Report abuse" msgstr "Rapportér misbrug" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Rapport pÃ¥ %s" @@ -2477,7 +2413,7 @@ msgstr "Rapportér dit problem" msgid "Report, view, or discuss local problems" msgstr "Rapportér, find eller diskutér lokale problemer" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapporteret anonymt %s" @@ -2487,7 +2423,7 @@ msgstr "Rapporteret anonymt %s" msgid "Reported before" msgstr "Rapporteret tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Publiceret af %s %s" @@ -2501,27 +2437,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Rapporteret i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Rapporteret i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Rapporteret i kategorien %s af %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Publiceret af %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Rapporteret af %s af %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapporteret af %s i kategorien %s af %s %s" @@ -2542,7 +2478,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Rapporterer et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2585,15 +2521,15 @@ msgstr "Vejoperatør for denne navngivne vej (udledt af vejens referencenummer o msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vejoperatør for denne navngivne vej (fra OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rotér til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2608,7 +2544,7 @@ msgstr "" msgid "Satellite" msgstr "Satelit" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2664,7 +2600,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -2683,21 +2619,21 @@ msgstr "Del" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Vis mit navn offentligt" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Vis gamle" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Vis nÃ¥le" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2759,9 +2695,8 @@ msgstr "Beklager, men vi kunne ikke finde dette sted." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2769,15 +2704,10 @@ msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen." msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Start-dato:" @@ -2786,7 +2716,7 @@ msgstr "Start-dato:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Tilstand" @@ -2799,7 +2729,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2839,10 +2769,10 @@ msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Send ind" @@ -2870,9 +2800,8 @@ msgstr "Indsend spørgeskema" msgid "Submitted" msgstr "Sendt ind" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Abonnér" @@ -2880,7 +2809,7 @@ msgstr "Abonnér" msgid "Subscribe me to an email alert" msgstr "Jeg ønsker at abonnere pÃ¥ e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2899,7 +2828,7 @@ msgstr "Opsummering" msgid "Summary reports" msgstr "Opsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Spørgeundersøgelse" @@ -2956,7 +2885,7 @@ msgstr "Tak for at du har lagt dit billede op. Vi skal nu placere dit problem, msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Tak, glad for at høre at problemet er fikset! Vi vil gjerne spørge dig om du har rapporteret et problem til en myndighed tidligere?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 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." @@ -2964,7 +2893,7 @@ msgstr "Billedet ser ikke ud til at være blevet lagt op rigtigt (%s), prøv ige msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Det sted dækkes ikke af nogen myndighed, mÃ¥ske det er til søs eller udenfor landet - venligst forsøgm med et andet sted." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2974,11 +2903,11 @@ msgstr "Det sted virker ikke til at være i Storbritannien. Venligst prøv igen. msgid "That postcode was not recognised, sorry." msgstr "Det postnummer blev ikke genkendt, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Det problem er blevet markeret som sendt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Det problem vil nu blive sendt igen." @@ -2990,7 +2919,7 @@ msgstr "Denne rapport kan ikke vises pÃ¥ %s." msgid "That report has been removed from FixMyStreet." msgstr "Den rapport er blevet fjernet fra FixMinVej." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3146,9 +3075,9 @@ msgstr "Der var problemer med at vise 'Alle rapporter'-siden. Venligst prøv ig msgid "There was a problem showing this page. Please try again later." msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘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" @@ -3218,9 +3147,9 @@ msgstr "Denne e-post er blevet sendt til begge myndigheder som dækker stedet fo msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Denne e-post er blevet sendt til flere myndigheder som dækker stedet for problemet, da den valgte kategori er tilgængelig for disse. Vær sød at ignorere e-posten hvis I ikke er korrekt myndighed for at hÃ¥ndtere denne sag." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Denne information er pÃ¥krævet" @@ -3233,11 +3162,11 @@ msgstr "Dette er et udviklernetsted.Ting kan gÃ¥ i stykker nÃ¥r som helst og dat 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/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dette problem er løst" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dette problem er ikke blevet løst" @@ -3274,7 +3203,7 @@ msgstr "Denne netside indeholder ogsÃ¥ et billede af problemet, sendt ind af bru msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3319,8 +3248,8 @@ msgstr "Forsøg at sende epost direkte til os:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Kan ikke fikses" @@ -3337,7 +3266,7 @@ msgstr "Ubekræftet" msgid "Unknown" msgstr "Ukendt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Ukendt varsel-type" @@ -3352,7 +3281,7 @@ msgstr "Ukendt fejl" msgid "Unknown problem ID" msgstr "Ukendt problem-Id" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Opdatering" @@ -3404,10 +3333,10 @@ msgstr "Opdatér tilstanden" msgid "Updated" msgstr "Opdateret" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3434,7 +3363,7 @@ msgstr "Opdateringer af {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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." @@ -3443,11 +3372,11 @@ msgstr "Brug <strong>notater</strong> for at notere detaljer som skal vises i ad msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Brugermarkering fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Bruger markeret" @@ -3455,16 +3384,16 @@ msgstr "Bruger markeret" 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:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brugere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Værdier opdateret" @@ -3501,16 +3430,15 @@ msgstr "Vi fandt mere en et træf for dette sted. Vi viser op til ti træf, sÃ¥ #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Vi viser aldrig din e-postadresse eller dit telefonnummer" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Vi viser aldrig din e-postadresse" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Vi viser aldrig din e-postadresse eller dit telefonnummer" @@ -3519,7 +3447,7 @@ msgstr "Vi viser aldrig din e-postadresse eller dit telefonnummer" 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Vi sender til myndigheden pÃ¥ dine vegne" @@ -3557,10 +3485,6 @@ msgstr "HvornÃ¥r sendt" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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." @@ -3580,7 +3504,7 @@ msgstr "NÃ¥r du søger efter forespørgsler, sÃ¥ er det ogsÃ¥ muligt at søge ef 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:96 +#: templates/web/base/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?" @@ -3610,8 +3534,8 @@ msgstr "Ã…r" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3729,19 +3653,19 @@ msgid "Your Reports" msgstr "Dine rapporter" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Din e-post" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3752,17 +3676,17 @@ msgstr "Din e-postadresse" 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/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Dit navn" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3775,20 +3699,19 @@ msgstr "Din adgangskode er blevet ændret" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Dit telefonnummer" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Dine opdateringer" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Dine opdateringer" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Dine opdateringer" @@ -3814,7 +3737,7 @@ msgid "didn't use map" msgstr "brugte ikke kort" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "for eksempel '%s' eller '%s'" @@ -3920,8 +3843,7 @@ msgstr "andre omrÃ¥der:" msgid "reopened" msgstr "Ã¥bnet igen" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "log ud" @@ -3999,7 +3921,7 @@ 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 +#: templates/web/base/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." @@ -4041,86 +3963,47 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils 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 "(we never show your email address or phone number)" -#~ msgstr "(vi viser aldrig din e-postadresse eller dit telefonnummer)" - -#~ msgid "(we never show your email)" -#~ msgstr "(vi viser aldrig din e-postadresse)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Nej</strong>, lad mig bekræfte min rapport med e-post:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Nej</strong>, lad mig bekræfte min opdatering med e-post:" - -#~ msgid "Email me updates" -#~ msgstr "Send mig opdateringer" - -#~ msgid "Enter a new password:" -#~ msgstr "Indtast en ny adgangskode:" - -#~ 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" - -#~ 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." - -#~ msgid "Message:" -#~ msgstr "Besked:" - -#~ msgid "More problems nearby" -#~ msgstr "Flere problemer i nærheden" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Nesten færdig! Nu skal du tjekke din e-post..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Stødende? Upassende? Giv os besked" - -#~ msgid "Photo:" -#~ msgstr "Billed:" - -#~ msgid "Please check your email" -#~ msgstr "Venligst kontrollér e-posten du angav" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, rapporteret %s" -#~ 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>" +#~ msgid "About us" +#~ msgstr "Om os" -#~ 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." +#~ msgid "Email me new local problems" +#~ msgstr "Send mig e-post om lokale problemer" -#~ msgid "This problem has been closed" -#~ msgstr "Dette problem er lukket" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Tom lejlighed" -#~ msgid "This problem is in progress" -#~ msgstr "Dette problemet er under udførelse" +#~ msgid "Empty house or bungalow" +#~ msgstr "Tomt hus eller bungalow" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Dette problem er gammelt og med ukendt status." +#~ msgid "Empty office or other commercial" +#~ msgstr "Tomt kontor eller forretningsbygning" -#~ msgid "Update:" -#~ msgstr "Opdatering:" +#~ msgid "Empty pub or bar" +#~ msgstr "Tom pub eller bar" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Vi har ikke kunnet bekræfte din konto - beklager." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Tom offentlig bygning - skole, sygehus, etc." -#~ 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." +#~ 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" -#~ 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>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMinVej" -#~ 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." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Jeg er bange for at du ikke kan bekræfte ubekræftede rapporter." -#~ 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." +#~ msgid "Problems in this area" +#~ msgstr "Problemer i dette omrÃ¥de" -#~ msgid "Your email:" -#~ msgstr "Din e-post" +#~ msgid "Property type:" +#~ msgstr "Type egenskab:" -#~ msgid "Your name:" -#~ msgstr "Dit navn:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS-strøm for problemer i denne %s" -#~ msgid "Your email:" -#~ msgstr "Din e-post:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Hel blok med tomme lejligheder" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index b2bc5c658..32ac3d660 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" "PO-Revision-Date: 2015-10-23 16:37+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: German (Switzerland) (http://www.transifex.com/mysociety/fixmystreet/language/de_CH/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "und" @@ -89,7 +89,7 @@ msgstr "Schicken Sie mir Aktualisierungen" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -108,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "Gemeldet von %s um %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -122,7 +118,7 @@ msgstr "" #: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" -msgstr "" +msgstr "(Schaden & Ort des Schadens)" #: templates/web/base/admin/report_blocks.html:41 #: templates/web/base/admin/users.html:31 @@ -166,7 +162,7 @@ msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" msgid "(not sent to council)" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(optional)" @@ -178,12 +174,11 @@ msgstr "" msgid "(sent to both)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -200,7 +195,7 @@ msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") #: templates/web/base/reports/_list-filters.html:27 msgid "<label>Show %s</label> <label>about %s</label>" -msgstr "" +msgstr "<label>Zeige %s</label> <label>über %s</label>" #: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 @@ -215,26 +210,21 @@ msgstr "Meldung per E-Mail bestätigen" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "Neu Registrieren" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "Passwort" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Über uns" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -265,7 +255,7 @@ msgstr "Füge neue Kategorie hinzu" msgid "Add user" msgstr "User hinzufügen" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "" @@ -285,7 +275,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "" @@ -298,7 +288,7 @@ msgstr "Alle Meldungen" msgid "All Reports as CSV" msgstr "Als CSV exportieren" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -397,7 +387,7 @@ msgstr "Zurück" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -420,7 +410,7 @@ msgstr "" #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." -msgstr "" +msgstr "Falls Sie kein E-Mail erhalten haben, überprüfen Sie bitte Ihren Spamordner." #: templates/web/base/around/_report_banner.html:5 msgid "Can't see the map? <em>Skip this step</em>" @@ -428,7 +418,7 @@ msgstr "Karte nicht sichtbar? <em>Überspringen Sie diesen Schritt</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -443,7 +433,7 @@ msgstr "Kategorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -463,19 +453,19 @@ msgstr "Kategorie: %s" msgid "Change password" msgstr "Passwort ändern" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -486,7 +476,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -508,27 +498,27 @@ msgstr "Schaden lokalisieren" #: templates/web/base/email_sent.html:13 msgid "Click the link in our confirmation email to activate your alert." -msgstr "" +msgstr "Klicken Sie auf den Link im Bestätigungsmail um diese Benachrichtigung zu aktivieren." #: templates/web/base/email_sent.html:9 msgid "Click the link in our confirmation email to publish your problem." -msgstr "" +msgstr "Klicken Sie auf den Link im Bestätigungsmail um über den Bearbeitungsstand Ihrer Meldung informiert zu bleiben." #: templates/web/base/email_sent.html:11 msgid "Click the link in our confirmation email to publish your update." -msgstr "" +msgstr "Klicken Sie auf den Link im Bestätigungsmail um diese Überarbeitung zu veröffentlichen." #: templates/web/base/auth/token.html:18 msgid "Click the link in our confirmation email to sign in." -msgstr "" +msgstr "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." #: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: perllib/FixMyStreet/Cobrand/Zurich.pm:969 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -537,7 +527,7 @@ msgstr "" msgid "Closed" msgstr "Beantwortet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -563,7 +553,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -578,7 +568,7 @@ msgstr "Bestätigen" #: templates/web/base/auth/token.html:1 msgid "Confirm account" -msgstr "" +msgstr "Account bestätigen" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 @@ -593,7 +583,7 @@ msgstr "" msgid "Confirmation" msgstr "Bestätigung" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -612,9 +602,9 @@ msgid "Confirmed:" msgstr "Bestätigt:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" -msgstr "" +msgstr "%s kontaktieren" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 @@ -631,8 +621,8 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinaten" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "" @@ -650,7 +640,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "Kontaktdetails von %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -669,7 +659,7 @@ msgstr "Anzahl" msgid "Create a report" msgstr "Erfasse eine Meldung" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kategorie erstellen" @@ -713,20 +703,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "Innerhalb von fünf Arbeitstagen abgeschlossen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Vorlage löschen" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Gelöscht" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -734,7 +724,7 @@ msgid "Description" msgstr "Beschreibung" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Beschreibung" @@ -759,13 +749,13 @@ msgid "Diligency prize league table" msgstr "Weiss ich nicht" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" -msgstr "" +msgstr "Haben Sie ein %s Passwort?" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" @@ -781,8 +771,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -802,7 +792,7 @@ msgstr "" msgid "Edit" msgstr "Anpassen" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Details editieren" @@ -832,7 +822,7 @@ msgstr "" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -840,11 +830,11 @@ msgstr "" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -856,19 +846,14 @@ msgstr "E-Mail Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail Benachrichtigung gelöscht" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "E-mail:" @@ -877,26 +862,6 @@ msgstr "E-mail:" msgid "Email: %s" msgstr "E-mail:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -940,18 +905,14 @@ msgstr "Ungefähre Adresse des Schadens" msgid "Enter a nearby street name and area" msgstr "Ungefähre Adresse des Schadens" -#: 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Ihr Passwort" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Beschreiben Sie den Schaden" @@ -966,7 +927,7 @@ msgstr "Fehler" #: templates/web/base/reports/_list-filters.html:12 msgid "Everything" -msgstr "" +msgstr "Alles" #: templates/web/base/admin/body.html:14 #: templates/web/base/admin/category_edit.html:18 @@ -977,7 +938,7 @@ msgstr "Beispieladresse" msgid "Examples:" msgstr "Beispiele:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1014,19 +975,15 @@ msgstr "" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Beantwortet" @@ -1053,7 +1010,7 @@ msgstr "Als gelöscht markieren" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1075,8 +1032,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1107,18 +1063,18 @@ msgstr "Hilfe" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Beschreiben Sie den Schaden" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1131,7 +1087,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1157,7 +1113,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1168,8 +1124,7 @@ msgstr "Hilfe" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hallo %s" @@ -1185,11 +1140,11 @@ msgstr "Hallo %s" msgid "Hidden" msgstr "Unsichtbar" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Alte ausblenden" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Stecknadeln ausblenden" @@ -1209,10 +1164,6 @@ msgstr "Erfassen Sie eine neue Meldung:" msgid "How to send successful reports" msgstr "Anleitung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1223,7 +1174,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1245,7 +1196,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1266,7 +1217,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1301,10 +1252,10 @@ msgstr "Unbekannt ID" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "In Bearbeitung" @@ -1355,7 +1306,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" @@ -1363,16 +1314,16 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "" @@ -1394,7 +1345,7 @@ msgstr "Zuständigkeit unbekannt" msgid "Jurisdiction unknown" msgstr "Zuständigkeit unbekannt" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1432,7 +1383,6 @@ msgstr "" #: 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 "" @@ -1441,11 +1391,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "RSS" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokalisieren Sie den Schaden auf der Karte" @@ -1505,14 +1455,14 @@ msgstr "Monat" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Name" @@ -1536,8 +1486,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1549,7 +1499,7 @@ msgstr "" #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 msgid "Nearly done! Now check your email…" -msgstr "" +msgstr "Fast Fertig! Bitte checken Sie Ihre Mailbox…" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1559,7 +1509,7 @@ msgstr "Neue <br>Meldungen" msgid "New body added" msgstr "Neue Organisation hinzugefügt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1624,7 +1574,7 @@ msgstr "Weiter" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nein" @@ -1689,8 +1639,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1723,7 +1673,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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1737,15 +1687,15 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "Nachrichten an die Kommunikationstelle" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1779,8 +1729,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1815,13 +1765,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1846,7 +1796,7 @@ msgstr "Gehört zu" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1855,7 +1805,7 @@ msgid "Password (optional)" msgstr "Passwort" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "" @@ -1863,7 +1813,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnummer" @@ -1879,13 +1829,21 @@ msgid "Phone:" msgstr "Telefonnummer:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1909,8 +1867,8 @@ msgstr "Pin auf der Karte absetzen" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1926,16 +1884,16 @@ msgstr "Bitte seien Sie freundlich und prägnant." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1945,7 +1903,7 @@ msgstr "Bitte wählen Sie eine Kategorie" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1966,8 +1924,8 @@ msgstr "" msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 #, fuzzy msgid "Please enter a name" msgstr "Bitte geben Sie Ihren Namen an" @@ -1984,10 +1942,10 @@ msgstr "Obligatorisches Feld" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2004,9 +1962,9 @@ msgid "Please enter some details" msgstr "Bitte geben Sie einige Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2015,7 +1973,7 @@ msgid "Please enter your email" msgstr "Ihre E-Mail Adresse" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Ihre E-Mail Adresse" @@ -2031,7 +1989,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" @@ -2058,7 +2016,7 @@ msgstr "<a href=\"%s\">Erneut anmelden</a> oder <a href=\"/\">zurück zur St msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Beschreiben Sie den Schaden." @@ -2067,7 +2025,7 @@ msgstr "Beschreiben Sie den Schaden." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Füllen Sie das Formular mit den Details des Schadens aus und beschreiben Sie den Ort des Schadens möglichst genau." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2093,16 +2051,16 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2118,22 +2076,23 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Bitte laden Sie nur JPEG Bilder hoch." #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "" @@ -2164,7 +2123,7 @@ msgstr "" msgid "Previous" msgstr "Zurück" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2174,7 +2133,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2203,7 +2162,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "" @@ -2215,10 +2174,6 @@ msgstr "" msgid "Problems" msgstr "Meldungen" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Meldungen in dieser Gegend" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Meldungen in der Nähe" @@ -2236,13 +2191,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Meldungen innerhalb %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2251,7 +2204,7 @@ msgstr "" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 msgid "Problems within %s, %s" -msgstr "" +msgstr "Meldungen innerhalb %s, %s" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2261,15 +2214,11 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Meldung aktualisieren" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2303,16 +2252,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "" @@ -2340,18 +2288,12 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2361,14 +2303,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." @@ -2376,7 +2317,7 @@ msgstr "Erhalten Sie Aktualisierungen dieser Meldung." #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 msgid "Recent local problems, %s" -msgstr "" +msgstr "Kürzlich erfasste Meldungen, %s" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2404,12 +2345,11 @@ msgstr "" msgid "Reply to user:" msgstr "Antwort an User" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Meldung" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2419,7 +2359,7 @@ msgstr "Eine Meldung erfassen" msgid "Report abuse" msgstr "Missbrauch melden" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2434,7 +2374,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Melden Sie Schäden an der Infrastruktur von Zürich" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" @@ -2444,7 +2384,7 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -2458,33 +2398,33 @@ msgstr "Gemeldet von" msgid "Reported in the %s category" msgstr "In der Kategorie %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "In der Kategorie %s um %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 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 "" +msgstr "In den letzten 4 Wochen gemeldet" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 @@ -2499,7 +2439,7 @@ msgstr "Gemeldet" msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2542,15 +2482,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2565,7 +2505,7 @@ msgstr "Durch das Drehen des Fotos gehen nicht gespeicherte Änderungen verloren msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2621,7 +2561,7 @@ msgstr "" msgid "Sent report back" msgstr "Meldung zurückgewiesen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2640,21 +2580,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Zeige Stecknadeln" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2672,7 +2612,7 @@ msgstr "Ausloggen" #: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." -msgstr "" +msgstr "Einige Kategorien benötigen eventuell zusätzliche Informationen." #: templates/web/base/admin/body-form.html:149 #: templates/web/base/admin/body-form.html:150 @@ -2697,7 +2637,7 @@ msgstr "" #: templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" -msgstr "" +msgstr "Entschuldigung, dieser Link ist ungültig" #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." @@ -2723,14 +2663,9 @@ msgstr "Diese Adresse wurde nicht gefunden." msgid "Sorry, we could not parse that location. Please try again." msgstr "Diese Adresse wurde nicht gefunden." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." -msgstr "" - -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Diese Adresse wurde nicht gefunden." +msgstr "Ihre Bilder konnten nicht gespeichert werden. Bitte versuchen Sie es nochmals." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" @@ -2740,7 +2675,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Status" @@ -2753,7 +2688,7 @@ msgstr "Status" msgid "State:" msgstr "Status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2793,10 +2728,10 @@ msgid "Subject:" msgstr "Titel" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Abschicken" @@ -2824,9 +2759,8 @@ msgstr "" msgid "Submitted" msgstr "Erfasst" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2834,7 +2768,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2853,7 +2787,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "Alle Meldungen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2910,7 +2844,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2918,7 +2852,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Sie können Schäden nur innerhalb der Stadt Zürich melden. Verwenden Sie dafür die Adressuche." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2928,11 +2862,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." -msgstr "" +msgstr "Die Meldung wurde als gesendet markiert." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2944,7 +2878,7 @@ 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:144 +#: templates/web/base/admin/body.html:142 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." @@ -3033,7 +2967,7 @@ msgstr "" #: templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." -msgstr "" +msgstr "Der Link ist entweder abgelaufen, oder er wurde nicht korrekt kopiert." #: templates/web/base/admin/body-form.html:58 msgid "The list of available areas is being provided by the MapIt service at %s." @@ -3084,9 +3018,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Ihre E-Mail/Passwort Kombination war ungültig. Bitte versuchen Sie es erneut oder wenden Sie sich an den Administrator." @@ -3147,9 +3081,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3162,11 +3096,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dieser Schaden wurde behoben" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dieser Schaden wurde nicht behoben" @@ -3203,7 +3137,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "Aufwand (in Minuten)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3224,7 +3158,7 @@ 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 "Geben Sie eine Adresse an" +msgstr "Geben Sie Ihre Adresse an, um über Meldungen in Ihrer Nähe informiert zu werden" #: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" @@ -3248,8 +3182,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3266,7 +3200,7 @@ msgstr "Unbestätigt" msgid "Unknown" msgstr "Unbekannt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3281,7 +3215,7 @@ msgstr "Unbekannter Fehler" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Speichern" @@ -3333,10 +3267,10 @@ msgstr "" msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3361,9 +3295,9 @@ msgstr "" #: templates/web/base/report/display.html:0 #: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "" +msgstr "Änderungen an dieser Meldung, %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3372,11 +3306,11 @@ msgstr "" msgid "Used map" msgstr "Karte verwendet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3384,16 +3318,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3416,7 +3350,7 @@ msgstr "Meldung erfassen" #: templates/web/base/report/display.html:0 msgid "Viewing a problem" -msgstr "" +msgstr "Meldung anschauen" #: templates/web/base/reports/body.html:16 msgid "Wards of this council" @@ -3439,7 +3373,7 @@ msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" msgid "We never show your email" msgstr "Ihr E-Mail wird nie angezeigt" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" @@ -3448,7 +3382,7 @@ msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3486,10 +3420,6 @@ msgstr "Wann gesendet" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3509,7 +3439,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3539,8 +3469,8 @@ msgstr "Jahr" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3655,19 +3585,19 @@ msgid "Your Reports" msgstr "Ihre Meldungen" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "E-Mail Adresse" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3678,17 +3608,17 @@ msgstr "Ihre E-Mail Adresse" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Wir verwenden Ihre persönlichen Daten nur entsprechend unserer <a href=\"/faq#privacy\">Datenschutzrichtlinien.</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ihr Name" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3701,7 +3631,7 @@ msgstr "Ihr Passwort wurde geändert" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -3710,17 +3640,17 @@ msgstr "Ihre Telefonnummer" msgid "Your report" msgstr "Ihre Meldungen" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Ihre Meldungen" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" #: templates/web/base/reports/_list-filters.html:3 msgid "all reports" -msgstr "" +msgstr "Alle Meldungen" #: templates/web/base/admin/timeline.html:4 msgid "by %s" @@ -3728,7 +3658,7 @@ msgstr "" #: templates/web/base/reports/_list-filters.html:5 msgid "closed reports" -msgstr "" +msgstr "Abgeschlossene Meldungen" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3740,7 +3670,7 @@ msgid "didn't use map" msgstr "hat Karte nicht verwendet" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "z.B. ‘%s’ oder ‘%s’" @@ -3751,7 +3681,7 @@ msgstr "" #: templates/web/base/reports/_list-filters.html:6 msgid "fixed reports" -msgstr "" +msgstr "Beantwortete Meldungen" #: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 @@ -3846,8 +3776,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "ausloggen" @@ -3871,7 +3800,7 @@ msgstr "heute" #: templates/web/base/reports/_list-filters.html:4 msgid "unfixed reports" -msgstr "" +msgstr "Offene Meldungen" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -3883,7 +3812,7 @@ msgstr "" #: templates/web/base/admin/update_edit.html:38 msgid "user is problem owner" -msgstr "" +msgstr "Der User ist der Eigner der Meldung" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 @@ -3925,7 +3854,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> Meldung bearbeitet" msgstr[1] "<big>%s</big> Meldungen bearbeitet" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3967,6 +3896,19 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" +#~ msgid "%s, reported at %s" +#~ msgstr "Gemeldet von %s um %s" + +#~ msgid "About us" +#~ msgstr "Über uns" + +#~ msgid "Problems in this area" +#~ msgstr "Meldungen in dieser Gegend" + +#, fuzzy +#~ msgid "Sorry, you can not log in with Facebook. Please try again later." +#~ msgstr "Diese Adresse wurde nicht gefunden." + #~ msgid "(we never show your email address or phone number)" #~ msgstr "(Ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)" diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po index f0dde036f..beba8c165 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 17:54+0000\n" -"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: German (Germany) (http://www.transifex.com/mysociety/fixmystreet/language/de_DE/)\n" "Language: de_DE\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "und" @@ -89,7 +89,7 @@ msgstr "%s Aktualisierungen in Echtzeit" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s Fragebögen versandt – %s beantwortet (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -108,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s Stadtteil, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, gemeldet am %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -166,7 +162,7 @@ msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" msgid "(not sent to council)" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(optional)" @@ -178,12 +174,11 @@ msgstr "(öffentlich)" msgid "(sent to both)" msgstr "(gesendet an beide)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -215,26 +210,21 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, ich habe ein Passwort" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Über uns" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Aktion geplant" @@ -265,7 +255,7 @@ msgstr "Füge neue Kategorie hinzu" msgid "Add user" msgstr "Benutzer hinzufügen" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "%s hinzugefügt" @@ -285,7 +275,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "Alarm %d deaktiviert (erstellt %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "" @@ -298,7 +288,7 @@ msgstr "Alle Meldungen" msgid "All Reports as CSV" msgstr "Alle Berichte als CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -397,7 +387,7 @@ msgstr "Zurück" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -428,7 +418,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -443,7 +433,7 @@ msgstr "Kategorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -463,19 +453,19 @@ msgstr "Kategorie: %s" msgid "Change password" msgstr "Passwort ändern" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -486,7 +476,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -527,8 +517,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -537,7 +527,7 @@ msgstr "" msgid "Closed" msgstr "Geschlossen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -563,7 +553,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" @@ -593,7 +583,7 @@ msgstr "" msgid "Confirmation" msgstr "Bestätigung" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -612,7 +602,7 @@ msgid "Confirmed:" msgstr "Bestätigt:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "%s kontaktieren" @@ -631,8 +621,8 @@ msgstr "Kontaktieren Sie das Team" msgid "Coordinates:" msgstr "Koordinaten:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Benutzer konnte nicht gefunden werden" @@ -650,7 +640,7 @@ msgstr "Rat" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -669,7 +659,7 @@ msgstr "Anzahl" msgid "Create a report" msgstr "Erfasse eine Meldung" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kategorie erstellen" @@ -713,20 +703,20 @@ msgstr "Ãœbersichtsseite" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Vorlage löschen" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Gelöscht" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -734,7 +724,7 @@ msgid "Description" msgstr "Beschreibung" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Beschreibung" @@ -759,11 +749,11 @@ msgid "Diligency prize league table" msgstr "Weiss ich nicht" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -781,8 +771,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplizieren" @@ -802,7 +792,7 @@ msgstr "" msgid "Edit" msgstr "Bearbeiten" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -832,7 +822,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -840,11 +830,11 @@ msgstr "Editor" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-Mail-Adresse:" @@ -856,19 +846,14 @@ msgstr "E-Mail-Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail-Benachrichtigung gelöscht" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "E-Mail:" @@ -877,26 +862,6 @@ msgstr "E-Mail:" msgid "Email: %s" msgstr "E-Mail: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Leere Kneipe oder Bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -940,18 +905,14 @@ msgstr "Geben Sie eine Adresse an" msgid "Enter a nearby street name and area" msgstr "Geben Sie eine Adresse an" -#: 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Geben Sie ein Passwort ein" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Beschreiben sie den Mangel" @@ -977,7 +938,7 @@ msgstr "Beispieladresse" msgid "Examples:" msgstr "Beispiele:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1014,19 +975,15 @@ msgstr "Erstes Mal" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Gelöst" @@ -1053,7 +1010,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1075,8 +1032,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1107,18 +1063,18 @@ msgstr "Häufig gestellte Fragen" msgid "GeoRSS on Google Maps" msgstr "GeoRSS auf Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Aktualisierungen holen" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Aktualisierungen von %s Problemen holen" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Aktualisierungen von Problemen in diesem %s holen" @@ -1131,7 +1087,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1157,7 +1113,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1168,8 +1124,7 @@ msgstr "Hilfe" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hallo %s" @@ -1185,11 +1140,11 @@ msgstr "Hallo %s" msgid "Hidden" msgstr "Unsichtbar" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Alte ausblenden" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Stecknadeln ausblenden" @@ -1209,10 +1164,6 @@ msgstr "Erfasse eine neue Meldung:" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1223,7 +1174,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1245,7 +1196,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1266,7 +1217,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1301,10 +1252,10 @@ msgstr "Unbekannt ID" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "In Bearbeitung" @@ -1355,7 +1306,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" @@ -1363,16 +1314,16 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "Ungültiges Format %s angegeben." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Untersuchen" @@ -1394,7 +1345,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1432,7 +1383,6 @@ msgstr "Lade..." #: 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 "" @@ -1441,11 +1391,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "RSS" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Identifizieren Sie den Mangel auf der Karte" @@ -1505,14 +1455,14 @@ msgstr "Monat" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Name" @@ -1536,8 +1486,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1559,7 +1509,7 @@ msgstr "Neue <br>Probleme" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1624,7 +1574,7 @@ msgstr "Weiter" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nein" @@ -1689,8 +1639,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Nicht verantwortlich" @@ -1723,7 +1673,7 @@ 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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1737,15 +1687,15 @@ msgstr "Anmerkung: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1779,8 +1729,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1815,13 +1765,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1846,7 +1796,7 @@ msgstr "Ãœbergeordnet" msgid "Partial" msgstr "Teilweise" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1855,7 +1805,7 @@ msgid "Password (optional)" msgstr "Passwort (optional)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Passwort:" @@ -1863,7 +1813,7 @@ msgstr "Passwort:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnummer" @@ -1879,13 +1829,21 @@ msgid "Phone:" msgstr "Telefonnummer:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1909,8 +1867,8 @@ msgstr "Stecknadel auf Karte platzieren" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1926,16 +1884,16 @@ msgstr "Bitte seien Sie freundlich und prägnant." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre eMail-Adresse korrekt ist" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1945,7 +1903,7 @@ msgstr "Bitte wählen Sie eine Kategorie" msgid "Please choose a property type" msgstr "Bitte wählen Sie eine Eigentumsart" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Bitte korrigieren Sie die Fehler unten" @@ -1966,11 +1924,10 @@ msgstr "" msgid "Please enter a message" msgstr "Bitte geben Sie eine Nachricht ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Bitte geben Sie Ihren Namen an" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1984,10 +1941,10 @@ msgstr "Bitte geben Sie ein Passwort ein" msgid "Please enter a subject" msgstr "Bitte geben Sie einen Betreff ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2004,9 +1961,9 @@ msgid "Please enter some details" msgstr "Bitte geben Sie einiges Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2015,7 +1972,7 @@ msgid "Please enter your email" msgstr "Bitte geben Sie Ihre eMail-Adresse an" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Bitte geben Sie eine Ihre eMail-Adresse an" @@ -2031,7 +1988,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" @@ -2058,7 +2015,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2067,7 +2024,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2093,16 +2050,16 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2118,22 +2075,23 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Bitte nur ein JPEG-BIld hochladen" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Bitte schreiben Sie eine Nachricht" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Bitte schreiben Sie hier Ihre Aktualisierung" @@ -2164,7 +2122,7 @@ msgstr "" msgid "Previous" msgstr "Vorherige" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Datenschutz" @@ -2174,7 +2132,7 @@ msgstr "Datenschutz" msgid "Privacy and cookies" msgstr "Datenschutz und Cookies" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2203,7 +2161,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem als offen markiert." @@ -2215,10 +2173,6 @@ msgstr "" msgid "Problems" msgstr "Meldungen" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Meldungen in dieser Gegend" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Meldungen in der Nähe" @@ -2236,13 +2190,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Meldungen innerhalb %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2261,15 +2213,11 @@ msgstr "Probleme innerhalb der Grenze von:" msgid "Property address:" msgstr "Immobilien-Adresse:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Eigentumstyp" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Meldung aktualisieren" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2303,16 +2251,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-Feed" @@ -2340,18 +2287,12 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2361,14 +2302,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." @@ -2404,12 +2344,11 @@ msgstr "Foto entfernen (kann nicht rückgängig gemacht werden!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Bericht" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2419,7 +2358,7 @@ msgstr "Eine Meldung erfassen" msgid "Report abuse" msgstr "Missbrauch melden" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Bericht auf %s" @@ -2434,7 +2373,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Melden sie Mängel an der Infrastruktur von Zürich" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" @@ -2444,7 +2383,7 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "Vorher berichtet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -2458,27 +2397,27 @@ msgstr "Gemeldet von:" msgid "Reported in the %s category" msgstr "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeldet von %s um %s" @@ -2499,7 +2438,7 @@ msgstr "Gemeldet:" msgid "Reporting a problem" msgstr "Verfassen Sie eine Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2542,15 +2481,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Nach links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2565,7 +2504,7 @@ msgstr "" msgid "Satellite" msgstr "Satellit" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2621,7 +2560,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2640,21 +2579,21 @@ msgstr "Teilen" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Meinen Namen öffentlich anzeigen" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Alte anzeigen" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Zeige Stecknadeln" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2722,14 +2661,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Startdatum:" @@ -2738,7 +2673,7 @@ msgstr "Startdatum:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Status" @@ -2751,7 +2686,7 @@ msgstr "Status" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2791,10 +2726,10 @@ msgid "Subject:" msgstr "Titel:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Abschicken" @@ -2822,9 +2757,8 @@ msgstr "Fragebogen absenden" msgid "Submitted" msgstr "Gesendet" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Abonnieren" @@ -2832,7 +2766,7 @@ msgstr "Abonnieren" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2851,7 +2785,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "Zusammenfassungsberichte" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Umfrage" @@ -2908,7 +2842,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2916,7 +2850,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2926,11 +2860,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Das Problem wird jetzt erneut gesendet." @@ -2942,7 +2876,7 @@ msgstr "Dieser Bericht kann nicht auf %s angeschaut werden." msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von Fix My Zürich entfernt." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3082,9 +3016,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3145,9 +3079,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3160,11 +3094,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dieser Mangel wurde behoben" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dieser Mangel wurde nicht behoben" @@ -3201,7 +3135,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zeitleiste" @@ -3246,8 +3180,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Kann nicht behoben werden" @@ -3264,7 +3198,7 @@ msgstr "Unbestätigt" msgid "Unknown" msgstr "Unbekannt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Unbekannter Benachrichtigungstyp" @@ -3279,7 +3213,7 @@ msgstr "Unbekannter Fehler" msgid "Unknown problem ID" msgstr "Unbekannte Problemkennung" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Beschreibung" @@ -3331,10 +3265,10 @@ msgstr "" msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3361,7 +3295,7 @@ msgstr "Aktualisierungen auf {{title}}" msgid "Updates to this problem, %s" msgstr "Aktualisierungen für dieses Problem, %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3370,11 +3304,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3382,16 +3316,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Benutzer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Werte aktualisiert" @@ -3428,16 +3362,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ihre eMail wird nie angezeigt" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt" @@ -3446,7 +3379,7 @@ msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt" 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3484,10 +3417,6 @@ msgstr "Wann gesendet" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3507,7 +3436,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3537,8 +3466,8 @@ msgstr "Jahr" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3652,19 +3581,19 @@ msgid "Your Reports" msgstr "Ihre Berichte" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Ihre eMail" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3675,17 +3604,17 @@ msgstr "Ihre eMail-Adresse" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ihr Name" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3698,20 +3627,19 @@ msgstr "Ihr Passwort wurde geändert" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ihre Telefonnummer" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Ihre Meldungen" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Ihre Meldungen" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Ihre Aktualisierungen" @@ -3737,7 +3665,7 @@ msgid "didn't use map" msgstr "hat Karte nicht verwendet" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "z.B. ‘%s’ oder ‘%s’" @@ -3843,8 +3771,7 @@ msgstr "andere Gebiete:" msgid "reopened" msgstr "erneut geöffnet" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "ausloggen" @@ -3922,7 +3849,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> Meldung bearbeitet" msgstr[1] "<big>%s</big> Meldungen bearbeitet" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3964,53 +3891,20 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(ihre eMail-Adresse oder Telefonnummer werden nie angezeigt)" - -#~ msgid "(we never show your email)" -#~ msgstr "(ihre eMail-Adresse wird nie angezeigt)" - -#~ msgid "Email me updates" -#~ msgstr "Schicken sie mir Aktualisierungen" - -#~ msgid "Enter a new password:" -#~ msgstr "Geben Sie ein neues Passwort ein:" - -#~ 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" - -#~ msgid "Message:" -#~ msgstr "Nachricht:" - -#~ msgid "More problems nearby" -#~ msgstr "Meldungen in der Nähe" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." - -#~ msgid "Photo:" -#~ msgstr "Foto:" - -#~ msgid "Please check your email" -#~ msgstr "Bitte überprüfen sie ihre eMail" - -#~ msgid "This problem has been closed" -#~ msgstr "Dieses Problem wurde geschlossen" - -#~ msgid "This problem is in progress" -#~ msgstr "Dieser Mangel ist in Bearbeitung" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, gemeldet am %s" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Dieses Problem ist alt und hat einen unbekannten Status" +#~ msgid "About us" +#~ msgstr "Über uns" -#~ msgid "Update:" -#~ msgstr "Aktualisierung:" +#~ msgid "Empty pub or bar" +#~ msgstr "Leere Kneipe oder Bar" -#~ msgid "Your email:" -#~ msgstr "Ihre eMail:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "Your name:" -#~ msgstr "Ihr Name:" +#~ msgid "Problems in this area" +#~ msgstr "Meldungen in dieser Gegend" -#~ msgid "Your email:" -#~ msgstr "Ihre E-Mail-Adresse:" +#~ msgid "Property type:" +#~ msgstr "Eigentumstyp" diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po index 825da0a18..4d62236d7 100644 --- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Greek (Greece) (http://www.transifex.com/mysociety/fixmystreet/language/el_GR/)\n" "Language: el_GR\n" @@ -23,7 +23,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "και" @@ -56,9 +56,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Τομείς" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -93,7 +92,7 @@ msgstr "%s ζωντανÎÏ‚ ενημεÏώσεις" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "στάλθηκαν %s εÏωτηματολόγια – %s απαντήθηκαν (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s αναφ.: %s" @@ -112,10 +111,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s πεÏιοχή, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, Îγινε αναφοÏά στο "%s"" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, στην πεÏιοχή %quot;%s"" @@ -170,7 +165,7 @@ msgstr "(όπως graffiti, παÏατημÎνα σκουπίδια, σπασμΠmsgid "(not sent to council)" msgstr "(δεν αποστάλθηκε σε υπηÏεσία)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(Ï€ÏοαιÏετικό)" @@ -182,12 +177,11 @@ msgstr "(φαίνεται δημόσια)" msgid "(sent to both)" msgstr "(στάλθηκε και στις δÏο)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Διάλεξε κατηγοÏία --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Διάλεξε είδος ακινήτου --" @@ -222,26 +216,21 @@ msgstr "<strong>Όχι</strong> Îα γίνει επιβεβαίωση της α msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Όχι</strong> Îα γίνει επιβεβαίωση της ενημÎÏωσης μÎσω email" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Όχι</strong> να συνδεθώ μÎσω email" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Îαι</strong> Îχω κωδικό Ï€Ïόσβασης" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Σχετικά με εμάς" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Η ΔÏάση Î ÏογÏαμματίστηκε" @@ -274,7 +263,7 @@ msgstr "Î Ïοσθήκη νÎας κατηγοÏίας" msgid "Add user" msgstr "Î Ïοσθήκη χÏήστη" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Î ÏοστÎθηκε %s" @@ -294,7 +283,7 @@ msgstr "Η ειδοποίηση %d δημιουÏγήθηκε για το " msgid "Alert %d disabled (created %s)" msgstr "Η ειδοποίηση %d απενεÏγοποιήθηκε (δημιουÏγήθηκε %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "ΕιδοποίησΠμε για μελλοντικÎÏ‚ ενημεÏώσεις" @@ -307,7 +296,7 @@ msgstr "Όλες οι ΑναφοÏÎÏ‚" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -406,7 +395,7 @@ msgstr "Πίσω" msgid "Ban email address" msgstr "Αποκλεισμός της διεÏθυνσης email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -437,7 +426,7 @@ msgstr "Δεν μποÏείς να δεις τον χάÏτη; <em>ΠαÏάλεΠ#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -452,7 +441,7 @@ msgstr "ΚατηγοÏία" msgid "Category fix rate for problems > 4 weeks old" msgstr "ÎœÎσος ÏŒÏος διόÏθωσης Ï€Ïοβλημάτων για την κατηγοÏία > 4 εβδομάδες" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -472,7 +461,7 @@ msgstr "ΚατηγοÏία: %s" msgid "Change password" msgstr "Αλλαγή ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -480,7 +469,7 @@ msgstr "" "ΤσÎκαÏε το <strong>επιβεβαιώθηκε</strong> για να φαίνεται ότι αυτή η επαφή Îχει επιβεβαιωθεί ως σωστή.\n" "Αν δεν είσαι σίγουÏος για την Ï€ÏοÎλευση ή την εγκυÏότητα της επαφής, άφησε το μη τσεκαÏισμÎνο." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 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." @@ -488,7 +477,7 @@ msgstr "" "ΤσÎκαÏε το <strong>διαγÏάφηκε</strong> για να αφαιÏÎσεις την κατηγοÏία από χÏήση.\n" "Δεν θα φαίνεται ως διαθÎσιμη κατηγοÏία στο Î¼ÎµÎ½Î¿Ï Ï„Î·Ï‚ σελίδας \"ΑνάφεÏε Îνα Ï€Ïόβλημα\"." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -504,7 +493,7 @@ msgstr "" "<br>\n" "Αυτό είναι κατάλληλο για ζητήματα που θÎλεις να επιτÏÎψεις σε χÏήστες να υποβάλλουν αναφοÏÎÏ‚ στον τομÎα, αλλά για τα οποία δεν χÏειάζεται η αναφοÏά να είναι δημόσια. Ένα Ï„Îτοιο παÏάδειγμα είναι αν κάποιος θÎλει να ζητήσει Îναν επιπλÎον κάδο αποÏÏιμάτων σε συγκεκÏιμÎνη διεÏθυνση." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -545,8 +534,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -555,7 +544,7 @@ msgstr "" msgid "Closed" msgstr "Κλειστό" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Κλειστό από την υπηÏεσία" @@ -581,7 +570,7 @@ msgstr "ΔεδομÎνα Ï€ÏοστεθÎντος σήματος:" msgid "Cobrand:" msgstr "Î ÏοστεθÎν σήμα:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Ρυθμίσεις" @@ -600,9 +589,8 @@ msgstr "Επιβεβαίωση λογαÏιασμοÏ" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Κάνε επιβεβαίωση μÎσω email παÏακάτω, εισάγοντας Îναν νÎο κωδικό Ï€Ïόσβασης. Όταν γίνει η επιβεβαίωση, ο κωδικός Ï€Ïόσβασης θα αλλάξει." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -612,7 +600,7 @@ msgstr "Κάνε επιβεβαίωση μÎσω email παÏακάτω, εισΠmsgid "Confirmation" msgstr "Επιβεβαίωση" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -631,7 +619,7 @@ msgid "Confirmed:" msgstr "Επιβεβαιώθηκε:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -650,8 +638,8 @@ msgstr "Επικοινώνησε με την ομάδα διαχείÏισης" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Δεν είναι δυνατή η εÏÏεση χÏήστη" @@ -669,7 +657,7 @@ msgstr "ΥπηÏεσία" msgid "Council contacts for %s" msgstr "ΕπαφÎÏ‚ υπηÏεσίας για "%s"" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "υπηÏεσία αναφ.: %s" @@ -688,7 +676,7 @@ msgstr "ΚαταμÎÏ„Ïηση" msgid "Create a report" msgstr "ΔημιουÏγία αναφοÏάς" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "ΔημιουÏγία κατηγοÏίας" @@ -732,20 +720,20 @@ msgstr "Πίνακας ΕλÎγχου" msgid "Dealt with by subdivision within 5 working days" msgstr "Εξετάστηκε από το τμήμα μÎσα σε 5 εÏγάσιμες ημÎÏες" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "ΔιαγÏαμμÎνα" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: 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 +741,7 @@ msgid "Description" msgstr "ΠεÏιγÏαφή" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "ΠληÏοφοÏίες" @@ -778,11 +766,11 @@ msgid "Diligency prize league table" msgstr "Πίνακας βÏαβείων επιμÎλειας" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -800,8 +788,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Διπλότυπο" @@ -824,7 +812,7 @@ msgstr "" msgid "Edit" msgstr "ΕπεξεÏγασία" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "ΕπεξεÏγασία λεπτομεÏειών του τομÎα" @@ -854,7 +842,7 @@ msgstr "ΕπεξεÏγαστής" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -862,11 +850,11 @@ msgstr "ΕπεξεÏγαστής" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Το Email Ï€ÏοστÎθηκε στην μαÏÏη λίστα" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "ΗλεκτÏονική διεÏθυνση:" @@ -878,19 +866,14 @@ msgstr "Η ειδοποίηση μÎσω email δημιουÏγήθηκε" msgid "Email alert deleted" msgstr "Η ειδοποίηση μÎσω email διεγÏάφη" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Το Email είναι ήδη στην μαÏÏη λίστα" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Στείλε μου email για νÎα Ï€Ïοβλήματα της πεÏιοχής" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -899,26 +882,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Άδειο διαμÎÏισμα ή μεζονÎτα" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Άδειο σπίτι ή μονοκατοικία" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Άδειο γÏαφείο ή άλλος χώÏος εμποÏικής χÏήσης" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Άδειο μπαÏ" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -969,18 +932,14 @@ msgstr "ΓÏάψε Îναν κοντινό ταχυδÏομικό κώδικα, 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "ΓÏάψε Îνα κωδικό Ï€Ïόσβασης" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "ΓÏάψε λεπτομÎÏειες σχετικά με το Ï€Ïόβλημα" @@ -1006,7 +965,7 @@ msgstr "ΠαÏάδειγμα ταχυδÏÎ¿Î¼Î¹ÎºÎ¿Ï ÎºÏŽÎ´Î¹ÎºÎ± %s" msgid "Examples:" msgstr "ΠαÏαδείγματα:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Εξήγησε ποιο είναι το Ï€Ïόβλημα, που βÏίσκεται ακÏιβώς και για πόσο καιÏÏŒ υπάÏχει..." @@ -1043,19 +1002,15 @@ msgstr "Î Ïώτη φοÏά" 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:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "ΔιοÏθώθηκε" @@ -1082,7 +1037,7 @@ msgstr "Σήμανση ως διαγÏαμμÎνο" msgid "Flag user" msgstr "Επισήμανση χÏήστη" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "ΕπισημασμÎνα" @@ -1104,8 +1059,7 @@ msgstr "Οι επισημασμÎνοι χÏήστες δεν υφίσταντα msgid "Flagged:" msgstr "ΕπισημασμÎνοι:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "ΑκολοÏθησε Îνα σÏνδεσμο πεÏιοχής για να δεις μόνο αναφοÏÎÏ‚ που αφοÏοÏν αυτήν την πεÏιοχή." @@ -1136,18 +1090,18 @@ msgstr "ΣυχνÎÏ‚ ΕÏωτήσεις" msgid "GeoRSS on Google Maps" msgstr "GeoRSS στους ΧάÏτες Google" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Λήψη ενημεÏώσεων" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Λήψη ενημεÏώσεων για Ï€Ïοβλήματα σε αυτό το "%s"" @@ -1160,7 +1114,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "ΧαιÏόμαστε που φτιάχτηκε!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1186,7 +1140,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1197,8 +1151,7 @@ msgstr "Βοήθεια" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "ΑυτÎÏ‚ είναι οι κατηγοÏίες ειδοποιήσεων για τοπικά Ï€Ïοβλήματα για ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Γεια %s" @@ -1214,11 +1167,11 @@ msgstr "Γεια %s" msgid "Hidden" msgstr "ΚÏυμμÎνα" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "ΑπόκÏυψη παλιών" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "ΑπόκÏυψη καÏφιτσών" @@ -1238,10 +1191,6 @@ msgstr "Î ÏŽÏ‚ να αναφÎÏεις Îνα Ï€Ïόβλημα" msgid "How to send successful reports" msgstr "Î ÏŽÏ‚ να στείλεις επιτυχημÎνες αναφοÏÎÏ‚" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1252,7 +1201,7 @@ msgstr "Μόλις ανÎφεÏα Îνα Ï€Ïόβλημα στο @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Μόλις ενημÎÏωσα Îνα Ï€Ïόβλημα στο @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Δεν μποÏÎσαμε να εντοπίσουμε το Ï€Ïόβλημά σου στην βάση δεδομÎνων.\n" @@ -1276,7 +1225,7 @@ msgstr "" "Κάνε ταυτοποίηση ενός <strong>γονÎα</strong> αν αυτός ο τομÎας είναι από μόνος του μÎÏος ενός άλλου τομÎα.\n" "Για βασικÎÏ‚ διαÏθÏώσεις, δεν χÏειάζεται να συνδÎσεις τους τομείς Î¼ÎµÏ„Î±Î¾Ï Ï„Î¿Ï…Ï‚, με αυτόν τον Ï„Ïόπο." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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 +1246,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 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 εδώ." @@ -1334,10 +1283,10 @@ msgstr "ΛανθασμÎνη ID" msgid "Illegal feed selection" msgstr "ΛανθασμÎνη επιλογή Ïοής" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Σε ΕξÎλιξη" @@ -1388,7 +1337,7 @@ msgstr "ΕσωτεÏική αναφοÏά" msgid "Invalid agency_responsible value %s" msgstr "ΕσφαλμÎνη τιμή agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "ΛανθασμÎνη ημεÏομηνία λήξης" @@ -1396,16 +1345,16 @@ msgstr "ΛανθασμÎνη ημεÏομηνία λήξης" msgid "Invalid format %s specified." msgstr "ΛανθασμÎνη μοÏφοποίηση %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "ΛανθασμÎνη ημεÏομηνία ÎναÏξης" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Γίνεται διεÏεÏνηση" @@ -1427,7 +1376,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1465,7 +1414,6 @@ msgstr "ΦοÏτώνει..." #: 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 "ΤοπικÎÏ‚ ÏοÎÏ‚ RSS και ειδοποιήσεις email" @@ -1474,11 +1422,11 @@ msgstr "ΤοπικÎÏ‚ ÏοÎÏ‚ RSS και ειδοποιήσεις email" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "ΤοπικÎÏ‚ ÏοÎÏ‚ RSS και ειδοποιήσεις email για ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "ΤοπικÎÏ‚ ειδοποιήσεις" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Εντόπισε το Ï€Ïόβλημα στον χάÏτη της πεÏιοχής" @@ -1538,14 +1486,14 @@ msgstr "Μήνας" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Όνομα" @@ -1569,8 +1517,8 @@ msgstr "Η οδός που βÏίσκεται πλησιÎστεÏα στην κ msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ο ταχυδÏομικός κώδικας που βÏίσκεται πλησιÎστεÏα στην καÏφίτσα που τοποθετήθηκε στον χάÏτη (παÏÎχεται αυτόματα): %s (%sm μακÏιά)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Η οδός που βÏίσκεται πλησιÎστεÏα στην καÏφίτσα που τοποθετήθηκε στον χάÏτη (παÏÎχεται αυτόματα από το Bing Maps): %s" @@ -1594,7 +1542,7 @@ msgstr "ÎÎα <br>Ï€Ïοβλήματα" msgid "New body added" msgstr "Î ÏοστÎθηκε νÎος τομÎας" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Î ÏοστÎθηκε νÎα επαφή κατηγοÏίας" @@ -1659,7 +1607,7 @@ msgstr "Επόμενο" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Όχι" @@ -1727,8 +1675,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Δεν είναι ΥπεÏθυνος" @@ -1761,7 +1709,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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1775,15 +1723,15 @@ msgstr "Σημείωση: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "ΤώÏα, για να υποβάλεις την αναφοÏά σου…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "ΤώÏα, για να υποβάλεις την ενημÎÏωσή σου…" @@ -1817,8 +1765,8 @@ msgstr "ΠεÏίληψη μιας γÏαμμής" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1853,13 +1801,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1884,7 +1832,7 @@ msgstr "Πηγή" msgid "Partial" msgstr "Εν μÎÏει" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1893,7 +1841,7 @@ msgid "Password (optional)" msgstr "Κωδικός Ï€Ïόσβασης (Ï€ÏοαιÏετικό)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "ÎÎος κωδικός Ï€Ïόσβασης:" @@ -1901,7 +1849,7 @@ msgstr "ÎÎος κωδικός Ï€Ïόσβασης:" msgid "Permalink" msgstr "ΣÏνδεσμος" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "ΑÏιθμός τηλεφώνου" @@ -1917,13 +1865,21 @@ msgid "Phone:" msgstr "ΤηλÎφωνο:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "ΦωτογÏαφία" @@ -1947,8 +1903,8 @@ msgstr "ΘÎση της πεÏιοχής στο χάÏτη" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1964,16 +1920,16 @@ msgstr "ΠαÏακαλοÏμε να είσαι ευγενικός, συνοπτΠmsgid "Please check the passwords and try again" msgstr "ΠαÏακαλοÏμε Îλεγξε τους κωδικοÏÏ‚ Ï€Ïόσβασης και Ï€Ïοσπάθησε πάλι." -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "ΠαÏακαλοÏμε Îλεγξε αν η διεÏθυνση email είναι σωστή" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1983,7 +1939,7 @@ msgstr "ΠαÏακαλοÏμε επίλεξε μια κατηγοÏία" msgid "Please choose a property type" msgstr "ΠαÏακαλοÏμε επίλεξε Îνα είδος ακινήτου" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "ΠαÏακαλοÏμε διόÏθωσε τα παÏακάτω λάθη" @@ -2004,11 +1960,10 @@ msgstr "ΠαÏακαλοÏμε να μην κάνεις κατάχÏηση msgid "Please enter a message" msgstr "ΠαÏακαλοÏμε γÏάψε Îνα μήνυμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "ΠαÏακαλοÏμε γÏάψε το όνομά σου" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2022,10 +1977,10 @@ msgstr "ΠαÏακαλοÏμε γÏάψε Îναν κωδικό Ï€Ïόσβαση msgid "Please enter a subject" msgstr "ΠαÏακαλοÏμε γÏάψε Îνα θÎμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2042,9 +1997,9 @@ msgid "Please enter some details" msgstr "ΠαÏακαλοÏμε γÏάψε μεÏικÎÏ‚ λεπτομÎÏειες" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2053,7 +2008,7 @@ msgid "Please enter your email" msgstr "ΠαÏακαλοÏμε γÏάψε το email σου" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "ΠαÏακαλοÏμε γÏάψε τη διεÏθυνση email σου" @@ -2069,7 +2024,7 @@ msgstr "ΠαÏακαλοÏμε γÏάψε το ονοματεπώνυμό σου #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "ΠαÏακαλοÏμε γÏάψε το όνομά σου" @@ -2096,7 +2051,7 @@ msgstr "Μη διστάσεις να <a href=\"%s\">συνδεθείς ξανά< msgid "Please fill in details of the problem below." msgstr "ΠαÏακαλοÏμε συμπλήÏωσε τις λεπτομÎÏειες του Ï€Ïοβλήματος παÏακάτω." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "ΠαÏακαλοÏμε συμπλήÏωσε τις λεπτομÎÏειες του Ï€Ïοβλήματος." @@ -2105,7 +2060,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "ΠαÏακαλοÏμε σήμανε αν θα ήθελες να λάβεις άλλο εÏωτηματολόγιο" @@ -2114,9 +2069,8 @@ msgid "Please note that updates are not sent to the council." msgstr "ΠαÏακαλοÏμε σημείωσε ότι οι ενημεÏώσεις δεν στÎλνονται στην υπηÏεσία." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "ΠαÏακαλοÏμε σημείωσε ότι η αναφοÏά σου <strong>δεν Îχει αποσταλεί ακόμη</strong>. Επίλεξε μια κατηγοÏία και Î±Ï†Î¿Ï Ï€ÏοσθÎσεις πεÏαιτÎÏω πληÏοφοÏίες παÏακάτω, κάνε υποβολή." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2132,16 +2086,16 @@ msgstr "" msgid "Please note:" msgstr "ΠαÏακαλοÏμε σημείωσε ότι:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "ΠαÏακαλοÏμε δώσε μεÏικÎÏ‚ εξηγήσεις για τους λόγους που ξανανοίγεις αυτή την αναφοÏά" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "ΠαÏακαλοÏμε γÏάψε κείμενο καθώς και δώσε μία φωτογÏαφία" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "ΠαÏακαλοÏμε πες αν Îχεις ξαναναφÎÏει Îνα Ï€Ïόβλημα στην υπηÏεσία στο παÏελθόν" @@ -2157,22 +2111,23 @@ msgstr "ΠαÏακαλοÏμε επίλεξε τη Ïοή που επιθυμεΠmsgid "Please select the type of alert you want" msgstr "ΠαÏακαλοÏμε επίλεξε το είδος της ειδοποίησης που επιθυμείς" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "ΠαÏακαλοÏμε δήλωσε αν το Ï€Ïόβλημα Îχει διοÏθωθεί ή όχι" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "ΠαÏακαλοÏμε ανÎβασε μία εικόνα JPEG μόνο" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "ΠαÏακαλοÏμε γÏάψε Îνα μήνυμα" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "ΠαÏακαλοÏμε γÏάψε την ενημÎÏωσή σου εδώ" @@ -2203,7 +2158,7 @@ msgstr "" msgid "Previous" msgstr "Î ÏοηγοÏμενα" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Ιδιωτικότητα" @@ -2213,7 +2168,7 @@ msgstr "Ιδιωτικότητα" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2242,7 +2197,7 @@ msgstr "Το Ï€Ïόβλημα %s στάλθηκε στην υπηÏεσία %s" msgid "Problem breakdown by state" msgstr "Ανάλυση Ï€Ïοβλήματος ανά κατάσταση" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Το Ï€Ïόβλημα επισημάνθηκε ως ανοιχτό." @@ -2254,10 +2209,6 @@ msgstr "Αλλαγή κατάστασης Ï€Ïοβλήματος βάσει απ msgid "Problems" msgstr "Î Ïοβλήματα" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Î Ïοβλήματα στην πεÏιοχή" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Κοντινά Ï€Ïοβλήματα" @@ -2275,13 +2226,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Λήψη ειδοποιήσεων για Ï€Ïοβλήματα σε ακτίνα %.1f χλμ από εδώ" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Î Ïοβλήματα στο "%s"" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Î Ïοβλήματα στην πεÏιοχή "%s"" @@ -2300,15 +2249,11 @@ msgstr "Î Ïοβλήματα μÎσα στα ÏŒÏια του:" msgid "Property address:" msgstr "ΔιεÏθυνση ακινήτου:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Είδος ακινήτου:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Δώσε μια ενημÎÏωση" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "Η εισαγωγή ονόματος και ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης είναι Ï€ÏοαιÏετική, αλλά Îτσι θα σου είναι ευκολότεÏο να αναφÎÏεις Ï€Ïοβλήματα, να αφήνεις ενημεÏώσεις και να διαχειÏίζεσαι τις αναφοÏÎÏ‚ σου." @@ -2342,16 +2287,15 @@ msgstr "Το εÏωτηματολόγιο %d απαντήθηκε για το Ï€ msgid "Questionnaire %d sent for problem %d" msgstr "Το εÏωτηματολόγιο %d στάλθηκε για το Ï€Ïόβλημα %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Το εÏωτηματολόγιο συμπληÏώθηκε από τον υποβολÎα του Ï€Ïοβλήματος" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "Ροή RSS" @@ -2379,18 +2323,12 @@ msgstr "Ροή RSS από %s, στην πεÏιοχή "%s"" msgid "RSS feed of nearby problems" msgstr "Ροή RSS για κοντινά Ï€Ïοβλήματα" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "Ροή RSS για Ï€Ïοβλήματα σε αυτό το "%s"" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Ροή RSS για Ï€Ïοβλήματα στο "%s"" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Ροή RSS για Ï€Ïοβλήματα στην πεÏιοχή "%s"" @@ -2400,14 +2338,13 @@ msgstr "Ροή RSS για Ï€Ïοβλήματα στην πεÏιοχή "%s& msgid "RSS feed of recent local problems" msgstr "Ροή RSS για Ï€Ïόσφατα τοπικά Ï€Ïοβλήματα" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Ροή RSS για ενημεÏώσεις σε αυτό το Ï€Ïόβλημα" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Λήψη email όταν γίνονται ενημεÏώσεις για αυτό το Ï€Ïόβλημα" @@ -2443,12 +2380,11 @@ msgstr "ΑφαίÏεση φωτογÏαφίας (δεν αναιÏείται!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "ΑναφοÏά" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2458,7 +2394,7 @@ msgstr "ΑναφοÏά Ï€Ïοβλήματος" msgid "Report abuse" msgstr "ΑναφοÏά κατάχÏησης" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "ΑναφοÏά στο "%s"" @@ -2473,7 +2409,7 @@ msgstr "ΑνάφεÏε το Ï€Ïόβλημά σου" msgid "Report, view, or discuss local problems" msgstr "ΑνάφεÏε, δες ή συζήτησε τα τοπικά Ï€Ïοβλήματα" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "ΑναφÎÏθηκε ανώνυμα στις %s" @@ -2483,7 +2419,7 @@ msgstr "ΑναφÎÏθηκε ανώνυμα στις %s" msgid "Reported before" msgstr "ΑναφÎÏθηκε Ï€ÏοηγουμÎνως" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "ΑναφÎÏθηκε από %s στις %s" @@ -2497,27 +2433,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "ΑναφÎÏθηκε στην κατηγοÏία %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "ΑναφÎÏθηκε στην κατηγοÏία %s, ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "ΑναφÎÏθηκε στην κατηγοÏία %s από τον %s στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "ΑναφÎÏθηκε μÎσω %s ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "ΑναφÎÏθηκε μÎσω %s από τον %s στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "ΑναφÎÏθηκε μÎσω %s στην κατηγοÏία %s ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "ΑναφÎÏθηκε μÎσω %s στην κατηγοÏία %s από τον %s στις %s" @@ -2538,7 +2474,7 @@ msgstr "" msgid "Reporting a problem" msgstr "ΑναφοÏά Ï€Ïοβλήματος" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2581,15 +2517,15 @@ msgstr "ΧειÏιστής δÏόμου για την ονομασμÎνη Î¿Î´Ï msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "ΧειÏιστής δÏόμου για την ονομασμÎνη οδο (από το OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "ΠεÏιστÏοφή αÏιστεÏά" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2604,7 +2540,7 @@ msgstr "" msgid "Satellite" msgstr "ΔοÏυφόÏος" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2660,7 +2596,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Στάλθηκε στο %s %s αÏγότεÏα" @@ -2679,21 +2615,21 @@ msgstr "Κοινοποίηση" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Δημόσια Ï€Ïοβολή του ονόματός μου" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Î Ïοβολή παλαιότεÏων" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Î Ïοβολή καÏφιτσών" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2752,9 +2688,8 @@ msgstr "Συγνώμη, δεν μποÏÎσαμε να βÏοÏμε αυτήν Ï #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Συγνώμη, δεν μποÏÎσαμε να αναλÏσουμε αυτήν την τοποθεσία. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2762,15 +2697,10 @@ msgstr "Συγνώμη, δεν μποÏÎσαμε να αναλÏσουμε αυ msgid "Sorry, we could not parse that location. Please try again." msgstr "Συγνώμη, δεν μποÏÎσαμε να αναλÏσουμε αυτήν την τοποθεσία. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "ΥπήÏξε Ï€Ïόβλημα στην Ï€Ïοβολή αυτής της σελίδας. ΠαÏακαλοÏμε Ï€Ïοσπάθησε αÏγότεÏα." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "ΗμεÏομηνία ΈναÏξης:" @@ -2779,7 +2709,7 @@ msgstr "ΗμεÏομηνία ΈναÏξης:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Κατάσταση" @@ -2792,7 +2722,7 @@ msgstr "Κατάσταση" msgid "State:" msgstr "Κατάσταση:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2832,10 +2762,10 @@ msgid "Subject:" msgstr "ΘÎμα:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Υποβολή" @@ -2863,9 +2793,8 @@ msgstr "Υποβολή εÏωτηματολογίου" msgid "Submitted" msgstr "Υποβλήθηκε" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Γίνε συνδÏομητής" @@ -2873,7 +2802,7 @@ msgstr "Γίνε συνδÏομητής" msgid "Subscribe me to an email alert" msgstr "Γίνε συνδÏομητής σε ειδοποιήσεις μÎσω email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2892,7 +2821,7 @@ msgstr "ΠεÏίληψη" msgid "Summary reports" msgstr "ΠεÏιληπτικÎÏ‚ αναφοÏÎÏ‚" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "ΈÏευνα" @@ -2949,7 +2878,7 @@ msgstr "ΕυχαÏιστοÏμε που ανÎβασες την φωτογÏαφ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "ΕυχαÏιστοÏμε, χαιÏόμαστε που διοÏθώθηκε! ΜποÏοÏμε απλά να σε Ïωτήσουμε αν Îχεις αναφÎÏει ξανά κάποιο Ï€Ïόβλημα στην υπηÏεσία στο παÏελθόν;" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Η εικόνα δεν φαίνεται να Îχει μεταφοÏτωθεί σωστά (%s), παÏακαλοÏμε Ï€Ïοσπάθησε ξανά." @@ -2957,7 +2886,7 @@ msgstr "Η εικόνα δεν φαίνεται να Îχει μεταφοÏτω msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Η τοποθεσία δεν φαίνεται να βÏίσκεται στην αÏμοδιότητα κάποιου συμβουλίου. Ίσως είναι εκτός ακτής ή εκτός της χώÏας. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "Η τοποθεσία δεν φαίνεται να βÏίσκεται στην Ελλάδα. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." @@ -2967,11 +2896,11 @@ msgstr "Η τοποθεσία δεν φαίνεται να βÏίσκεται σ msgid "That postcode was not recognised, sorry." msgstr "Ο ταχυδÏομικός κώδικας δεν αναγνωÏίστηκε, λυποÏμαστε." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Αυτό το Ï€Ïόβλημα Îχει σημειωθεί ως απεσταλμÎνο." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Το Ï€Ïόβλημα Ï„ÏŽÏα θα αποσταλθεί ξανά." @@ -2983,7 +2912,7 @@ msgstr "Η αναφοÏά δεν μποÏεί να Ï€Ïοβληθεί σε %s." msgid "That report has been removed from FixMyStreet." msgstr "Η αναφοÏά αφαιÏÎθηκε από το FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3131,9 +3060,9 @@ msgstr "ΥπήÏξε Ï€Ïόβλημα στην Ï€Ïοβολή της σελίδΠmsgid "There was a problem showing this page. Please try again later." msgstr "ΥπήÏξε Ï€Ïόβλημα στην Ï€Ïοβολή αυτής της σελίδας. ΠαÏακαλοÏμε Ï€Ïοσπάθησε αÏγότεÏα." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "ΥπήÏξε Ï€Ïόβλημα με το συνδυασμό του email/ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασής σου. Αν δεν μποÏείς να θυμηθείς τον κωδικό σου, ή δεν Îχεις, παÏακαλοÏμε συμπλήÏωσε τον τομÎα ‘σÏνδεση μÎσω email’ αυτής της φόÏμας." @@ -3202,9 +3131,9 @@ msgstr "Αυτό το email στάλθηκε και στις δÏο υπηÏεσ msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Αυτό το email στάλθηκε σε πολλÎÏ‚ υπηÏεσίες που είναι αÏμόδιες για την τοποθεσία του Ï€Ïοβλήματος, Î±Ï†Î¿Ï Î· επιλεγμÎνη κατηγοÏία συμπεÏιλαμβάνεται σε κάθε μια από αυτÎÏ‚. ΠαÏακαλοÏμε αγνόησΠτο αν η υπηÏεσία σου δεν είναι αÏμόδια για την αντιμετώπιση του ζητήματος." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Αυτή η πληÏοφοÏία απαιτείται" @@ -3217,11 +3146,11 @@ msgstr "Αυτή είναι μια ιστοσελίδα για Ï€ÏογÏαμμΠmsgid "This is a summary of all reports on this site." msgstr "Αυτή είναι μια πεÏίληψη όλων των αναφοÏών σε αυτή την ιστοσελίδα" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Αυτό το Ï€Ïόβλημα Îχει διοÏθωθεί" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Αυτό το Ï€Ïόβλημα δεν Îχει διοÏθωθεί" @@ -3258,7 +3187,7 @@ msgstr "Αυτή η ιστοσελίδα πεÏιÎχει επίσης μία φ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "ΧÏονοδιάγÏαμμα" @@ -3303,8 +3232,8 @@ msgstr "Στείλε μας Îνα email:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Δεν είναι εφικτή η διόÏθωση" @@ -3321,7 +3250,7 @@ msgstr "Ανεπιβεβαίωτο" msgid "Unknown" msgstr "Άγνωστο" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Άγνωστο είδος ειδοποίησης" @@ -3336,7 +3265,7 @@ msgstr "Άγνωστο σφάλμα" msgid "Unknown problem ID" msgstr "Άγνωστη ταυτότητα Ï€Ïοβλήματος" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "ΕνημÎÏωση" @@ -3388,10 +3317,10 @@ msgstr "Καταστάσεις ενημÎÏωσης" msgid "Updated" msgstr "ΕνημεÏώθηκε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3418,7 +3347,7 @@ msgstr "ΕνημεÏώσεις για {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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> για να καταγÏάψεις τις λεπτομÎÏειες που θα φαίνονται στον διαχειÏιστή. Οι σημειώσεις δεν εμφανίζονται δημόσια και δεν αποστÎλλονται στον τομÎα." @@ -3427,11 +3356,11 @@ msgstr "ΧÏησιμοποίησε την <strong>σημείωση</strong> γι msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Η επισήμανση του χÏήστη αφαιÏÎθηκε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Ο χÏήστης επισημάνθηκε" @@ -3439,16 +3368,16 @@ msgstr "Ο χÏήστης επισημάνθηκε" msgid "User search finds matches in users' names and email addresses." msgstr "Η αναζήτηση χÏηστών βÏίσκει αποτελÎσματα για ονόματα χÏηστών και διευθÏνσεις email." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "ΧÏήστες" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Οι τιμÎÏ‚ ενημεÏώθηκαν" @@ -3485,16 +3414,15 @@ msgstr "Î’Ïήκαμε παÏαπάνω από Îνα αποτÎλεσμα γιΠ#: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Δε δείχνουμε ποτΠτο email ή το τηλÎφωνό σου" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Δε δείχνουμε ποτΠτο email σου" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Δε δείχνουμε ποτΠτο email ή το τηλÎφωνό σου" @@ -3503,7 +3431,7 @@ msgstr "Δε δείχνουμε ποτΠτο email ή το τηλÎφωνό σΠ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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Και εμείς θα το στείλουμε στην υπηÏεσία εκ μÎÏους σου" @@ -3541,10 +3469,6 @@ msgstr "Όταν αποστάλθηκε " msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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> δωÏεάν." @@ -3564,7 +3488,7 @@ msgstr "Με τις αναζητήσεις αιτημάτων, είναι επί 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Θα ήθελες να λάβεις και άλλο εÏωτηματολόγιο σε 4 εβδομάδες, για να σου υπενθυμίσει να ελÎγξεις την Ï„ÏÎχουσα κατάσταση;" @@ -3594,8 +3518,8 @@ msgstr "Έτος" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Îαι" @@ -3715,19 +3639,19 @@ msgid "Your Reports" msgstr "Οι ΑναφοÏÎÏ‚ σου" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Το e-mail σου" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3738,17 +3662,17 @@ msgstr "Η διεÏθυνση του e-mail σου" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Οι πληÏοφοÏίες σου θα χÏησιμοποιηθοÏν μόνο σÏμφωνα με την <a href=\"/privacy\">πολιτική αποÏÏήτου</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Το όνομά σου" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3761,20 +3685,19 @@ msgstr "Ο κωδικός σου Îχει αλλάξει" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ο αÏιθμός τηλεφώνου σου" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Οι αναφοÏÎÏ‚ σου" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Οι αναφοÏÎÏ‚ σου" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Οι ενημεÏώσεις σου" @@ -3800,7 +3723,7 @@ msgid "didn't use map" msgstr "δεν χÏησιμοποιήθηκε χάÏτης" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "Ï€.χ. ‘%s’ ή ‘%s’" @@ -3906,8 +3829,7 @@ msgstr "άλλες πεÏιοχÎÏ‚:" msgid "reopened" msgstr "άνοιξε ξανά" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "Îξοδος" @@ -3985,7 +3907,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> ενημÎÏωση σε αναφοÏÎÏ‚" msgstr[1] "<big>%s</big> ενημεÏώσεις σε αναφοÏÎÏ‚" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -4027,86 +3949,47 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "<strong>Δεν</strong> Îχουμε ακόμη λεπτομÎÏειες για το άλλο συμβοÏλιο που είναι αÏμόδια σε αυτήν την τοποθεσία." msgstr[1] "<strong>Δεν</strong> Îχουμε ακόμη λεπτομÎÏειες για τις υπόλοιπες υπηÏεσίες που είναι αÏμόδιες για αυτήν την τοποθεσία." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(δεν φαίνεται ποτΠτο email ή ο τηλεφωνικός αÏιθμός σου)" - -#~ msgid "(we never show your email)" -#~ msgstr "(δεν φαίνεται ποτΠτο email σου)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Όχι<strong>, να γίνει επιβεβαίωση της αναφοÏάς μÎσω email:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Όχι</strong>, να γίνει επιβεβαίωση της ενημÎÏωσης μÎσω email:" - -#~ msgid "Email me updates" -#~ msgstr "Στείλτε Email για ενημεÏώσεις" - -#~ msgid "Enter a new password:" -#~ msgstr "ΓÏάψε Îνα νÎο κωδικό Ï€Ïόσβασης:" - -#~ 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" - -#~ 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 "Αν χÏησιμοποιείς διαδικτυακό email ή Îχεις φίλτÏα \"ανεπιθÏμητης αλληλογÏαφίας\", Îλεγξε τους φακÎλους ανεπιθÏμητων/spam email: μεÏικÎÏ‚ φοÏÎÏ‚, τα μηνÏματά μας επισημαίνονται Îτσι." - -#~ msgid "Message:" -#~ msgstr "Μήνυμα:" - -#~ msgid "More problems nearby" -#~ msgstr "ΠεÏισσότεÏα Ï€Ïοβλήματα στην πεÏιοχή" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Σχεδόν τελειώσαμε! ΤώÏα Îλεγξε το email σου..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Î Ïοσβλητικό; Ακατάλληλο; Πες μας" - -#~ msgid "Photo:" -#~ msgstr "ΦωτογÏαφία:" - -#~ msgid "Please check your email" -#~ msgstr "ΠαÏακαλοÏμε Îλεγξε το email σου" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, Îγινε αναφοÏά στο "%s"" -#~ 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>" +#~ msgid "About us" +#~ msgstr "Σχετικά με εμάς" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Αυτό ίσως συμβαίνει επειδή ο σÏνδεσμος είναι παλιός ή ήδη χÏησιμοποιημÎνος, ή επειδή η διεÏθυνση δεν αντιγÏάφηκε σωστά." +#~ msgid "Email me new local problems" +#~ msgstr "Στείλε μου email για νÎα Ï€Ïοβλήματα της πεÏιοχής" -#~ msgid "This problem has been closed" -#~ msgstr "Αυτό το Ï€Ïόβλημα Îχει κλείσει" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Άδειο διαμÎÏισμα ή μεζονÎτα" -#~ msgid "This problem is in progress" -#~ msgstr "Αυτό το Ï€Ïόβλημα βÏίσκεται σε εξÎλιξη" +#~ msgid "Empty house or bungalow" +#~ msgstr "Άδειο σπίτι ή μονοκατοικία" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Αυτό το Ï€Ïόβλημα είναι παλιό και σε άγνωστη κατάσταση." +#~ msgid "Empty office or other commercial" +#~ msgstr "Άδειο γÏαφείο ή άλλος χώÏος εμποÏικής χÏήσης" -#~ msgid "Update:" -#~ msgstr "ΕνημÎÏωση:" +#~ msgid "Empty pub or bar" +#~ msgstr "Άδειο μπαÏ" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Δεν μποÏÎσαμε να επιβεβαιώσουμε το λογαÏιασμό σου - συγγνώμη." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Άδειο δημόσιο κτήÏιο - σχολείο, νοσοκομείο, κτλ." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Σου στείλαμε Îνα email με Îνα σÏνδεσμο για την επιβεβαίωση του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï…." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "ΓÏάψε μία κοντινή οδό, πεÏιοχή, ταχυδÏομικό κώδικα ή πεÏιφÎÏεια" -#~ 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>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Έχεις ήδη Ï€ÏοσθÎσει μια φωτογÏαφία σε αυτή την αναφοÏά, αν Ï€ÏοσθÎσεις μια καινοÏÏια θα την αντικαταστήσει. " +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "ΦοβοÏμαστε ότι δε γίνεται να επιβεβαιώσεις ανεπιβεβαίωτες αναφοÏÎÏ‚." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Έχεις ήδη Ï€ÏοσθÎσει μια φωτογÏαφία σε αυτή την αναφοÏά, αν Ï€ÏοσθÎσεις μια καινοÏÏια θα την αντικαταστήσει. " +#~ msgid "Problems in this area" +#~ msgstr "Î Ïοβλήματα στην πεÏιοχή" -#~ msgid "Your email:" -#~ msgstr "Το e-mail σου:" +#~ msgid "Property type:" +#~ msgstr "Είδος ακινήτου:" -#~ msgid "Your name:" -#~ msgstr "Το όνομά σου:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "Ροή RSS για Ï€Ïοβλήματα σε αυτό το "%s"" -#~ msgid "Your email:" -#~ msgstr "Το e-mail σου:" +#~ msgid "Whole block of empty flats" +#~ msgstr "ΟλόκληÏο τετÏάγωνο από άδεια διαμεÏίσματα" diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po index 8349e3388..b72b9bd7e 100644 --- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:37+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Spanish (Spain) (http://www.transifex.com/mysociety/fixmystreet/language/es_ES/)\n" "Language: es_ES\n" @@ -23,7 +23,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " y " @@ -56,9 +56,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Órganos administrativos" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -93,7 +92,7 @@ msgstr "%s actualizaciones en vivo" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s cuestionarios enviados – %s respondidos (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -112,10 +111,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s barrio, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, reportado el %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, en %s barrio" @@ -170,7 +165,7 @@ msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)" msgid "(not sent to council)" msgstr "(no enviadas al ayuntamiento)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(opcional)" @@ -182,12 +177,11 @@ msgstr "(público)" msgid "(sent to both)" msgstr "(enviado a ambos)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Escoja una categorÃa --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Escoja un tipo de propiedad --" @@ -222,26 +216,21 @@ msgstr "<strong>No</strong>- confirmar mi notificación por email" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>No</strong>- confirmar mi actualización por email" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong>- permÃtanme registrarme por email" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>SÃ</strong>- tengo una contraseña" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "¿Quiénes somos?" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Acción programada" @@ -275,7 +264,7 @@ msgstr "Agregar nueva categorÃa" msgid "Add user" msgstr "Añadir un usuario" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Añadido %s" @@ -295,7 +284,7 @@ msgstr "Alerta %d creada por %s, tipo %s, parámetros %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Alerta %d desactivada (creada %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Notificadme actualizaciones futuras" @@ -308,7 +297,7 @@ msgstr "Todas las notificaciones" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -407,7 +396,7 @@ msgstr "Atras" msgid "Ban email address" msgstr "Suspender este email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -438,7 +427,7 @@ msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -453,7 +442,7 @@ msgstr "CategorÃa" msgid "Category fix rate for problems > 4 weeks old" msgstr "Ratio de arreglo de problemas > 4 semanas" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -473,7 +462,7 @@ msgstr "CategorÃa: %s" msgid "Change password" msgstr "Cambiar contraseña" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -481,7 +470,7 @@ 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:171 +#: templates/web/base/admin/body.html:169 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." @@ -489,7 +478,7 @@ msgstr "" "Marcar <strong>borrado</ strong> para dejar de usar la categorÃa. \n" "Dejará de aparecer en el menú desplegable que se muestra al notificar los problemas." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -507,7 +496,7 @@ 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:130 +#: templates/web/base/admin/body.html:129 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." @@ -550,8 +539,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -560,7 +549,7 @@ msgstr "" msgid "Closed" msgstr "Cerrada" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Cerrada por el Ayuntamiento" @@ -586,7 +575,7 @@ msgstr "Datos cobrand:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuración" @@ -605,9 +594,8 @@ msgstr "Confirmar cuenta" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Confirme por email, proporcionando una nueva contraseña. Al confirmar, su contraseña se actualizará." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -617,7 +605,7 @@ msgstr "Confirme por email, proporcionando una nueva contraseña. Al confirmar, msgid "Confirmation" msgstr "Confirmación" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -636,7 +624,7 @@ msgid "Confirmed:" msgstr "Confirmada:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -655,8 +643,8 @@ msgstr "Contactar con el equipo" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "No se pudo encontrar el usuario" @@ -674,7 +662,7 @@ msgstr "Ayuntamiento" msgid "Council contacts for %s" msgstr "Contactos del ayuntamiento para %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "Referencia del ayuntamiento: %s" @@ -693,7 +681,7 @@ msgstr "Total" msgid "Create a report" msgstr "Crear una notificación" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Crear una categorÃa" @@ -737,20 +725,20 @@ msgstr "Cuadro de mando" msgid "Dealt with by subdivision within 5 working days" msgstr "Tratado por el departamento dentro de los 5 dÃas hábiles" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Eliminado" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -758,7 +746,7 @@ msgid "Description" msgstr "Descripción" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detalles" @@ -783,11 +771,11 @@ msgid "Diligency prize league table" msgstr "Ranking de premios a la constancia" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -805,8 +793,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplicado" @@ -829,7 +817,7 @@ msgstr "" msgid "Edit" msgstr "Editar" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Editar los detalles del órgano administrativo" @@ -859,7 +847,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -867,11 +855,11 @@ msgstr "Editor" msgid "Email" msgstr "Email:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Email añadido a lista de abusones" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Dirección de email:" @@ -883,19 +871,14 @@ msgstr "Creada alerta de email" msgid "Email alert deleted" msgstr "Borrada alerta de email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Email ya incluido en la lista de abusones" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Reciba por email notificaciones sobre los nuevos problemas" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -904,26 +887,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Piso o duplex vacÃo" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Casa o bungalow vacÃo" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Oficina u otros establecimientos comerciales vacÃos" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Pub o bar vacÃo" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Edificio público vacÃo - escuela, hospital, etc" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -974,18 +937,14 @@ msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área msgid "Enter a nearby street name and area" msgstr "Introduzca el nombre de una calle cercana" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Introduzca un nombre de calle cercana y área, código postal o distrito en Nueva Delhi" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Introduzca una contraseña" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Introduzca detalles del problema" @@ -1011,7 +970,7 @@ msgstr "Ejemplo de código postal %s" msgid "Examples:" msgstr "Ejemplos:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Explique el problema o incidencia, su localización exacta, cuánto tiempo lleva ahÃ..." @@ -1048,19 +1007,15 @@ msgstr "Primera vez" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Arreglar esto eligiendo un <strong>área cubierta</ strong> en el formulario <em>Editar detalles del organismo</ em> a continuación." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Arreglado" @@ -1087,7 +1042,7 @@ msgstr "Marcar como borrado" msgid "Flag user" msgstr "Marca usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Marcado" @@ -1109,8 +1064,7 @@ msgstr "Las capacidades de los \"usuarios marcados\" no se limitan de ninguna m msgid "Flagged:" msgstr "Marcado:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Haga clic en el enlace de un barrio para ver solo sus notificaciones." @@ -1141,18 +1095,18 @@ msgstr "Listado de Preguntas Frecuentes" msgid "GeoRSS on Google Maps" msgstr "GeoRSS en Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Recibe actualizaciones" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Recibe actualizaciones de los problemas %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Recibe actualizaciones de los problemas en este %s" @@ -1165,7 +1119,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "¡Nos alegra saber que ha sido arreglado!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1191,7 +1145,7 @@ msgstr "¿Ha sido corregido este problema?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "¿Alguna vez informó de un problema a un Ayuntamiento antes, o es su primera vez?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1202,8 +1156,7 @@ msgstr "Ayuda" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Estos son los tipos de notificaciones de incidencias locales para '%s'." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "%s" @@ -1219,11 +1172,11 @@ msgstr "%s" msgid "Hidden" msgstr "Oculto" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Ocultar antiguos" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Ocultar marcadores" @@ -1243,10 +1196,6 @@ msgstr "Cómo notificar un problema" msgid "How to send successful reports" msgstr "¿Cómo enviar informes exitosos?" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "No puede confirmar alertas no confirmadas." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1257,7 +1206,7 @@ msgstr "Acabo de informar de un problema en @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Acabo de actualizar un problema en @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "No se ha podido localizar su problema en la base de datos.\n" @@ -1281,7 +1230,7 @@ msgstr "" "Identificar una <strong>sub-organismos</ strong> si este organismo forma parte de otro organismo.\n" "Para las instalaciones básicas, no necesita asociar los organismos de esta manera." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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 +1253,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Si utiliza <strong> un método de envÃo distinto del email</ strong>, introduzca el ID de servicio (Open311) o identificador equivalente aquÃ." @@ -1347,10 +1296,10 @@ msgstr "ID incorrecto" msgid "Illegal feed selection" msgstr "Selección de listado incorrecta" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Procesando" @@ -1401,7 +1350,7 @@ msgstr "Remisión interna" msgid "Invalid agency_responsible value %s" msgstr "Valor inválido para agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Fecha de fin inválida" @@ -1409,16 +1358,16 @@ msgstr "Fecha de fin inválida" msgid "Invalid format %s specified." msgstr "Especificado un formato no válido %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Fecha de inicio no válida" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Investigando" @@ -1440,7 +1389,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1478,7 +1427,6 @@ msgstr "Cargando..." #: 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 "Listados RSS locales y alertas por email" @@ -1487,11 +1435,11 @@ msgstr "Listados RSS locales y alertas por email" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Listados RSS locales y alertas por email para '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Alertas locales" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Señale en el mapa de la zona la localización del problema" @@ -1551,14 +1499,14 @@ msgstr "Mes" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Nombre" @@ -1582,8 +1530,8 @@ msgstr "Nombre de la calle más cercana al marcador colocado en el mapa (se gene msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Código Postal más cercano al marcador colocado en el mapa (generado automáticamente): %s (%sm de distancia)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Camino más cercano al marcador colocado en el mapa (generado automáticamente por Bing Maps): %s" @@ -1607,7 +1555,7 @@ msgstr "Nuevos <br>problemas" msgid "New body added" msgstr "Nuevo organismo añadido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Añadida nueva categorÃa de contactos" @@ -1672,7 +1620,7 @@ msgstr "Siguiente" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "No" @@ -1743,8 +1691,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "No responsable" @@ -1777,7 +1725,7 @@ 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, que puede no coincidir con el mes en se confirmó, asà que los números pueden variar un poco." -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1791,15 +1739,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Ahora a enviar tu notificación…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Ahora a enviar tu notificación…" @@ -1833,8 +1781,8 @@ msgstr "Resumen" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1869,13 +1817,13 @@ 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 que te encuentras:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1900,7 +1848,7 @@ msgstr "Padre" msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1909,7 +1857,7 @@ msgid "Password (optional)" msgstr "Contraseña (opcional)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Contraseña:" @@ -1917,7 +1865,7 @@ msgstr "Contraseña:" msgid "Permalink" msgstr "Enlace permanente" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Número de teléfono" @@ -1933,13 +1881,21 @@ msgid "Phone:" msgstr "Teléfono:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1963,8 +1919,8 @@ msgstr "Coloque el marcador en el mapa" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1980,16 +1936,16 @@ msgstr "Por favor, sea cortés, conciso y vaya al grano." msgid "Please check the passwords and try again" msgstr "Por favor, comprueba la contraseña e inténtalo de nuevo" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Por favor, compruebe que su dirección de email es correcta" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1999,7 +1955,7 @@ msgstr "Por favor, elija una categorÃa" msgid "Please choose a property type" msgstr "Por favor, elija un tipo de propiedad" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Por favor, corrija los errores a continuación" @@ -2020,11 +1976,10 @@ msgstr "Por favor notifique incidencias relevantes y no abuse; abusando de su ay msgid "Please enter a message" msgstr "Por favor escriba su mensaje." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Por favor, introduzca su nombre" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2038,10 +1993,10 @@ msgstr "Por favor, introduzca una contraseña" msgid "Please enter a subject" msgstr "Por favor, introduzca un tÃtulo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2058,9 +2013,9 @@ msgid "Please enter some details" msgstr "Por favor, describa los detalles más relevantes" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2069,7 +2024,7 @@ msgid "Please enter your email" msgstr "Por favor, introduzca su dirección de email" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Por favor introduzca su email" @@ -2085,7 +2040,7 @@ msgstr "Por favor escriba su nombre completo, ya que los ayuntamientos necesitan #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Por favor, introduzca su nombre" @@ -2112,7 +2067,7 @@ msgstr "Por favor, siéntase libre para <a href=\"%s\">acceder nuevamente</a> o msgid "Please fill in details of the problem below." msgstr "Por favor proporcione a continuación las informaciones sobre el problema." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Por favor proporcione las informaciones sobre el problema." @@ -2121,7 +2076,7 @@ msgstr "Por favor proporcione las informaciones sobre el problema." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Por favor, complete el siguiente formulario con los detalles del problema y describa la ubicación con la mayor precisión posible en el cuadro de detalles." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique si le gustarÃa recibir algún otro cuestionario" @@ -2130,9 +2085,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Tenga en cuenta que las actualizaciones no son enviadas al ayuntamiento." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Por favor, tenga en cuenta la notificación <strong>no ha sido enviada aún</strong>. Elija una categorÃa y añada más información a continuación antes de enviar." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2148,16 +2102,16 @@ msgstr "" msgid "Please note:" msgstr "Por favor, tenga en cuenta:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Por favor, explique por qué está reabriendo esta notificación." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Proporcione un texto y una foto" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Por favor, indique si ha notificado un problema al ayuntamiento alguna vez." @@ -2173,22 +2127,23 @@ msgstr "Por favor, seleccione el tipo de listado que desea" msgid "Please select the type of alert you want" msgstr "Por favor, seleccione el tipo de alerta que desea" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Por favor, indique si el problema se ha solucionado" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Por favor, suba una imagen JPEG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Por favor, escriba un mensaje" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Por favor, escriba su actualización aquÃ" @@ -2219,7 +2174,7 @@ msgstr "" msgid "Previous" msgstr "Previo" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Privacidad" @@ -2229,7 +2184,7 @@ msgstr "Privacidad" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2258,7 +2213,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:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problema marcado como abierto." @@ -2270,10 +2225,6 @@ msgstr "El estado del problema cambió debido a los resultados de la encuesta" msgid "Problems" msgstr "Problemas" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemas en este área" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemas cercanos" @@ -2291,13 +2242,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemas en %.1fkm alrededor" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemas en %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemas en el barrio %s" @@ -2316,15 +2265,11 @@ msgstr "Problemas en:" msgid "Property address:" msgstr "Dirección de la propiedad:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Tipo de propiedad:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Proporcionar una actualización" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Proporcionar un nombre y una contraseña es opcional, pero hacerlo le permitirá notificar y actualizar los problemas más fácilmente, asà como administrar sus informes." @@ -2358,16 +2303,15 @@ msgstr "Cuestionario %d para el problema %d respondido, %s para %s" msgid "Questionnaire %d sent for problem %d" msgstr "Cuestionario %d enviado para el problema %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Cuestionario cumplimentado por el notificador problema" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "Listado RSS" @@ -2395,18 +2339,12 @@ msgstr "Listado RSS para %s, en el barrio %s" msgid "RSS feed of nearby problems" msgstr "Listado RSS de los problemas cercanos" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "Listado RSS de los problemas en este %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Listado RSS de los problemas dentro de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Listado RSS de los problemas dentro del barrio %s" @@ -2416,14 +2354,13 @@ msgstr "Listado RSS de los problemas dentro del barrio %s" msgid "RSS feed of recent local problems" msgstr "Listado RSS de los problemas locales más recientes" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Listado RSS de actualizaciones sobre este problema" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Reciba un correo cuando se dejen actualizaciones sobre este problema." @@ -2459,12 +2396,11 @@ msgstr "Quitar foto (¡no se puede deshacer!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Notificar" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2474,7 +2410,7 @@ msgstr "Notificar un problema" msgid "Report abuse" msgstr "Denunciar abuso" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Notificar sobre %s" @@ -2489,7 +2425,7 @@ msgstr "Notifique su incidencia" msgid "Report, view, or discuss local problems" msgstr "Notifique, consulte o discuta problemas locales" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Notificado anónimamente en %s" @@ -2499,7 +2435,7 @@ msgstr "Notificado anónimamente en %s" msgid "Reported before" msgstr "Notificado con anterioridad" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Notificado por %s en %s" @@ -2513,27 +2449,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Notificado en la categorÃa %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Notificado anónimamente en la categorÃa %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Notificado anónimamente vÃa %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Notificado vÃa %s por %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Notificado anónimamente vÃa %s en la categorÃa %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Notificado vÃa %s en la categorÃa %s por %s en %s" @@ -2554,7 +2490,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Notificando un problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2597,15 +2533,15 @@ msgstr "Operador responsable de este camino (derivado del número de referencia msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador responsable de este camino (de OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rotar a la izquierda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2620,7 +2556,7 @@ msgstr "" msgid "Satellite" msgstr "Satélite" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2676,7 +2612,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Enviado a %s %s después" @@ -2695,21 +2631,21 @@ msgstr "Compartir" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Mostrar mi nombre públicamente" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Mostrar antiguos" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Mostrar marcadores" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2770,9 +2706,8 @@ msgstr "Lo sentimos, no hemos podido encontrar ese lugar." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo de nuevo." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2780,15 +2715,10 @@ msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo msgid "Sorry, we could not parse that location. Please try again." msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo de nuevo." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Fecha de inicio:" @@ -2797,7 +2727,7 @@ msgstr "Fecha de inicio:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Estado" @@ -2810,7 +2740,7 @@ msgstr "Estado" msgid "State:" msgstr "Estado/Prov.:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2850,10 +2780,10 @@ msgid "Subject:" msgstr "TÃtulo:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Enviar" @@ -2881,9 +2811,8 @@ msgstr "Enviar cuestionario" msgid "Submitted" msgstr "Enviado" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Suscribirse" @@ -2891,7 +2820,7 @@ msgstr "Suscribirse" msgid "Subscribe me to an email alert" msgstr "SuscrÃbeme a alertas por email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2910,7 +2839,7 @@ msgstr "Resumen" msgid "Summary reports" msgstr "Resumen de notificaciones" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Encuesta" @@ -2967,7 +2896,7 @@ msgstr "Gracias por subir una foto. Ahora necesitamos situar la incidencia, asà msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "¡Gracias, nos alegra saber que fue arreglado! ¿PodrÃa decirnos si habÃa notificado un problema a un ayuntamiento con anterioridad?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuevo." @@ -2975,7 +2904,7 @@ msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuev msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Esa localización no parece estar cubierta por un ayuntamiento, tal vez esté en alta mar o fuera del paÃs. Por favor, inténtelo de nuevo." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2985,11 +2914,11 @@ msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo." msgid "That postcode was not recognised, sorry." msgstr "Ese código postal no fue reconocido, lo siento." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "El problema se ha marcado como enviado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "El problema ahora será reenviado." @@ -3001,7 +2930,7 @@ msgstr "Esa notificación no se puede ver en %s." msgid "That report has been removed from FixMyStreet." msgstr "Esa notificación ha sido eliminada de FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3151,9 +3080,9 @@ msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por f msgid "There was a problem showing this page. Please try again later." msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Hubo un problema con su email/contraseña. Si no recuerda o no tiene contraseña, por favor rellene la sección 'registrarme con email' del formulario." @@ -3223,9 +3152,9 @@ msgstr "Este correo electrónico ha sido enviado a los dos ayuntamientos que cub msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Este correo electrónico ha sido enviado a varios consejos que cubren la ubicación del problema, pues la categorÃa de problema seleccionada por el usuario se proporciona para todos ellos. Por favor, si usted no pertenece al órgano administrativo responsable de resolver esta incidencia haga caso omiso de este mensaje." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Esta información es necesaria" @@ -3238,11 +3167,11 @@ msgstr "Este es un sitio para desarrolladores, las cosas podrÃan romperse en cu msgid "This is a summary of all reports on this site." msgstr "Este es un resumen de todos los informes en esta web." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Este problema se ha arreglado" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Este problema no se ha arreglado" @@ -3279,7 +3208,7 @@ msgstr "Esta página web también contiene una foto del problema, proporcionada msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "CronologÃa" @@ -3324,8 +3253,8 @@ msgstr "Pruebe enviándonos un correo directamente:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Incapaz de arreglarlo" @@ -3342,7 +3271,7 @@ msgstr "Sin confirmar" msgid "Unknown" msgstr "Desconocido" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Tipo de alerta desconocida" @@ -3357,7 +3286,7 @@ msgstr "Error desconocido" msgid "Unknown problem ID" msgstr "ID de problema desconocido" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Actualizar" @@ -3409,10 +3338,10 @@ msgstr "Actualización de estados" msgid "Updated" msgstr "Actualizado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3439,7 +3368,7 @@ msgstr "Actualizaciones en {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 públicamente ni son enviadas al órgano administrativo." @@ -3448,11 +3377,11 @@ msgstr "Usa la <strong>nota</strong> para guardar detalles que sólo serán desp msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Usuario marcado" @@ -3460,16 +3389,16 @@ msgstr "Usuario marcado" msgid "User search finds matches in users' names and email addresses." msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Usuarios" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Valores actualizados" @@ -3506,16 +3435,15 @@ msgstr "Hemos encontrado más de una coincidencia para esa ubicación. Se muestr #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Nunca mostramos su dirección de email o número de teléfono." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nunca mostramos su dirección de email" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Nunca mostramos su dirección de email o número de teléfono." @@ -3524,7 +3452,7 @@ msgstr "Nunca mostramos su dirección de email o número de teléfono." msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Somos conscientes de este problema podrÃa ser responsabilidad de %s; sin embargo, actualmente no disponemos de sus datos de contacto. Si conoce la dirección de contacto adecuada, por favor contáctenos." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Se lo enviamos al Ayuntamiento en su nombre" @@ -3562,10 +3490,6 @@ msgstr "Una vez enviada" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "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 "¿Por qué detenerse ahÃ? <a href=\"/alert\">Configure más alertas</a> gratis." @@ -3585,7 +3509,7 @@ msgstr "En las búsquedas de solicitudes, es también posible buscar por agency_ msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está <a href=\"http://fixmystreet.org\">disponible en fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "¿Quieres recibir otro cuestionario en 4 semanas, recordándote que debes comprobar el estado?" @@ -3615,8 +3539,8 @@ msgstr "Año" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "SÃ" @@ -3736,19 +3660,19 @@ msgid "Your Reports" msgstr "Sus notificaciones" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Su email:" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3759,17 +3683,17 @@ msgstr "Su dirección de email" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/privacy\">polÃtica de privacidad</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Su nombre" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3782,20 +3706,19 @@ msgstr "Su contraseña ha cambiado" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Su número de teléfono" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Sus notificaciones" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Sus notificaciones" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Sus actualizaciones" @@ -3821,7 +3744,7 @@ msgid "didn't use map" msgstr "no utilizó mapa" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "por ejemplo, '%s' o '%s'" @@ -3927,8 +3850,7 @@ msgstr "otras áreas:" msgid "reopened" msgstr "reabierto" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "salir" @@ -4006,7 +3928,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> notificaciones actualizadas" msgstr[1] "<big>%s</big> notificaciones actualizadas" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -4048,86 +3970,47 @@ 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 información sobre el ayuntamiento que cubre este área." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(nunca mostramos su email ni su número de teléfono públicamente)" - -#~ msgid "(we never show your email)" -#~ msgstr "(nunca mostramos su email públicamente)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>No</strong>- confirmar mi notificación por email:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>No</strong>- confirmar mi actualización por email:" - -#~ msgid "Email me updates" -#~ msgstr "Recibir por email actualizaciones" - -#~ msgid "Enter a new password:" -#~ msgstr "Introduzca una nueva contraseña:" - -#~ 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 "No se ha podido verificar token. Si ha copiado la URL de un email, compruebe por favor que lo copió correctamente.\n" - -#~ 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 "Es recomendable que compruebe su carpeta de \"spam\", ya que a veces nuestros mensajes son identificados erróneamente como \"correo no deseado\"." - -#~ msgid "Message:" -#~ msgstr "Mensaje:" - -#~ msgid "More problems nearby" -#~ msgstr "Más problemas cercanos" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "¡Ya casi ha terminado! Busque ahora en su email el mensaje de confirmación..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "¿Ofensiva? ¿Inadecuada? AvÃsanos" - -#~ msgid "Photo:" -#~ msgstr "Foto:" - -#~ msgid "Please check your email" -#~ msgstr "Por favor, consulte su email" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, reportado el %s" -#~ 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>" +#~ msgid "About us" +#~ msgstr "¿Quiénes somos?" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Esto puede deberse a que el enlace es demasiado antiguo o ya utilizado, o a que la dirección no se haya copiado correctamente." +#~ msgid "Email me new local problems" +#~ msgstr "Reciba por email notificaciones sobre los nuevos problemas" -#~ msgid "This problem has been closed" -#~ msgstr "Este problema ha sido cerrado" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Piso o duplex vacÃo" -#~ msgid "This problem is in progress" -#~ msgstr "Este problema se encuentra en progreso" +#~ msgid "Empty house or bungalow" +#~ msgstr "Casa o bungalow vacÃo" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Este problema es antiguo y de estatus desconocido." +#~ msgid "Empty office or other commercial" +#~ msgstr "Oficina u otros establecimientos comerciales vacÃos" -#~ msgid "Update:" -#~ msgstr "Actualizar:" +#~ msgid "Empty pub or bar" +#~ msgstr "Pub o bar vacÃo" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "No hemos podido confirmar su cuenta - lo sentimos." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Edificio público vacÃo - escuela, hospital, etc" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Le hemos enviado un email con un enlace para confirmar su cuenta." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Introduzca un nombre de calle cercana y área, código postal o distrito en Nueva Delhi" -#~ 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 piensa acerca de esta web. Sólo tienes que rellenar el formulario o enviar un correo electrónico a <a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Ya ha adjuntado una foto para esta notificación, adjuntando otra reemplazará la anterior." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "No puede confirmar alertas no confirmadas." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Ya ha adjuntado una foto para esta actualización, adjuntando otra reemplazará la anterior." +#~ msgid "Problems in this area" +#~ msgstr "Problemas en este área" -#~ msgid "Your email:" -#~ msgstr "Su email:" +#~ msgid "Property type:" +#~ msgstr "Tipo de propiedad:" -#~ msgid "Your name:" -#~ msgstr "Su nombre:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "Listado RSS de los problemas en este %s" -#~ msgid "Your email:" -#~ msgstr "Su email:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Bloque de pisos vacÃos" diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po index 56dcbc1b0..01fb4d634 100644 --- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-12-22 22:34+0000\n" -"Last-Translator: fixmystreetfr <fixmystreet@fixmystreet.fr>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: French (France) (http://www.transifex.com/mysociety/fixmystreet/language/fr_FR/)\n" "Language: fr_FR\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " et " @@ -55,9 +55,8 @@ msgid "%s admin:" msgstr "%s admin:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Interlocuteurs" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -98,7 +97,7 @@ msgstr "%s mises à jour en temps réel" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s questionnaires envoyés – %s complétés (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s réf : %s" @@ -121,10 +120,6 @@ msgstr "" msgid "%s ward, %s" msgstr "Localité %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, rapporté %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, dans la localité %s" @@ -179,7 +174,7 @@ msgstr "(comme des graffitis, immondices, trottoirs abimés ou éclairage public msgid "(not sent to council)" msgstr "(non signalé à l’administration)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(facultatif)" @@ -191,12 +186,11 @@ msgstr "(public)" msgid "(sent to both)" msgstr "(envoyé aux deux)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Choisissez une catégorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Choisissez un type de propriété --" @@ -231,26 +225,21 @@ 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/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Non</strong>, laissez-moi m'authentifier par email :" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Oui</strong>, j'ai un mot de passe :" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "À propos" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Action programmée" @@ -284,7 +273,7 @@ msgstr "Ajouter une nouvelle catégorie" msgid "Add user" msgstr "Ajouter un utilisateur" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Ajouté %s" @@ -304,7 +293,7 @@ msgstr "Alerte %d créée pour %s, type %s, paramètres %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Alerte %d désactivée (création %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "M'alerter de futures mises à jour" @@ -317,7 +306,7 @@ msgstr "Tous les rapports" msgid "All Reports as CSV" msgstr "Tous les rapports au format CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -416,7 +405,7 @@ msgstr "Retour" msgid "Ban email address" msgstr "Bannir l'adresse mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -447,7 +436,7 @@ msgstr "Vous ne pouvez pas voir le plan ? <em>Sautez cette étape</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -462,7 +451,7 @@ 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:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -482,7 +471,7 @@ msgstr "Catégorie : %s" msgid "Change password" msgstr "Changer le mot de passe" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -490,7 +479,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:171 +#: templates/web/base/admin/body.html:169 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." @@ -498,7 +487,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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -516,7 +505,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:130 +#: templates/web/base/admin/body.html:129 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,8 +549,8 @@ msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connec #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -570,7 +559,7 @@ msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connec msgid "Closed" msgstr "Clos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Clos par l'administration" @@ -596,7 +585,7 @@ msgstr "Données de collaboration :" msgid "Cobrand:" msgstr "Collaboration :" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuration" @@ -615,9 +604,8 @@ msgstr "Confirmer le compte" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Confirmer par courriel ci-dessous, en fournissant un nouveau mot de passe à ce moment. Losque vous confirmerez, votre mot de passe sera mis à jour." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -627,7 +615,7 @@ msgstr "Confirmer par courriel ci-dessous, en fournissant un nouveau mot de pass msgid "Confirmation" msgstr "Confirmation" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -646,7 +634,7 @@ msgid "Confirmed:" msgstr "Confirmé :" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "Contacter %s" @@ -665,8 +653,8 @@ msgstr "Contacter l'équipe" msgid "Coordinates:" msgstr "Coordonnées:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Impossible de trouver l'utilisateur" @@ -684,7 +672,7 @@ msgstr "Administration" msgid "Council contacts for %s" msgstr "Contacts de l'administration pour %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "Ref. de la mairie : %s" @@ -703,7 +691,7 @@ msgstr "Nombre" msgid "Create a report" msgstr "Créer un rapport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Créer une catégorie" @@ -747,20 +735,20 @@ msgstr "Tableau de bord" msgid "Dealt with by subdivision within 5 working days" msgstr "Traité par la subdivision dans les 5 jours ouvrables" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Supprimer le modèle" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Effacé" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -768,7 +756,7 @@ msgid "Description" msgstr "Description" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Détails :" @@ -793,11 +781,11 @@ msgid "Diligency prize league table" msgstr "Tableau d'honneur de la réactivité" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "Avez-vous un mot de passe %s ?" @@ -815,8 +803,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Dupliqué" @@ -839,7 +827,7 @@ msgstr "" msgid "Edit" msgstr "Éditer" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Editer les détails de l'intelocuteur" @@ -869,7 +857,7 @@ msgstr "Éditeur" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -877,11 +865,11 @@ msgstr "Éditeur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Email rajouté à la liste des abus" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Adresse courriel:" @@ -893,19 +881,14 @@ msgstr "Alerte E-mail créé" msgid "Email alert deleted" msgstr "Alerte E-mail supprimé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Email déjà présent dans la liste des abus" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Envoyez-moi les nouveaux problèmes locaux" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "Email :" @@ -914,26 +897,6 @@ msgstr "Email :" msgid "Email: %s" msgstr "Courriel: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "appartement ou maisonnette vide" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "maison ou bungalow vide" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "bureau ou commerce vide" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "pub ou bar vide" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "bâtiment public - école - hôpital, etc non renseigné." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -983,18 +946,14 @@ msgstr "Saisir un code postal proche, ou une rue et une localité" msgid "Enter a nearby street name and area" msgstr "Saisissez un nom de rue proche, la localité ou le code postal" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm: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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Saisissez un mot de passe :" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Saisissez les détails du problème" @@ -1020,7 +979,7 @@ msgstr "Exemple de code postal %s" msgid "Examples:" msgstr "Exemples :" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 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..." @@ -1057,19 +1016,15 @@ msgstr "Première fois" 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." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Résolu" @@ -1096,7 +1051,7 @@ msgstr "Signaler comme supprimé" msgid "Flag user" msgstr "Signaler l'usager" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Signalé" @@ -1118,8 +1073,7 @@ msgstr "Les utilisateurs signalés ne sont pas restreints en aucune façon. il s msgid "Flagged:" msgstr "Signalé :" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 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é" @@ -1150,18 +1104,18 @@ msgstr "Foire Aux Questions" msgid "GeoRSS on Google Maps" msgstr "GeoRSS sur Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Recevoir les mises à jour" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Recevez les mises à jour pour les problèmes dans cette %s" @@ -1174,7 +1128,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Heureux d'entendre qu'il a été résolu!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1200,7 +1154,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1211,8 +1165,7 @@ 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/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Bienvenue %s" @@ -1228,11 +1181,11 @@ msgstr "Bienvenue %s" msgid "Hidden" msgstr "Caché(s)" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Cachés anciens" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Cacher les épingles" @@ -1252,10 +1205,6 @@ 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:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Je suis désolé, vous ne pouvez pas confirmer des rapports non validés" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1266,7 +1215,7 @@ msgstr "Je viens de signaler un problème sur @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Je viens de mettre à jour un problème sur @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1288,7 +1237,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:133 +#: templates/web/base/admin/body.html:132 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." @@ -1311,7 +1260,7 @@ msgstr "" "Si vous souhaitez effectuer une mise à jour publique concernant ce problème, s'il vous plaît renseigné le ici\n" "(Veuillez noter qu'elle ne sera pas envoyée à l'administration)." -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 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." @@ -1353,10 +1302,10 @@ msgstr "ID invalide" msgid "Illegal feed selection" msgstr "Sélection de flux invalide" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "En cours" @@ -1407,7 +1356,7 @@ msgstr "Référence interne" msgid "Invalid agency_responsible value %s" msgstr "Valeur agency_responsible invalide \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Date de fin invalide" @@ -1415,16 +1364,16 @@ msgstr "Date de fin invalide" msgid "Invalid format %s specified." msgstr "Format spécifié %s invalide" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Date de début invalide" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "En examen" @@ -1446,7 +1395,7 @@ msgstr "Zone d'administration Inconnue" msgid "Jurisdiction unknown" msgstr "Zone d'administration Inconnue" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1484,7 +1433,6 @@ msgstr "Chargement…" #: 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 "Flux RSS et alertes email locaux" @@ -1493,11 +1441,11 @@ msgstr "Flux RSS et alertes email locaux" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Flux RSS et alertes email locales pour « %s »" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Alertes locales" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Localisez le problème sur un plan des alentours" @@ -1557,14 +1505,14 @@ msgstr "Mois" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Nom" @@ -1588,8 +1536,8 @@ msgstr "Route la plus proche de l'épingle placée sur le plan (génerée automa msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Code postal le plus proche de l'épingle placée sur le plan (géneré automatiquement): %s (à %sm d'ici)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1613,7 +1561,7 @@ msgstr "Nouveaux <br />problèmes" msgid "New body added" msgstr "Nouveau body ajouté" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Nouveau contact de catégorie rajouté" @@ -1678,7 +1626,7 @@ msgstr "Suivant" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Non" @@ -1749,8 +1697,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Pas responsable" @@ -1783,7 +1731,7 @@ 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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1797,15 +1745,15 @@ msgstr "Note : <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "Notes du SDM pour DM" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Maintenant pour envoyer votre rapport…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Now to submit your mise à jour…" @@ -1839,8 +1787,8 @@ msgstr "Résumé" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1875,13 +1823,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1906,7 +1854,7 @@ msgstr "Parent" msgid "Partial" msgstr "Partiel" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1915,7 +1863,7 @@ msgid "Password (optional)" msgstr "Mot de passe (facultatif)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Mot de passe :" @@ -1923,7 +1871,7 @@ msgstr "Mot de passe :" msgid "Permalink" msgstr "Lien permanent" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Numéro de téléphone" @@ -1939,13 +1887,21 @@ msgid "Phone:" msgstr "Téléphone" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Photo" @@ -1969,8 +1925,8 @@ msgstr "Placer l'épingle sur la carte" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1986,16 +1942,16 @@ msgstr "Merci d'être poli, concis et précis." msgid "Please check the passwords and try again" msgstr "Merci de vérifier les mots de passe et de réessayer" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Merci de vérifier que votre adresse email est correcte" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2005,7 +1961,7 @@ msgstr "Merci de sélectionner une catégorie" msgid "Please choose a property type" msgstr "Merci de choisir un type de propriété" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Merci de corriger les erreurs ci-dessous" @@ -2029,11 +1985,10 @@ msgstr "Merci de ne pas être injurieux — Calomnier l'administration msgid "Please enter a message" msgstr "Merci d'entrer un message" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Merci de saisir votre nom" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2047,10 +2002,10 @@ msgstr "Merci d'entrer un mot de passe :" msgid "Please enter a subject" msgstr "Merci d'enter un sujet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2067,9 +2022,9 @@ msgid "Please enter some details" msgstr "Merci d'entrer quelques détails" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2078,7 +2033,7 @@ msgid "Please enter your email" msgstr "Merci d'entrer votre email" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Merci d'entrer votre adresse email" @@ -2094,7 +2049,7 @@ msgstr "Merci de saisir votre nom complet, les administrations ont besoin de cet #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Merci de saisir votre nom" @@ -2121,7 +2076,7 @@ msgstr "Vous pouvez vous <a href=\"%s\">connecter à nouveau</a>, ou retourner à msgid "Please fill in details of the problem below." msgstr "Merci d'entrer les détails du problème ci-dessous" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Merci d'entrer les détails du problème." @@ -2130,7 +2085,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Merci d'indiquer si vous souhaitez recevoir un autre questionnaire" @@ -2139,9 +2094,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Nous vous informons que les mises à jour ne sont pas envoyées à l'administration." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Merci de noter que votre rapport n'a <strong>pas</strong> été envoyé. Choisissez une catégorie et rajoutez des informations supplémentaires ci-dessous, puis envoyez." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2157,16 +2111,16 @@ msgstr "" msgid "Please note:" msgstr "Quelques remarques :" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Merci d'expliquer pourquoi vous ré-ouvrez ce rapport" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 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:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Merci de nous dire si vous avez signalé un problème à une administration auparavant." @@ -2182,22 +2136,23 @@ msgstr "Merci de sélectionner le type de flux que vous voulez" msgid "Please select the type of alert you want" msgstr "Merci de sélectionner le type d'alerte que vous voulez" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Merci de préciser si le problème a été réglé ou non." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Merci de charger uniquement des images JPEG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Merci de saisir un message" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Merci d'écrire votre mise à jour ici" @@ -2228,7 +2183,7 @@ msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">F msgid "Previous" msgstr "Précédent" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Confidentialité" @@ -2238,7 +2193,7 @@ msgstr "Confidentialité" msgid "Privacy and cookies" msgstr "Vie privée et cookies" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2267,7 +2222,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:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problème signalé comme ouvert." @@ -2279,10 +2234,6 @@ msgstr "Changement état des problèmes d'après résultats sondage" msgid "Problems" msgstr "Problèmes" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problèmes dans cette zone" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problèmes aux alentours" @@ -2300,13 +2251,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problèmes à moins de %.1fkm de ce lieu" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problèmes à l'intérieur de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problèmes dans la localité %s" @@ -2325,15 +2274,11 @@ msgstr "Problèmes à l'intérieur des limites de :" msgid "Property address:" msgstr "Adresse de propriété:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Type de propriété:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Apporter une mise à jour" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2367,16 +2312,15 @@ 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:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Questionnaire rempli par le requérant" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "Flux RSS" @@ -2404,18 +2348,12 @@ msgstr "Flux RSS de %s, dans la localité %s" msgid "RSS feed of nearby problems" msgstr "Flux RSS de problèmes à proximité" -#: templates/web/base/reports/_rss.html:1 -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:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Flux RSS des problèmes à l'intérieur de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Flux RSS de problèmes à l'intérieur de la localité %s" @@ -2425,14 +2363,13 @@ msgstr "Flux RSS de problèmes à l'intérieur de la localité %s" msgid "RSS feed of recent local problems" msgstr "Flux RSS des problèmes locaux récents" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Flux RSS des mises à jour pour ce problème" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Etre informé par courriel lorsque ce problème est mis à jour." @@ -2468,12 +2405,11 @@ msgstr "Effacer la photo (ne peut pas être annulé !)" msgid "Reply to user:" msgstr "Répondre à l'utilisateur:" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Rapport" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2483,7 +2419,7 @@ msgstr "Signaler un problème" msgid "Report abuse" msgstr "Signaler un abus" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Signaler sur %s" @@ -2498,7 +2434,7 @@ msgstr "Signaler votre problème" msgid "Report, view, or discuss local problems" msgstr "Signalez et suivez les problèmes locaux" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Signalé anonymement à %s" @@ -2508,7 +2444,7 @@ msgstr "Signalé anonymement à %s" msgid "Reported before" msgstr "Signalé avant" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Signalé par %s à %s" @@ -2522,27 +2458,27 @@ msgstr "Rapporté par:" msgid "Reported in the %s category" msgstr "Rapporté dans la catégorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Signalé dans la catégorie %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Signalé par %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Signalé par %s par %s à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Signalé par %s dans la catégorie %s par %s" @@ -2563,7 +2499,7 @@ msgstr "Remis:" msgid "Reporting a problem" msgstr "Signalisation d'un problème" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2606,15 +2542,15 @@ msgstr "L'opérateur pour cette route (déterminé à partir de la référence e msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "L'opérateur pour cette route (selon OpenStreetMAp): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Pivoter à gauche" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2629,7 +2565,7 @@ msgstr "La rotation de cette photo annulera les modifications non enregistrées msgid "Satellite" msgstr "Satellite" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2685,7 +2621,7 @@ msgstr "Sélectionnez le type d'alerte que vous souhaitez et cliquez sur le bout msgid "Sent report back" msgstr "Envoyé le rapport en retour" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Envoyé à %s %s plus tard)" @@ -2704,21 +2640,21 @@ msgstr "Partagez" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Afficher mon nom publiquement" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Montrer les anciens" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Montrer les épingles" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2779,9 +2715,8 @@ msgstr "Désolé, nous n'avons pas pu trouver cet emplacement." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessayer." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2789,15 +2724,10 @@ msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessay msgid "Sorry, we could not parse that location. Please try again." msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessayer." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Désolé, nous ne pouvions pas enregistrer votre image(s), veuillez essayer à nouveau." -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ultérieurement." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Date de début:" @@ -2806,7 +2736,7 @@ msgstr "Date de début:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "État actuel" @@ -2819,7 +2749,7 @@ msgstr "État actuel" msgid "State:" msgstr "État actuel :" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2859,10 +2789,10 @@ msgid "Subject:" msgstr "Sujet :" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Envoyer" @@ -2890,9 +2820,8 @@ msgstr "Envoi du questionnaire" msgid "Submitted" msgstr "Soumis" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "S'abonner" @@ -2900,7 +2829,7 @@ msgstr "S'abonner" msgid "Subscribe me to an email alert" msgstr "Abonnez moi à une alerte par email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2919,7 +2848,7 @@ msgstr "Résumé" msgid "Summary reports" msgstr "Rapports résumés" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Enquête" @@ -2976,7 +2905,7 @@ msgstr "Merci d'avoir chargé votre photo. Nous avons besoin maintenant de local msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Merci, heureux d'apprendre que cela a été résolu ! Pourrions-nous juste vous demander si vous aviez déjà signalé un problème à une administration auparavant ?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 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." @@ -2984,7 +2913,7 @@ msgstr "Cette image ne ​​semble pas avoir été chargée correctement (% s), msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Ce lieu ne semble pas être couvert par une administration; peut-être est elle en dehors de la zone couverte. Merci de le saisir à nouveau." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2994,11 +2923,11 @@ msgstr "Ce lieu ne semble pas ce trouver au Royaume-Uni; Merci de le saisir à n msgid "That postcode was not recognised, sorry." msgstr "Ce code postal n'a pas été reconnu, désolé." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Ce problème a été marqué comme envoyé." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Ce problème va maintenant être renvoyé." @@ -3010,7 +2939,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:144 +#: templates/web/base/admin/body.html:142 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." @@ -3162,9 +3091,9 @@ msgstr "Il y a eu un problème pour montrer la page tous les rapports. Réessaye msgid "There was a problem showing this page. Please try again later." msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ultérieurement." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Il y a un problème avec votre combinaison email / mot de passe. Si vous ne pouvez pas vous souvenir de votre mot de passe, ou n'en avez pas, remplissez s'il vous plaît la section « s'authentifier par email » du formulaire." @@ -3233,9 +3162,9 @@ msgstr "Cet email a été envoyé aux deux administrations couvrant l'emplacemen msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Cet email a été envoyé à plus d'une administration couvrant l'emplacement du problème, la catégorie de problème choisie par l'utilisateur étant présente pour chacune d'entre elles ; ignorez-le s'il vous plaît si vous n'êtes pas l'administration responsable pour la question." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Ces renseignements sont nécessaires" @@ -3248,11 +3177,11 @@ msgstr "Ceci est un site en développement, le service peut être interrompu à msgid "This is a summary of all reports on this site." msgstr "Ceci est un résumé de tous les rapports pour ce site." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Ce problème a été résolu" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Ce problème n'a pas été résolu" @@ -3289,7 +3218,7 @@ msgstr "Cette page Web contient également une photo du problème, fournie par l msgid "Time spent (in minutes):" msgstr "Le temps passé (en minutes):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Chronologie" @@ -3334,8 +3263,8 @@ msgstr "Essayez en nous envoyant un e-mail directement:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Ne peut être résolu" @@ -3352,7 +3281,7 @@ msgstr "Non confirmé" msgid "Unknown" msgstr "Inconnu" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Type d'alerte inconnu" @@ -3367,7 +3296,7 @@ msgstr "erreur inconnue" msgid "Unknown problem ID" msgstr "ID de problème inconnu" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Mise à jour" @@ -3419,10 +3348,10 @@ msgstr "Mettre à jour les statuts" msgid "Updated" msgstr "Mis à jour" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3449,7 +3378,7 @@ msgstr "Mises à jour sur {{title}}" msgid "Updates to this problem, %s" msgstr "Mises à jour de ce problème, %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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." @@ -3458,11 +3387,11 @@ msgstr "Utiliser la <strong>note</strong> pour enregistrer des détails qui sont msgid "Used map" msgstr "Carte utilisée" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Utilisateur dé–signalé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Utilisateur signalé" @@ -3470,16 +3399,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:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Utilisateurs" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Valeurs mises à jour" @@ -3516,16 +3445,15 @@ msgstr "Nous avons trouvé plus d'une correspondance pour cet endroit. Nous mont #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Nous n’affichons jamais votre email ou numéro de téléphone." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nous n’affichons jamais votre email" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Nous n’affichons jamais votre email ou numéro de téléphone." @@ -3534,7 +3462,7 @@ msgstr "Nous n’affichons jamais votre email ou numéro de téléphone." 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:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Nous l'envoyons à l'administration en votre nom" @@ -3572,10 +3500,6 @@ msgstr "Envoyé le" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "Pourquoi arrêter là ? <a href=\"/alert\"> déclarer plus d’alertes </a> gratuitement." @@ -3595,7 +3519,7 @@ msgstr "Avec les recherches à requètes, il est également possible de recherch 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>" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Aimeriez-vous recevoir un autre questionnaire dans 4 semaines, pour vous rappeler de vérifier l'état?" @@ -3625,8 +3549,8 @@ msgstr "Année" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Oui" @@ -3696,9 +3620,8 @@ msgstr "Vous avez déjà joint les photos de ce rapport. Notez que vous pouvez j #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "Vous avez déjà joint les photos de ce rapport. Notez que vous pouvez joindre un maximum de 3 photos par déclaration (si vous en télécharger plus, le plus ancien est supprimé)." +msgstr "" #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3744,19 +3667,19 @@ msgid "Your Reports" msgstr "Vos rapports" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Votre email" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3767,17 +3690,17 @@ msgstr "Votre adresse email" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Votre information sera utilisée seulement en accord avec notre <a href=\"/privacy\">politique de confidentialité</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Votre nom" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3790,20 +3713,19 @@ msgstr "Votre mot de passe a été changé" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Votre numéro de téléphone" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Vos rapports" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Vos rapports" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Vos mises à jour" @@ -3829,7 +3751,7 @@ msgid "didn't use map" msgstr "n'a pas utilisé le plan" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "Par exemple '%s' ou '%s'" @@ -3935,8 +3857,7 @@ msgstr "autres lieux:" msgid "reopened" msgstr "réouvert" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "déconnexion" @@ -4014,7 +3935,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> mise à jour de rapport" msgstr[1] "<big>%s</big> mises à jour de rapports" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -4056,86 +3977,47 @@ 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 "(we never show your email address or phone number)" -#~ 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)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ 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 :" - -#~ msgid "Email me updates" -#~ msgstr "Envoyez-moi les mises à jour" - -#~ msgid "Enter a new password:" -#~ msgstr "Saisissez un nouveau mot de passe :" - -#~ 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" - -#~ 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 "Si vous consultez vos emails sur un site web ou que vous utilisez un filtre antispam, vérifiez peut-être votre boîte Spam/Courrier indésirable : nos messages sont parfois filtrés par erreur." - -#~ msgid "Message:" -#~ msgstr "Message :" - -#~ msgid "More problems nearby" -#~ msgstr "Encore plus de problèmes aux alentours" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Presque fini! Maintenant allez voir vos emails…" - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Offensant ? Inapproprié ? Dites-le nous" - -#~ msgid "Photo:" -#~ msgstr "Photo :" - -#~ msgid "Please check your email" -#~ msgstr "Merci de consulter vos emails" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, rapporté %s" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Merci de bien noter que les mises à jour ne sont pas envoyées à l'administration. Si vous laissez votre nom, il sera public. Vos informations seront uniquement utilisées conformément à nore <a href=\"/faq#privacy\">politique de confidentialité</a>" +#~ msgid "About us" +#~ msgstr "À propos" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "C'est peut-être parce que le lien est trop ancien ou déjà utilisé, ou l'adresse n'a pas été saisie correctement." +#~ msgid "Email me new local problems" +#~ msgstr "Envoyez-moi les nouveaux problèmes locaux" -#~ msgid "This problem has been closed" -#~ msgstr "Ce problème a été clos" +#~ msgid "Empty flat or maisonette" +#~ msgstr "appartement ou maisonnette vide" -#~ msgid "This problem is in progress" -#~ msgstr "Ce problème est en cours" +#~ msgid "Empty house or bungalow" +#~ msgstr "maison ou bungalow vide" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Ce problème est vieux et de statut inconnu." +#~ msgid "Empty office or other commercial" +#~ msgstr "bureau ou commerce vide" -#~ msgid "Update:" -#~ msgstr "Mise à jour :" +#~ msgid "Empty pub or bar" +#~ msgstr "pub ou bar vide" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Nous n'avons pas pu confirmé votre compte - désolé." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "bâtiment public - école - hôpital, etc non renseigné." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Nous vous avons envoyé un email contenant un lien pour confirmer votre compte." +#~ 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" -#~ 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>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ 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." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Je suis désolé, vous ne pouvez pas confirmer des rapports non validés" -#~ 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." +#~ msgid "Problems in this area" +#~ msgstr "Problèmes dans cette zone" -#~ msgid "Your email:" -#~ msgstr "Votre email:" +#~ msgid "Property type:" +#~ msgstr "Type de propriété:" -#~ msgid "Your name:" -#~ msgstr "Votre nom :" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "Flux RSS des problèmes à l'intérieur de cette %s" -#~ msgid "Your email:" -#~ msgstr "votre email :" +#~ msgid "Whole block of empty flats" +#~ msgstr "Tout le bloc d'appartements vides" diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po index 53b96b578..944172a7f 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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:37+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Hebrew (Israel) (http://www.transifex.com/mysociety/fixmystreet/language/he_IL/)\n" "Language: he_IL\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "" @@ -81,15 +81,14 @@ msgid "" msgstr "" #: templates/web/base/status/stats.html:23 -#, fuzzy msgid "%s live updates" -msgstr "שלח לי דו×ר ××œ×§×˜×¨×•× ×™ על ×¢×“×›×•× ×™×" +msgstr "" #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -108,10 +107,6 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -166,7 +161,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "" @@ -178,12 +173,11 @@ msgstr "" msgid "(sent to both)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -215,26 +209,21 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -265,7 +254,7 @@ msgstr "" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "" @@ -285,7 +274,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "" @@ -298,7 +287,7 @@ msgstr "" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -397,7 +386,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -428,7 +417,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -443,7 +432,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -463,19 +452,19 @@ msgstr "קטגוריה: %s" msgid "Change password" msgstr "החלף ססמ×" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -486,7 +475,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -527,8 +516,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -537,7 +526,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -563,7 +552,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "תצורה" @@ -593,7 +582,7 @@ msgstr "" msgid "Confirmation" msgstr "×ישור" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -612,7 +601,7 @@ msgid "Confirmed:" msgstr "×ישר:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -631,8 +620,8 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "" @@ -650,7 +639,7 @@ msgstr "עירייה" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -669,7 +658,7 @@ msgstr "ספירה" msgid "Create a report" msgstr "צור דו\"×—" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "צור קטגוריה" @@ -713,20 +702,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "× ×ž×—×§" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -734,7 +723,7 @@ msgid "Description" msgstr "תי×ור" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "פרטי×" @@ -759,11 +748,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -781,8 +770,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "כפול" @@ -802,7 +791,7 @@ msgstr "" msgid "Edit" msgstr "ערוך" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "ערוך פרטי גוף" @@ -832,7 +821,7 @@ msgstr "עורך" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -840,11 +829,11 @@ msgstr "עורך" msgid "Email" msgstr "דו×ר ××œ×§×˜×¨×•× ×™" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "דו×ר ××œ×§×˜×¨×•× ×™ הוסף לרשימת ×”×ž×©×ª×ž×©×™× ×œ×¨×¢×”" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "כתובת דו×ר ××œ×§×˜×¨×•× ×™:" @@ -856,19 +845,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "דו×ר ××œ×§×˜×¨×•× ×™ כבר ברשימת ×”×ž×©×ª×ž×©×™× ×œ×¨×¢×”" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "שלח לי דו×ר ××œ×§×˜×¨×•× ×™ על בעיות מקומיות חדשות" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "דו×ר ××œ×§×˜×¨×•× ×™:" @@ -877,26 +861,6 @@ msgstr "דו×ר ××œ×§×˜×¨×•× ×™:" msgid "Email: %s" msgstr "דו×ר ××œ×§×˜×¨×•× ×™: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -940,18 +904,14 @@ msgstr "" 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "" @@ -977,7 +937,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1014,19 +974,15 @@ msgstr "" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "" @@ -1053,7 +1009,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1075,8 +1031,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1107,18 +1062,18 @@ msgstr "" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1131,7 +1086,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1157,7 +1112,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1168,8 +1123,7 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "" @@ -1185,11 +1139,11 @@ msgstr "" msgid "Hidden" msgstr "" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "" @@ -1209,10 +1163,6 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1223,7 +1173,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1245,7 +1195,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1266,7 +1216,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1301,10 +1251,10 @@ msgstr "" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "" @@ -1355,7 +1305,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "" @@ -1363,16 +1313,16 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "" @@ -1394,7 +1344,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1432,7 +1382,6 @@ msgstr "" #: 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 "" @@ -1441,11 +1390,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "" @@ -1505,14 +1454,14 @@ msgstr "" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "" @@ -1536,8 +1485,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1559,7 +1508,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1624,7 +1573,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "" @@ -1689,8 +1638,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1723,7 +1672,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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1737,15 +1686,15 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1779,8 +1728,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1815,13 +1764,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1846,7 +1795,7 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1855,7 +1804,7 @@ msgid "Password (optional)" msgstr "" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "" @@ -1863,7 +1812,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1879,13 +1828,21 @@ msgid "Phone:" msgstr "" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "" @@ -1909,8 +1866,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1926,16 +1883,16 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1945,7 +1902,7 @@ msgstr "" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1966,8 +1923,8 @@ msgstr "" msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" msgstr "" @@ -1983,10 +1940,10 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2003,9 +1960,9 @@ msgid "Please enter some details" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2014,7 +1971,7 @@ msgid "Please enter your email" msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "" @@ -2030,7 +1987,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -2057,7 +2014,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2066,7 +2023,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2092,16 +2049,16 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2117,22 +2074,22 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +msgid "Please upload an image only" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "" @@ -2163,7 +2120,7 @@ msgstr "" msgid "Previous" msgstr "" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2173,7 +2130,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2202,7 +2159,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "" @@ -2214,10 +2171,6 @@ msgstr "" msgid "Problems" msgstr "" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" @@ -2235,13 +2188,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2260,15 +2211,11 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2302,16 +2249,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "" @@ -2339,18 +2285,12 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2360,14 +2300,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2403,12 +2342,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2418,7 +2356,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2433,7 +2371,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2443,7 +2381,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2457,27 +2395,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2498,7 +2436,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2541,15 +2479,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2564,7 +2502,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2620,7 +2558,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2639,21 +2577,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2721,14 +2659,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2737,7 +2671,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2750,7 +2684,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2790,10 +2724,10 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "" @@ -2821,9 +2755,8 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2831,7 +2764,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2850,7 +2783,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2907,7 +2840,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2915,7 +2848,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2925,11 +2858,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2941,7 +2874,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3081,9 +3014,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3144,9 +3077,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3159,11 +3092,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "" @@ -3200,7 +3133,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3245,8 +3178,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3263,7 +3196,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3278,7 +3211,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3330,10 +3263,10 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3360,7 +3293,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3369,11 +3302,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3381,16 +3314,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3435,7 +3368,7 @@ msgstr "" msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3444,7 +3377,7 @@ msgstr "" 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3482,10 +3415,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3505,7 +3434,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3535,8 +3464,8 @@ msgstr "" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -3650,19 +3579,19 @@ msgid "Your Reports" msgstr "" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3673,17 +3602,17 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3696,20 +3625,19 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "צור דו\"×—" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" @@ -3735,7 +3663,7 @@ msgid "didn't use map" msgstr "" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3841,8 +3769,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3920,7 +3847,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3961,3 +3888,6 @@ 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 "Email me new local problems" +#~ msgstr "שלח לי דו×ר ××œ×§×˜×¨×•× ×™ על בעיות מקומיות חדשות" diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po index 71da5eca7..5f4c56f9f 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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:35+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Croatian (http://www.transifex.com/mysociety/fixmystreet/language/hr/)\n" "Language: hr\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "i" @@ -89,7 +89,7 @@ msgstr "%s ažuriranje uživo" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s Upitnici poslani – %s odgovoreno (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -108,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -166,7 +162,7 @@ msgstr "(grafiti, ilegalno odlaganje otpada, oÅ¡tećeni kolnici, klupe, lampe... msgid "(not sent to council)" msgstr "(nije poslano odgovornom tijelu)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(nije obavezno)" @@ -178,12 +174,11 @@ msgstr "" msgid "(sent to both)" msgstr "(poslano na obje adrese)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Izaberi kategoriju --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Izaberite vrstu posjeda --" @@ -215,26 +210,21 @@ 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/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong> prijavi se e-mailom" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Da</strong> Imam password" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "O nama" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -265,7 +255,7 @@ msgstr "Dodaj novu kategoriju" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Dodano %s" @@ -285,7 +275,7 @@ msgstr "Upozorenje %d kreirano za %s, tip %s, parametri%s / %s" msgid "Alert %d disabled (created %s)" msgstr "Upozorenje %d onemogućeno (kreirano%s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Javi mi buduće promjene" @@ -298,7 +288,7 @@ msgstr "Sve Prijave" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -397,7 +387,7 @@ msgstr "" msgid "Ban email address" msgstr "Onemogući e-mail adrese" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -428,7 +418,7 @@ msgstr "Ne možete vidjeti mapu? <em>PreskoÄi ovaj korak</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -443,7 +433,7 @@ 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:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -463,19 +453,19 @@ msgstr "Kategorija: %s" msgid "Change password" msgstr "Promijeni lozinku" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -486,7 +476,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -527,8 +517,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -537,7 +527,7 @@ msgstr "" msgid "Closed" msgstr "Zatvoreno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Zatvorilo je odgovorno tijelo" @@ -563,7 +553,7 @@ msgstr "Cobrand podaci:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -582,9 +572,8 @@ msgstr "Potvrdi raÄun" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Potvrdi pomoću dolje navedene e-mail adrese, a potom upiÅ¡i novu lozinku. Nakon potvrde tvoja će lozinka biti ažurirana. " +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -594,7 +583,7 @@ 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:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -613,7 +602,7 @@ msgid "Confirmed:" msgstr "PotvrÄ‘eno:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -632,8 +621,8 @@ msgstr "Kontaktiraj tim" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Nepoznati korisnik" @@ -651,7 +640,7 @@ msgstr "Vijeće" msgid "Council contacts for %s" msgstr "Kontakti vijeća za %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "odgovorno tijelo ref: %s" @@ -670,7 +659,7 @@ msgstr "BrojaÄ" msgid "Create a report" msgstr "Kreiraj izvješće" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kreiraj kategoriju" @@ -714,20 +703,20 @@ msgstr "Nadzorna ploÄa" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Izbrisano" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -735,7 +724,7 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detalji" @@ -760,11 +749,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -782,8 +771,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -803,7 +792,7 @@ msgstr "" msgid "Edit" msgstr "Uredi" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -833,7 +822,7 @@ msgstr "Urednik" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -841,11 +830,11 @@ msgstr "Urednik" msgid "Email" msgstr "E-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "E-mail dodan na listu zloupotrebe" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -857,19 +846,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-mail je već na listi zloupotrebe" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "PoÅ¡alji nam e-mail o novom lokalnom problemu" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "E-mail:" @@ -878,26 +862,6 @@ msgstr "E-mail:" msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Prazan stan ili kućica" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Prazna kuća ili bungalov" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Prazan ured ili poslovni prostor" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Prazan kafić ili bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Prazne javne zgrade - Å¡kola, bolnica, itd." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -941,18 +905,14 @@ msgstr "Unesi obližnji poÅ¡tanski broj ili ime ulice i kvarta" msgid "Enter a nearby street name and area" msgstr "Unesi ime obližnje ulice i kvarta" -#: 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Unesi lozinku" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Unesi detalje o problemu" @@ -978,7 +938,7 @@ msgstr "Primjer poÅ¡tanskog broja %s" msgid "Examples:" msgstr "Primjeri:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1015,19 +975,15 @@ msgstr "Prvi put" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "Popravi.to" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Popravljeno" @@ -1054,7 +1010,7 @@ msgstr "" msgid "Flag user" msgstr "OznaÄi korisnika" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "OznaÄen" @@ -1076,8 +1032,7 @@ msgstr "" msgid "Flagged:" msgstr "OznaÄen:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1108,18 +1063,18 @@ msgstr "ÄŒesto postavljana pitanja" msgid "GeoRSS on Google Maps" msgstr "GeoRSS na Google Mapama" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Primite ažuriranja" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Primite ažuriranja %s problema" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Primite ažuriranja problema u ovom %s" @@ -1132,7 +1087,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1158,7 +1113,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1169,8 +1124,7 @@ msgstr "Pomoć" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Vrste upozorenja za lokalne probleme ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Zdravo %s" @@ -1186,11 +1140,11 @@ msgstr "Zdravo %s" msgid "Hidden" msgstr "Skriveno" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Sakrij staro" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Sakrij pinove" @@ -1210,10 +1164,6 @@ msgstr "Kako prijaviti problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Nažalost, ne možeÅ¡ potvrditi nepotvrÄ‘ena izvješća" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1224,7 +1174,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1246,7 +1196,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1267,7 +1217,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1302,10 +1252,10 @@ msgstr "Ilegalan ID" msgid "Illegal feed selection" msgstr "Ilegalan odabir izvora" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "U tijeku" @@ -1356,7 +1306,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Nevažeća odgovorna_vrijednost agencije %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Nevažeći datum zavrÅ¡etka" @@ -1364,16 +1314,16 @@ msgstr "Nevažeći datum zavrÅ¡etka" msgid "Invalid format %s specified." msgstr "Naveden nevažeći %s format." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Nevažeći datum poÄetka" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Istražujem" @@ -1395,7 +1345,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1433,7 +1383,6 @@ msgstr "UÄitavanje" #: 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 "Lokalni RSS izvori i e-mail upozorenja" @@ -1442,11 +1391,11 @@ msgstr "Lokalni RSS izvori i e-mail upozorenja" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokalni RSS izvori i e-mail upozorenja za‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokalna upozorenja" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lociraj problem na mapi podruÄja" @@ -1506,14 +1455,14 @@ msgstr "Mjesec" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Ime" @@ -1537,8 +1486,8 @@ msgstr "Najbliža imenovana cesta smjeÅ¡tena pokraj oznake na mapi (automatski g 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1562,7 +1511,7 @@ msgstr "Novi <br>problemi" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Novi kontakt dodan u kategoriju" @@ -1627,7 +1576,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Ne" @@ -1692,8 +1641,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1726,7 +1675,7 @@ 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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1740,15 +1689,15 @@ msgstr "Napomena: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Podnesite svoju prijavu…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "PoÅ¡aljite svoje ažuriranje…" @@ -1782,8 +1731,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1818,13 +1767,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1849,7 +1798,7 @@ msgstr "" msgid "Partial" msgstr "DjelomiÄno" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1858,7 +1807,7 @@ msgid "Password (optional)" msgstr "Lozinka (neobvezno)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Lozinka:" @@ -1866,7 +1815,7 @@ msgstr "Lozinka:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1882,13 +1831,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Slika" @@ -1912,8 +1869,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1929,16 +1886,16 @@ msgstr "Molimo da budete pristojni, jezgroviti i jasni." msgid "Please check the passwords and try again" msgstr "Provjeri lozinku i pokuÅ¡aj ponovno" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Provjerite je li vaÅ¡a e-mail adresa toÄna" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1948,7 +1905,7 @@ msgstr "Izaberi kategoriju" msgid "Please choose a property type" msgstr "Izaberi tip imovine" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1969,11 +1926,10 @@ msgstr "" msgid "Please enter a message" msgstr "Unesi poruku" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Unesite svoje ime" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1987,10 +1943,10 @@ msgstr "Unesi lozinku" msgid "Please enter a subject" msgstr "Unesi predmet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2007,9 +1963,9 @@ msgid "Please enter some details" msgstr "Unesi detalje" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2018,7 +1974,7 @@ msgid "Please enter your email" msgstr "Unesi svoj e-mail" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Unesi svoju e-mail adresu" @@ -2034,7 +1990,7 @@ msgstr "Molimo unesite svoje puno ime, odgovorno tijelo treba ovu informaciju †#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Unesite svoje ime" @@ -2061,7 +2017,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "Popunite detalje o problemu u nastavku." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Popunite detalje o problemu u nastavku." @@ -2070,7 +2026,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Molimo navedite želite li primiti novi upitnik" @@ -2079,9 +2035,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Napominjemo da se ažuriranja ne Å¡alju odgovornom tijelu." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Napominjemo da vaÅ¡a prijava <strong>joÅ¡ nije poslana</strong>. Izaberite kategoriju i navedite dodatne informacije u nastavku te zatim potvrdite." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2097,16 +2052,16 @@ msgstr "" msgid "Please note:" msgstr "Napominjemo:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Molimo navedite obrazloženje ponovnog otvaranja ove prijave" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Molimo unesite tekst i fotografiju " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Jeste li do sada ikada prijavljivali problem odgovoronom tijelu" @@ -2122,22 +2077,23 @@ 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:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Navedite je li problem rjeÅ¡en " -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Molimo uÄitajte samo JPEG slike" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "NapiÅ¡i poruku" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Ovdje ažurirajte" @@ -2168,7 +2124,7 @@ msgstr "" msgid "Previous" msgstr "" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2178,7 +2134,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2207,7 +2163,7 @@ msgstr "Problem %s poslan odgovornom tijelu %s" msgid "Problem breakdown by state" msgstr "Analiza problema prema stanju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem oznaÄen kao otvoren." @@ -2219,10 +2175,6 @@ msgstr "Stanje problema izmijenjeno na temelju rezultata ankete" msgid "Problems" msgstr "Problemi" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemi u ovom podruÄju" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Okolni problemi" @@ -2240,13 +2192,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemi unutar%.1fkm od ove lokacije" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemi unutar %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemi unutar %s ward" @@ -2265,15 +2215,11 @@ msgstr "Problemi unutar granice:" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Tip objekta:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ažuriranje" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2307,16 +2253,15 @@ 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:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Upitnik popunila osoba koja je prijavila problem" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS izvor" @@ -2344,18 +2289,12 @@ msgstr "RSS izvor za %s, unutar %s ward" msgid "RSS feed of nearby problems" msgstr "RSS izvor za okolne probleme" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS izvor za probleme u ovom %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS izvor za probleme unutar %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS izvor za probleme unutar %s ward" @@ -2365,14 +2304,13 @@ msgstr "RSS izvor za probleme unutar %s ward" msgid "RSS feed of recent local problems" msgstr "RSS izvor za nedavne lokalne probleme" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS izvor za ažuriranja ovog problema" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Primite e-mail s ažuriranjima ovog problema" @@ -2408,12 +2346,11 @@ msgstr "Ukloni fotografiju (nije moguće poniÅ¡titi!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2423,7 +2360,7 @@ msgstr "Prijavi problem" msgid "Report abuse" msgstr "Prijavi zloupotrebu" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Prijava za %s" @@ -2438,7 +2375,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Prijavi, pregledaj ili raspravljaj o lokalnim problemima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Prijavljeno anonimno %s" @@ -2448,7 +2385,7 @@ msgstr "Prijavljeno anonimno %s" msgid "Reported before" msgstr "Prije prijavljeno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Prijavio %s za %s" @@ -2462,27 +2399,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Prijavljeno %s u kategoriju anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Prijavio %s u kategoriju %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Prijavio %s anonimno %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Prijavio %s %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Prijavio %s u %s kategoriju %s u %s" @@ -2503,7 +2440,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Prijavljivanje problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2546,15 +2483,15 @@ msgstr "Cestovni operater za ovu imenovanu cestu (izveden iz cestovnog referentn msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Cestovni operater za ovu imenovanu cestu (sa OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2569,7 +2506,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2625,7 +2562,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "PoÅ¡alji %s %s naknadno" @@ -2644,21 +2581,21 @@ msgstr "Podijeli" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Prikaži moje ime javno" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Prikaži staro" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Prikaži pinove" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2717,9 +2654,8 @@ msgstr "Žao nam je, ne možemo pronaći tu lokaciju." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokuÅ¡ajte ponovno." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2727,15 +2663,10 @@ msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokuÅ¡ajte pon msgid "Sorry, we could not parse that location. Please try again." msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokuÅ¡ajte ponovno." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "DoÅ¡lo je do problema pri uÄitavanju ove stranice. Molimo pokuÅ¡ajte ponovno." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2744,7 +2675,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Stanje" @@ -2757,7 +2688,7 @@ msgstr "Stanje" msgid "State:" msgstr "Stanje:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2797,10 +2728,10 @@ msgid "Subject:" msgstr "Predmet:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "PoÅ¡alji" @@ -2828,9 +2759,8 @@ msgstr "PoÅ¡alji upitnik" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Pretplati se" @@ -2838,7 +2768,7 @@ msgstr "Pretplati se" msgid "Subscribe me to an email alert" msgstr "Pretplati se na e-mail upozorenja" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2857,7 +2787,7 @@ msgstr "Sažetak" msgid "Summary reports" msgstr "Sažetak prijava" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2914,7 +2844,7 @@ msgstr "Hvala na uÄitavanju slike. Sada trebamo locirati problem pa vas molimo msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Hvala, drago nam je Äuti da je problem rijeÅ¡en! Htjeli bismo vas joÅ¡ samo upitati jeste li dosada prijavljivali problem odgovornom tijelu?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 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." @@ -2922,7 +2852,7 @@ msgstr "Slika nije ispravno uÄitana (%s), molimo pokuÅ¡ajte ponovno." msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Odgovorno tijelo ne pokriva navedenu lokaciju, možda je rijeÄ o obalnom dijelu ili je izvan zemlje. Molimo pokuÅ¡ajte ponovno." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2932,11 +2862,11 @@ msgstr "Lokacija se ne nalazi u Hrvatskoj. Molimo pokuÅ¡ajte ponovno." msgid "That postcode was not recognised, sorry." msgstr "Žao nam je, poÅ¡tanski broj nije prepoznat." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Navedeni problem će biti ponovno poslan" @@ -2948,7 +2878,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "Navedena prijava je uklonjena s Popravi.to" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3088,9 +3018,9 @@ msgstr "DoÅ¡lo je do problema pri uÄitavanju svih prijava. Molimo pokuÅ¡ajte po msgid "There was a problem showing this page. Please try again later." msgstr "DoÅ¡lo je do problema pri uÄitavanju ove stranice. Molimo pokuÅ¡ajte ponovno." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "DoÅ¡lo je do problema s kombinacijom VaÅ¡eg e-maila i lozinke.Ako se ne možete sjetiti ili nemate lozinku, molimo odaberite ‘ model prijave putem e-maila ’." @@ -3151,9 +3081,9 @@ msgstr "Kako korisnik nije kategorizirao problem ,ovaj e-mail poslan je oboma od msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Kako je odabrana kategorija predviÄ‘ena za viÅ¡e odgovornih tijela, ovaj e-mail poslan je na adrese nekoliko ureda koje prekrivaju mjesto problema. Molimo vas da zanemarite e-mail ukoliko niste nadležni za ovaj problem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Potrebna informacija" @@ -3166,11 +3096,11 @@ msgstr "Ovo je stranica za razvojne programere; ovdje se sve može prekinuti u b msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Problem je rijeÅ¡en" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Problem joÅ¡ nije rijeÅ¡en" @@ -3207,7 +3137,7 @@ msgstr "Stranica sadrži i fotografiju problem, dodanu od strane korisnika." msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Vremenska skala" @@ -3252,8 +3182,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3270,7 +3200,7 @@ msgstr "NepotvrÄ‘eno" msgid "Unknown" msgstr "Nepoznato" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Nepoznat tip upozorenja" @@ -3285,7 +3215,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "Nepoznat IB problema" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Ažuriranje" @@ -3337,10 +3267,10 @@ msgstr "Status ažuriranja" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3367,7 +3297,7 @@ msgstr "Ažuriranja za {{naslov}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3376,11 +3306,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "KorisniÄka oznaka uklonjena" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Korisnik oznaÄen" @@ -3388,16 +3318,16 @@ msgstr "Korisnik oznaÄen" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Korisnici" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Vrijednosti ažurirane" @@ -3434,16 +3364,15 @@ msgstr "PronaÄ‘eno je viÅ¡e rezultata za tnavedenulokaciju. Prikazano je do dese #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Nikada ne prikazujemo vaÅ¡u e-mail adresu ili telefonski broj." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nikada ne prikazujemo vaÅ¡u e-mail adresu" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Nikada ne prikazujemo vaÅ¡u e-mail adresu ili telefonski broj." @@ -3452,7 +3381,7 @@ msgstr "Nikada ne prikazujemo vaÅ¡u e-mail adresu ili telefonski broj." 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:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Poslan je odgovornom tijelu u VaÅ¡e ime" @@ -3490,10 +3419,6 @@ msgstr "Prilikom slanja" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3513,7 +3438,7 @@ msgstr "Osim pretraživanja prijava, moguće je pretražiti i odgovorne_agenc 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Želite li za 4 tjedna primiti joÅ¡ jedan upitnik koji bi Vas podsjetio da provjerite status?" @@ -3543,8 +3468,8 @@ msgstr "Godina" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Da" @@ -3658,19 +3583,19 @@ msgid "Your Reports" msgstr "VaÅ¡e prijave" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "VaÅ¡ e-mail" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3681,17 +3606,17 @@ msgstr "VaÅ¡a e-mail adresa" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "VaÅ¡e informacije će se koristiti iskljuÄivo u skladu s naÅ¡im<a href=\"/privacy\">pravilima o privatnosti</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ime" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3704,20 +3629,19 @@ msgstr "VaÅ¡a lozinka je promijenjena" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "VaÅ¡ broj telefona" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "VaÅ¡e prijave" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "VaÅ¡e prijave" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "VaÅ¡a ažuriranja" @@ -3743,7 +3667,7 @@ msgid "didn't use map" msgstr "nije koriÅ¡tena karta" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "npr. ‘%s’ ili‘%s’" @@ -3849,8 +3773,7 @@ msgstr "druga podruÄja:" msgid "reopened" msgstr "ponovno otvoreno" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "odjavi se" @@ -3933,7 +3856,7 @@ msgstr[0] "<big>%s</big> ažuriranje za prijavu" msgstr[1] "<big>%s</big> ažuriranja za prijavu" msgstr[2] "<big>%s</big> ažuriranja za prijavu" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3981,80 +3904,41 @@ 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 "(we never show your email address or phone number)" -#~ 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)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ 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:" - -#~ msgid "Email me updates" -#~ msgstr "PoÅ¡alji mi e-mail o ažuriranjima" - -#~ msgid "Enter a new password:" -#~ msgstr "Unesi novu lozinku:" - -#~ 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" - -#~ 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 "Ako koristite e-mail na Webu ili 'junk mail' filtere, provjerite svoje bulk / spam mail mape: ponekad su naÅ¡e poruke oznaÄene na taj naÄin." - -#~ msgid "Message:" -#~ msgstr "Poruka:" - -#~ msgid "More problems nearby" -#~ msgstr "ViÅ¡e problema u blizini" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Skoro uÄinjeno! Sada provjeri svoj e-mail..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Uvredljivo? Neprikladno? Recite nam" - -#~ msgid "Photo:" -#~ msgstr "Slika:" - -#~ msgid "Please check your email" -#~ msgstr "Provjeri svoj e-mail" +#~ msgid "About us" +#~ msgstr "O nama" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Napominjemo da se ažuriranja ne Å¡alju odgovornom tijelu. Ako navedete svoje ime, bit će vidljivo. VaÅ¡e informacije će biti koriÅ¡tene u skladu s naÅ¡im <a href=\"/faq#privacy\">pravilima o privatnosti</a>" +#~ msgid "Email me new local problems" +#~ msgstr "PoÅ¡alji nam e-mail o novom lokalnom problemu" -#~ msgid "This problem has been closed" -#~ msgstr "Problem je zatvoren" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Prazan stan ili kućica" -#~ msgid "This problem is in progress" -#~ msgstr "Problem je i dalje aktualan" +#~ msgid "Empty house or bungalow" +#~ msgstr "Prazna kuća ili bungalov" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Odabrani problem je star i nismo upoznati s trenutnim stanjem." +#~ msgid "Empty office or other commercial" +#~ msgstr "Prazan ured ili poslovni prostor" -#~ msgid "Update:" -#~ msgstr "Ažuriranje:" +#~ msgid "Empty pub or bar" +#~ msgstr "Prazan kafić ili bar" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Poslali smo Vam e-mail s linkom za potvrdu korisniÄkog raÄuna." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Prazne javne zgrade - Å¡kola, bolnica, itd." -#~ 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>:" +#~ msgid "FixMyStreet" +#~ msgstr "Popravi.to" -#~ 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." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Nažalost, ne možeÅ¡ potvrditi nepotvrÄ‘ena izvješća" -#~ 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." +#~ msgid "Problems in this area" +#~ msgstr "Problemi u ovom podruÄju" -#~ msgid "Your email:" -#~ msgstr "VaÅ¡ e-mail:" +#~ msgid "Property type:" +#~ msgstr "Tip objekta:" -#~ msgid "Your name:" -#~ msgstr "Ime:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS izvor za probleme u ovom %s" -#~ msgid "Your email:" -#~ msgstr "VaÅ¡ e-mail:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Cijeli blok praznih stanova" diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po index 10b78add4..4794ab12e 100644 --- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/it.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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:36+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Italian (http://www.transifex.com/mysociety/fixmystreet/language/it/)\n" "Language: it\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "e" @@ -54,9 +54,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Corpi" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -91,7 +90,7 @@ msgstr "%s aggiornamenti in tempo reale" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s questionari inviati – %s compilati (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -110,10 +109,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s quartiere, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, segnalati al %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s dentro al quartiere %s" @@ -168,7 +163,7 @@ 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/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(opzionale)" @@ -180,12 +175,11 @@ msgstr "(pubblico)" msgid "(sent to both)" msgstr "(inviato ad entrambi)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Scegli una categoria --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Scegli un tipo di proprietà --" @@ -217,26 +211,21 @@ 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/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong> lasciami entrare con l'email" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Si</strong> Ho già la password" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Chi siamo" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -267,7 +256,7 @@ msgstr "Aggiungi una nuova categoria" msgid "Add user" msgstr "Aggiungi un'utente" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Aggiunti %s" @@ -287,7 +276,7 @@ msgstr "Segnalazione %d creata per %s tipo %s, parametri %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Segnalazione %d disabilitata (creata %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Avvisami su futuri aggiornamenti" @@ -300,7 +289,7 @@ msgstr "Tutte le segnalazioni" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -399,7 +388,7 @@ msgstr "Indietro" msgid "Ban email address" msgstr "Vietare l'indirizzo email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -430,7 +419,7 @@ msgstr "Non puoi vedere la mappa? <em>Salta questo passaggio</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -445,7 +434,7 @@ msgstr "Categoria" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -465,19 +454,19 @@ msgstr "Categoria: %s" msgid "Change password" msgstr "Cambia la Password" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -488,7 +477,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -529,8 +518,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -539,7 +528,7 @@ msgstr "" msgid "Closed" msgstr "Chiuso" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Chiuso dal comune" @@ -565,7 +554,7 @@ msgstr "Dati del Cobrand:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configurazione" @@ -584,9 +573,8 @@ msgstr "Conferma l'account" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Conferma tramite l'email qui sotto ed una nuova password ti verrà fornita. Dopo aver confermato l'email che riceverai, la tua password verrà aggiornata." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -596,7 +584,7 @@ msgstr "Conferma tramite l'email qui sotto ed una nuova password ti verrà forni msgid "Confirmation" msgstr "Conferma" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -615,7 +603,7 @@ msgid "Confirmed:" msgstr "Confermato:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -634,8 +622,8 @@ msgstr "Contatta il team" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Non posso trovare l'utente" @@ -653,7 +641,7 @@ msgstr "Comune" msgid "Council contacts for %s" msgstr "I contatti del comune per %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -672,7 +660,7 @@ msgstr "Contare" msgid "Create a report" msgstr "Crea una segnalazione" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Crea una categoria" @@ -716,20 +704,20 @@ msgstr "Pannello di controllo" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Eliminato" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -737,7 +725,7 @@ msgid "Description" msgstr "Descrizione" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Dettagli" @@ -762,11 +750,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -784,8 +772,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplica" @@ -805,7 +793,7 @@ msgstr "" msgid "Edit" msgstr "Modifica" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Modifica dettagli corpo" @@ -835,7 +823,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -843,11 +831,11 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Email aggiunta alla lista abusi" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Indirizzo email:" @@ -859,19 +847,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Email già presente nella lista abusi" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Inviami via email i nuovi problemi locali" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -880,26 +863,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Case o bungalow vuoti" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Uffici o altri locali commerciali vuoti" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Pub o bar vuoti" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Edifici pubblici - scuole, ospedali, ecc vuoti" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -943,18 +906,14 @@ msgstr "Inserisci il piu vicino codice postale UK o il nome di una strada e l'ar msgid "Enter a nearby street name and area" msgstr "Inserisci il nome di una strada nelle vicinanze e una città o solo in nome della città " -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Inserisci una password" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Inserisci i dettagli del problema" @@ -980,7 +939,7 @@ msgstr "Esempio codice postale %s" msgid "Examples:" msgstr "Esempi:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1017,19 +976,15 @@ msgstr "Prima volta" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Risolto" @@ -1056,7 +1011,7 @@ msgstr "" msgid "Flag user" msgstr "Utente segnalato" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Segnalato" @@ -1078,8 +1033,7 @@ msgstr "" msgid "Flagged:" msgstr "Segnalato:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1110,18 +1064,18 @@ msgstr "Domande Frequenti" msgid "GeoRSS on Google Maps" msgstr "GeoRSS su Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Ottieni aggiornamenti " -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Ottieni gli aggiornamenti dei problemi in questo %s" @@ -1134,7 +1088,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1160,7 +1114,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1171,8 +1125,7 @@ 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/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Ciao %s" @@ -1188,11 +1141,11 @@ msgstr "Ciao %s" msgid "Hidden" msgstr "Nascosto" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "" @@ -1212,10 +1165,6 @@ msgstr "Come segnalare un problema" msgid "How to send successful reports" msgstr "Come inviare segnalazioni di successo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Mi spiace non puoi confermare le segnalazioni non confermate." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1226,7 +1175,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1248,7 +1197,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1269,7 +1218,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1304,10 +1253,10 @@ msgstr "ID illegale" msgid "Illegal feed selection" msgstr "Selezione feed illegale" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "In progresso" @@ -1358,7 +1307,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "" @@ -1366,16 +1315,16 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Investigando" @@ -1397,7 +1346,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1435,7 +1384,6 @@ msgstr "Caricando..." #: 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 "RSS feed locali ed avvertimenti via email" @@ -1444,11 +1392,11 @@ msgstr "RSS feed locali ed avvertimenti via email" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS feed locali ed avvertimenti via email per ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Segnalazioni locali" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Localizza il problema nella mappa della zona" @@ -1508,14 +1456,14 @@ msgstr "Mese" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Nome" @@ -1539,8 +1487,8 @@ msgstr "Il più vicino nome della strada al segno posizionato sulla mappa (autom msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1562,7 +1510,7 @@ msgstr "Nuovi <br>problemi" msgid "New body added" msgstr "Nuovo corpo aggiunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Nuova categoria contatto aggiunta" @@ -1627,7 +1575,7 @@ msgstr "Prossimo" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "No" @@ -1692,8 +1640,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Non responsabile" @@ -1726,7 +1674,7 @@ 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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1740,15 +1688,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Ora per inserire la tua segnalazione…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Ora per inserire il tuo aggiornamento…" @@ -1782,8 +1730,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1818,13 +1766,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1849,7 +1797,7 @@ msgstr "Parente" msgid "Partial" msgstr "Parziale" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1858,7 +1806,7 @@ msgid "Password (optional)" msgstr "Password (opzionale)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Password:" @@ -1866,7 +1814,7 @@ msgstr "Password:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Numero di telefono" @@ -1882,13 +1830,21 @@ msgid "Phone:" msgstr "Telefono:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1912,8 +1868,8 @@ msgstr "Inserisci il cursore sulla mappa" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1929,16 +1885,16 @@ msgstr "Per favore cerca di essere educato, conciso e dritto al punto." msgid "Please check the passwords and try again" msgstr "Per favore controlla la password e prova ancora" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Per favore controlla che il tuo indirizzo email è corretto" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1948,7 +1904,7 @@ msgstr "Per favore scegli una categoria" msgid "Please choose a property type" msgstr "Per favore scegli un tipo di proprietà " -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1969,11 +1925,10 @@ msgstr "Per favore non abusarne — abusandone il comune svaluterà il msgid "Please enter a message" msgstr "Per favore inserisci un messaggio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Per favore inserisci il tuo nome" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1987,10 +1942,10 @@ msgstr "Per favore inserisci la password" msgid "Please enter a subject" msgstr "Per favore inserisci il soggetto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2007,9 +1962,9 @@ msgid "Please enter some details" msgstr "Per favore inserire qualche dettaglio " #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2018,7 +1973,7 @@ msgid "Please enter your email" msgstr "Per favore inserisci la tua email" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Per favore inserisci il tuo indirizzo email" @@ -2034,7 +1989,7 @@ msgstr "Per favore inserisci il tuo nome completo, i comuni hanno bisogno di que #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Per favore inserisci il tuo nome" @@ -2061,7 +2016,7 @@ msgstr "Per favore <a href=\"%s\">entra di nuovo</a>, o torna indietro nella <a msgid "Please fill in details of the problem below." msgstr "Si prega di compilare i dettagli del problema qui di seguito." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "SI prega di inserire i dettagli del problema" @@ -2070,7 +2025,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Per favore indicare se si vuole ricevere un altro questionario" @@ -2079,9 +2034,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Gli aggiornamenti non verranno inviati al comune." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "La tua segnalazione <strong>non è stata inviata</strong>. Scegli una categoria e aggiungi ulteriori informazioni qui di seguito e infine inviala." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2097,16 +2051,16 @@ msgstr "" msgid "Please note:" msgstr "Attenzione:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Per favore provvedi ad alcune spiegazioni perché stai riaprendo questa segnalazione" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 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:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Per favore dicci se hai mai precedentemente riportato un problema al tuo comune " @@ -2122,22 +2076,23 @@ msgstr "Si prega di selezionare il feed che si vuole" msgid "Please select the type of alert you want" msgstr "Per favore seleziona il tipo di avvertimento che desideri" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Si prega di indicare se il problema è stato risolto" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Per favore utilizza soltanto il formato JPG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Per favore scrivi un messaggio" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Per favore scrivi il tuo aggiornamento qui" @@ -2168,7 +2123,7 @@ msgstr "" msgid "Previous" msgstr "Precedente" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Privacy" @@ -2178,7 +2133,7 @@ msgstr "Privacy" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2207,7 +2162,7 @@ msgstr "Problema %s inviato al comune %s" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problema marcato come aperto." @@ -2219,10 +2174,6 @@ msgstr "Il cambio di stato del problema è basato sui risultati del sondaggio" msgid "Problems" msgstr "Problemi" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemi in questa area" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemi vicino" @@ -2240,13 +2191,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemi dentro %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemi dentro %s quartiere" @@ -2265,15 +2214,11 @@ msgstr "Problemi dentro i confini di:" msgid "Property address:" msgstr "L'indirizzo della proprietà :" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Tipo di proprietà :" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Fornisci un'aggiornamento" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2307,16 +2252,15 @@ 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:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS feed" @@ -2344,18 +2288,12 @@ msgstr "RSS feed di %s, dentro al quartiere %s " msgid "RSS feed of nearby problems" msgstr "RSS feed dei problemi vicino" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS feed per i problemi in questo %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed dei problemi dentro %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed di problemi dentro al quartiere %s " @@ -2365,14 +2303,13 @@ msgstr "RSS feed di problemi dentro al quartiere %s " msgid "RSS feed of recent local problems" msgstr "RSS feed dei recenti problemi locali" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS feed degli aggiornamenti su questa segnalazione" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Ricevi un'email quando gli aggiornamenti sono aggiunti su questa segnalazione." @@ -2408,12 +2345,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2423,7 +2359,7 @@ msgstr "Segnala un problema" msgid "Report abuse" msgstr "Segnala un abuso" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2438,7 +2374,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Segnala, conosci e discuti sui problemi della tua città " -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Riportati anonimamente al %s" @@ -2448,7 +2384,7 @@ msgstr "Riportati anonimamente al %s" msgid "Reported before" msgstr "Segnalati prima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Segnalato da %s al %s" @@ -2462,27 +2398,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Riportato nella categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Riportato nella categoria %s anonimamente alle %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2503,7 +2439,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Stai segnalando un problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2546,15 +2482,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2569,7 +2505,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2625,7 +2561,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2644,21 +2580,21 @@ msgstr "Condividi" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Mostra il mio nome pubblicamente" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2717,9 +2653,8 @@ msgstr "Ci scusiamo, non possiamo trovare questa zona." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancora." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2727,15 +2662,10 @@ msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancor msgid "Sorry, we could not parse that location. Please try again." msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancora." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova ancora più tardi" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Data di inizio:" @@ -2744,7 +2674,7 @@ msgstr "Data di inizio:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Stato" @@ -2757,7 +2687,7 @@ msgstr "Stato" msgid "State:" msgstr "Stato:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2797,10 +2727,10 @@ msgid "Subject:" msgstr "Soggetto:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Invia" @@ -2828,9 +2758,8 @@ msgstr "Invia questionario" msgid "Submitted" msgstr "Inviato" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Sottoscrivi" @@ -2838,7 +2767,7 @@ msgstr "Sottoscrivi" msgid "Subscribe me to an email alert" msgstr "Iscrivimi alle email di avviso" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2857,7 +2786,7 @@ msgstr "Sommario" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Sondaggio" @@ -2914,7 +2843,7 @@ msgstr "Grazie per aver aggiunto la tua foto. Abbiamo adesso bisogno di localizz msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Grazie, è fantastico sapere che è stato risolto! Possiamo soltanto chiederti se avevi gia segnalato altri problemi al tuo comune precedentemente?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2922,7 +2851,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Questa posizione non sembra essere coperta da un comune; forse è in mare aperto o all'esterno del paese. Riprova." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2932,11 +2861,11 @@ msgstr "Questa posizione non sembra essere nel Regno Unito, si prega di riprovar msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2948,7 +2877,7 @@ 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:144 +#: templates/web/base/admin/body.html:142 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." @@ -3088,9 +3017,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova ancora più tardi" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "E' accaduto un problema con la tua combinazione email/password. Se non ti ricordi la password, o non né hai ancora una, per favore riempi qui gli ‘ ed entra con l'email&rsquo, nella sezione del form" @@ -3151,9 +3080,9 @@ msgstr "Questa email è stata inviata ad entrambi i comuni che coprono la zona d msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Questa informazione è richiesta" @@ -3166,11 +3095,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Questo problema è stato risolto" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Questo problema non è stato risolto" @@ -3207,7 +3136,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3252,8 +3181,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3270,7 +3199,7 @@ msgstr "Non confermato" msgid "Unknown" msgstr "Sconosciuto" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3285,7 +3214,7 @@ msgstr "Errore sconosciuto" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3337,10 +3266,10 @@ msgstr "" msgid "Updated" msgstr "Aggiornato" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3367,7 +3296,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3376,11 +3305,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3388,16 +3317,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Utenti" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3434,16 +3363,15 @@ msgstr "Abbiamo trovato più di una corrispondenza per questa posizione. Mostria #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Non mostriamo mai il tuo indirizzo email e numero di telefono." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Non mostriamo mai il tuo indirizzo email e numero di telefono." @@ -3452,7 +3380,7 @@ msgstr "Non mostriamo mai il tuo indirizzo email e numero di telefono." 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Lo invieremo noi al comune responsabile a tuo nome" @@ -3490,10 +3418,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3513,7 +3437,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3543,8 +3467,8 @@ msgstr "Anno" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Si" @@ -3658,19 +3582,19 @@ msgid "Your Reports" msgstr "Tue segnalazioni" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "La tua email" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3681,17 +3605,17 @@ msgstr "Tuo indirizzo email" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Il tuo nome" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3704,20 +3628,19 @@ msgstr "La tua password è stata cambiata" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Il tuo numero di telefono" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Tue segnalazioni" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Tue segnalazioni" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" @@ -3743,7 +3666,7 @@ msgid "didn't use map" msgstr "mappa non usata" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3849,8 +3772,7 @@ msgstr "altre aree:" msgid "reopened" msgstr "riaperto" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3928,7 +3850,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> aggiornamento sulle segnalazioni" msgstr[1] "<big>%s</big> aggiornamenti sulle segnalazioni" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3970,62 +3892,38 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils 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 "(we never show your email address or phone number)" -#~ 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)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ 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:" - -#~ msgid "Email me updates" -#~ msgstr "Inviami via email gli aggiornamenti" - -#~ msgid "Enter a new password:" -#~ msgstr "Inserisci una nuova password:" - -#~ 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" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Se usi un' email su un sito web o hai un filtro per la posta indesiderata, dovresti controllare anche la cartella dello spam o posta indesiderata: qualche volta i nostri messaggi finiscono li." - -#~ msgid "Message:" -#~ msgstr "Messaggio:" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, segnalati al %s" -#~ msgid "More problems nearby" -#~ msgstr "Più problemi vicini" +#~ msgid "About us" +#~ msgstr "Chi siamo" -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Quasi fatto! Ora controlla la tua email..." +#~ msgid "Email me new local problems" +#~ msgstr "Inviami via email i nuovi problemi locali" -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Offensivo? Non adatto? Contattaci" +#~ msgid "Empty house or bungalow" +#~ msgstr "Case o bungalow vuoti" -#~ msgid "Photo:" -#~ msgstr "Foto:" +#~ msgid "Empty office or other commercial" +#~ msgstr "Uffici o altri locali commerciali vuoti" -#~ msgid "Please check your email" -#~ msgstr "Per favore controlla la tua email" +#~ msgid "Empty pub or bar" +#~ msgstr "Pub o bar vuoti" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Gli aggiornamenti non vengono inviati al comune. Se lasci il tuo nome questo sarà pubblico. Le tue informazioni non verranno usate in accordo con la nostra <a href=\"/faq#privacy\">politica sulla privacy</a>" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Edifici pubblici - scuole, ospedali, ecc vuoti" -#~ msgid "This problem has been closed" -#~ msgstr "Questo problema è stato chiuso" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "Update:" -#~ msgstr "Aggiornamento:" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Mi spiace non puoi confermare le segnalazioni non confermate." -#~ msgid "Your email:" -#~ msgstr "La tua email:" +#~ msgid "Problems in this area" +#~ msgstr "Problemi in questa area" -#~ msgid "Your name:" -#~ msgstr "Il tuo nome:" +#~ msgid "Property type:" +#~ msgstr "Tipo di proprietà :" -#~ msgid "Your email:" -#~ msgstr "La tua email:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS feed per i problemi in questo %s" diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po index 808791113..f6bc231bf 100644 --- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/lt_LT.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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/mysociety/fixmystreet/language/lt_LT/)\n" "Language: lt_LT\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "ir" @@ -52,9 +52,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Institucijos" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -89,7 +88,7 @@ msgstr "%s tiesioginiai atnaujinimai" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s klausimynai iÅ¡siųsti – %s atsakyti (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -108,10 +107,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s rajonas, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, praneÅ¡ta %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, viduje %s rajonas" @@ -166,7 +161,7 @@ msgstr "(pavyzdžiui, grafitis, Å¡iukÅ¡lÄ—s, duobÄ— kelyje ar gatvÄ—s apÅ¡vietim msgid "(not sent to council)" msgstr "(neiÅ¡siųsta savivaldybei)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(pasirinktinai)" @@ -178,12 +173,11 @@ msgstr "(vieÅ¡as)" msgid "(sent to both)" msgstr "(iÅ¡siųsta į abu)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- IÅ¡sirinktite kategorija --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Pasirinkite nuosavybÄ—s tipÄ… --" @@ -218,26 +212,21 @@ msgstr "<strong>Ne</strong> Leisti patvirtinti mano praneÅ¡imÄ… el. paÅ¡tu" 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:87 +#: templates/web/base/auth/general.html:97 #: 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:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Taip</strong> AÅ¡ turiu slaptažodį" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Apie Mus" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Veiksmas suplanuotas" @@ -271,7 +260,7 @@ msgstr "PridÄ—ti naujÄ… kategorijÄ…" msgid "Add user" msgstr "PridÄ—ti vartotojÄ…" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "PridÄ—ta %s" @@ -291,7 +280,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Ä®spÄ—ti mane apie atnaujinimus" @@ -304,7 +293,7 @@ msgstr "Visi PraneÅ¡imai" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -405,7 +394,7 @@ msgstr "Atgal" msgid "Ban email address" msgstr "Drausti el. paÅ¡tÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -436,7 +425,7 @@ msgstr "Nematote žemÄ—lapio? <em>Praleiskite Å¡itÄ… žingsnį</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -451,7 +440,7 @@ msgstr "Kategorija" 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/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -471,7 +460,7 @@ msgstr "Kategorija: %s" msgid "Change password" msgstr "Pakeisti slaptažodį" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -479,7 +468,7 @@ 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 +#: templates/web/base/admin/body.html:169 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." @@ -487,7 +476,7 @@ 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 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -505,7 +494,7 @@ msgstr "" "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 +#: templates/web/base/admin/body.html:129 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." @@ -548,8 +537,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -558,7 +547,7 @@ msgstr "" msgid "Closed" msgstr "Uždaryta" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Uždaryta " @@ -584,7 +573,7 @@ msgstr "Cobrand informacija:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Nustatymai" @@ -603,9 +592,8 @@ msgstr "Patvirtinti paskyrÄ…" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, 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." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -615,7 +603,7 @@ msgstr "Patvirtinti el. paÅ¡tu, nurodant naujÄ… slaptažodį. Slaptažodis bus a msgid "Confirmation" msgstr "Patvirtinimas" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -634,7 +622,7 @@ msgid "Confirmed:" msgstr "Patvirtinta:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -653,8 +641,8 @@ msgstr "Susisiekite su komanda" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Vartotojas nerastas" @@ -672,7 +660,7 @@ msgstr "SavivaldybÄ—" msgid "Council contacts for %s" msgstr "Tarybos kontaktai skirti %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -691,7 +679,7 @@ msgstr "SkaiÄiavimas" msgid "Create a report" msgstr "Sukurti praneÅ¡imÄ…" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Sukurti kategorijÄ…" @@ -735,20 +723,20 @@ msgstr "Ä®rankių juosta" msgid "Dealt with by subdivision within 5 working days" msgstr "Padalinys atliko per 5 darbo dienas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "IÅ¡trinta" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: 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 +744,7 @@ msgid "Description" msgstr "ApraÅ¡ymas" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "IÅ¡samiau" @@ -781,11 +769,11 @@ msgid "Diligency prize league table" msgstr "Diligency prize league table" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -803,8 +791,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Kopija" @@ -827,7 +815,7 @@ msgstr "" msgid "Edit" msgstr "Redaguoti" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Redaguoti institucijos informacijÄ…" @@ -857,7 +845,7 @@ msgstr "Redaktorius" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -865,11 +853,11 @@ msgstr "Redaktorius" msgid "Email" msgstr "El. paÅ¡tas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 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 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "El. paÅ¡to adresas:" @@ -881,19 +869,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 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/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "El. paÅ¡tas:" @@ -902,26 +885,6 @@ msgstr "El. paÅ¡tas:" msgid "Email: %s" msgstr "El. paÅ¡tas: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Apleistas butas" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Apleistas namas" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Apleista įtaiga arba kitas komercinÄ—s paskirties objektas" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Apleistas baras" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -972,18 +935,14 @@ msgstr "Ä®veskite artimiausia paÅ¡to kodÄ… arba gatvÄ—s pavadinimÄ… ir rajonÄ…" 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Ä®veskite slaptažodį" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "įveskite problemos detales" @@ -1009,7 +968,7 @@ msgstr "PaÅ¡to kodo pavyzdys %s" msgid "Examples:" msgstr "Pavyzdžiai:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 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..." @@ -1046,19 +1005,15 @@ msgstr "Pirmas kartas" 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:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Sutvarkyta" @@ -1085,7 +1040,7 @@ msgstr "Pažymeti kaip iÅ¡trinta" msgid "Flag user" msgstr "PažymÄ—ti vartotojÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "PažymÄ—ta" @@ -1107,8 +1062,7 @@ msgstr "Flagged users are not restricted in any way. This is just a list of user msgid "Flagged:" msgstr "PažymÄ—ta:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/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." @@ -1139,18 +1093,18 @@ msgstr "Dažniausiai Užduodami Klausimai" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Gauti atnaujinimus" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Gauti problemų atnaujinimus iÅ¡ %s" @@ -1163,7 +1117,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1189,7 +1143,7 @@ msgstr "Ar Å¡i problema buvo sutvarkyta?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Ar esate praneÅ¡Ä™s apie problema anksÄiau, o gal tai pirmas kartas?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1200,8 +1154,7 @@ msgstr "Pagalba" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "ÄŒia pateikti vietinių problemų tipų praneÅ¡imai skirti ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Labas %s" @@ -1217,11 +1170,11 @@ msgstr "Labas %s" msgid "Hidden" msgstr "PaslÄ—pta" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "PaslÄ—pti senus" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "PaslÄ—pti smeigtukus" @@ -1241,10 +1194,6 @@ msgstr "Kaip praneÅ¡ti apie problema" msgid "How to send successful reports" msgstr "Kaip iÅ¡siųsti sÄ—kminga praneÅ¡imÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1255,7 +1204,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1279,7 +1228,7 @@ 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 +#: templates/web/base/admin/body.html:132 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 +1251,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 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." @@ -1345,10 +1294,10 @@ msgstr "NeteisÄ—tas ID" msgid "Illegal feed selection" msgstr "NeteisÄ—tas srauto pasirinkimas" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Apdorojama" @@ -1399,7 +1348,7 @@ msgstr "Internal referral" msgid "Invalid agency_responsible value %s" msgstr "Invalid agency_responsible value %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Klaidina pabaigos data" @@ -1407,16 +1356,16 @@ msgstr "Klaidina pabaigos data" msgid "Invalid format %s specified." msgstr "Pasirinktas klaidingas formatas %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Klaidinga pradžios data" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Tyriama" @@ -1438,7 +1387,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1476,7 +1425,6 @@ msgstr "Kraunama..." #: 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" @@ -1485,11 +1433,11 @@ msgstr "Vietiniai RSS srautai ir el. paÅ¡to praneÅ¡imai" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Vietiniai RSS srautai ir el. paÅ¡to praneÅ¡imai skirti ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Vietiniai praneÅ¡imai" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Nustatytį problemos vietÄ… žemÄ—lapyje" @@ -1549,14 +1497,14 @@ msgstr "MÄ—nuo" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Vardas" @@ -1580,8 +1528,8 @@ msgstr "Artimiausia gatvÄ— esanti Å¡alia smeigtuko (automatiÅ¡kai sugeneruota na msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Artimiausias paÅ¡to kodas esantis Å¡alia smeigtuko žemÄ—lapyje (sugeneruota automatiÅ¡kai): %s (%sm toliau)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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 " @@ -1605,7 +1553,7 @@ msgstr "Naujos <br>problemos" msgid "New body added" msgstr "Nauja dalis pridÄ—ta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Naujas kategorijos kontaktas pridetas" @@ -1670,7 +1618,7 @@ msgstr "Kitas" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Ne" @@ -1741,8 +1689,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Neatsakingas" @@ -1775,7 +1723,7 @@ msgstr "Pastaba" 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/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1789,15 +1737,15 @@ msgstr "Pastaba: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Dabar patvirtinti jÅ«sų report…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Dabar patvirtinti jÅ«sų update…" @@ -1831,8 +1779,8 @@ msgstr "Vieno eilutÄ—s santrauka" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1867,13 +1815,13 @@ msgstr "Arba problemos praneÅ¡tos:" 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1898,7 +1846,7 @@ msgstr "Parent" msgid "Partial" msgstr "Dalinis" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1907,7 +1855,7 @@ msgid "Password (optional)" msgstr "Slaptažodis (nebÅ«tina)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Slaptažodis:" @@ -1915,7 +1863,7 @@ msgstr "Slaptažodis:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefono numeris" @@ -1931,13 +1879,21 @@ msgid "Phone:" msgstr "Telefonas:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Nuotrauka" @@ -1961,8 +1917,8 @@ msgstr "PadÄ—kite smeigtukÄ… ant žemÄ—lapio" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1978,16 +1934,16 @@ msgstr "PraÅ¡ome bÅ«ti mandagÅ«s, raÅ¡yti glaustai ir tiksliai." msgid "Please check the passwords and try again" msgstr "PraÅ¡ome patikrinti slaptažodžius ir pabandykite dar kartÄ…" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "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:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1997,7 +1953,7 @@ msgstr "PraÅ¡ome pasirinkti kategorijÄ…" msgid "Please choose a property type" msgstr "PraÅ¡ome pasirinkti nuosavybÄ—s tipÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "PraÅ¡ome iÅ¡taisyti klaidas " @@ -2018,11 +1974,10 @@ msgstr "PraÅ¡ome neįžeidinÄ—ti — įžeidinÄ—jimai nuvertina paslaug msgid "Please enter a message" msgstr "PraÅ¡ome įvesti žinutÄ™" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "PraÅ¡ome įvesti savo vardÄ…" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2036,10 +1991,10 @@ msgstr "PraÅ¡ome įvesti slaptažodį" msgid "Please enter a subject" msgstr "PraÅ¡ome įvesti temÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2056,9 +2011,9 @@ msgid "Please enter some details" msgstr "PraÅ¡ome įvesti daugiau informacijos" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2067,7 +2022,7 @@ msgid "Please enter your email" msgstr "PraÅ¡ome įvesti savo el. paÅ¡tÄ…" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "PraÅ¡ome įvesti savo el. paÅ¡to adresÄ…" @@ -2083,7 +2038,7 @@ msgstr "PraÅ¡ome įvesti savo vardÄ… ir pavardÄ™, savivalldybei reikalinga jÅ«sÅ #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "PraÅ¡ome įvesti savo vardÄ…" @@ -2110,7 +2065,7 @@ msgstr "Galite <a href=\"%s\">prisijungti iÅ¡ naujo</a>, arba grįžti atgal į 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:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "PraÅ¡ome užpildyti problemos detales." @@ -2119,7 +2074,7 @@ msgstr "PraÅ¡ome užpildyti problemos detales." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "PraÅ¡ome pateikti problemos detales žemiau esanÄioje anketoje ir kuo tiksliau apibÅ«dinkite vietÄ…." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "PraÅ¡ome nurodyti, ar norite gauti kitÄ… klausimynÄ…." @@ -2128,9 +2083,8 @@ 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/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -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." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2146,16 +2100,16 @@ msgstr "" msgid "Please note:" msgstr "Atkreipkite dÄ—mÄ—sį:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "PraÅ¡ome pateikti priežastis, kodÄ—l jÅ«s naujinate šį praneÅ¡imÄ…" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 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:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "PraÅ¡ome pasakyti ar esate praneÅ¡Ä™s apie problemÄ… savo savivaldybei anksÄiau" @@ -2171,22 +2125,23 @@ msgstr "PraÅ¡ome pasirinkti jÅ«sų pageidaujama srautÄ…" msgid "Please select the type of alert you want" msgstr "PraÅ¡ome pasirinkti pageidaujama įspÄ—jimo tipÄ…" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "PraÅ¡ome nurodyti, ar problema buvo sutvarkyta" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "PraÅ¡ome įkelti tik JPEG formato nuotraukÄ…" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "PraÅ¡ome įvesti žinutÄ™" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "PraÅ¡ome raÅ¡tyti savo naujinimÄ… Äia" @@ -2217,7 +2172,7 @@ msgstr "" msgid "Previous" msgstr "Ankstesnis" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Privatumas" @@ -2227,7 +2182,7 @@ msgstr "Privatumas" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2256,7 +2211,7 @@ msgstr "Problema %s iÅ¡siųsta savivaldybei %s" msgid "Problem breakdown by state" msgstr "Problemos pasiskirstymas pagal valstybÄ—s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problema pažymÄ—ta kaip atidaryta" @@ -2268,10 +2223,6 @@ msgstr "Problemos bÅ«klÄ—s pakeitimas remiantis tyrimo rezultatais" msgid "Problems" msgstr "Problemos" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemos Å¡ioje srityje" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Å alia esanÄios problemos" @@ -2289,13 +2240,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemos %.1fkm atstumu aplink Å¡iÄ… vietovÄ™" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemos viduje %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemos %s rajone" @@ -2314,15 +2263,11 @@ msgstr "Problemos apibrėžtose ribose:" 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:6 msgid "Provide an update" msgstr "Pateikti naujinimÄ…" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2356,16 +2301,15 @@ msgstr "Atsakyta anketa %d skirta problemoms %d, %s to %s" msgid "Questionnaire %d sent for problem %d" msgstr "Anketa %d iÅ¡siųsta dÄ—l problemos %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Questionnaire filled in by problem reporter" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS srautas" @@ -2393,18 +2337,12 @@ msgstr "RSS srautas %s, viduje %s rajono" 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:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2414,14 +2352,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2457,12 +2394,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2472,7 +2408,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2487,7 +2423,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2497,7 +2433,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2511,27 +2447,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2552,7 +2488,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2595,15 +2531,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2618,7 +2554,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2674,7 +2610,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2693,21 +2629,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2775,14 +2711,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2791,7 +2723,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2804,7 +2736,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2844,10 +2776,10 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "" @@ -2875,9 +2807,8 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2885,7 +2816,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2904,7 +2835,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2961,7 +2892,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2969,7 +2900,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2979,11 +2910,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2995,7 +2926,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3135,9 +3066,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3198,9 +3129,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3213,11 +3144,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "" @@ -3254,7 +3185,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3299,8 +3230,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3317,7 +3248,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3332,7 +3263,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3384,10 +3315,10 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3414,7 +3345,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3423,11 +3354,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3435,16 +3366,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3481,16 +3412,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "(mes niekada nerodome jÅ«sų el. paÅ¡to arba telefono numerio)" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3499,7 +3429,7 @@ msgstr "" 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3537,10 +3467,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3560,7 +3486,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3590,8 +3516,8 @@ msgstr "" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -3705,19 +3631,19 @@ msgid "Your Reports" msgstr "" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3728,17 +3654,17 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3751,20 +3677,19 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Visi praneÅ¡imai" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" @@ -3790,7 +3715,7 @@ msgid "didn't use map" msgstr "" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3896,8 +3821,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3980,7 +3904,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -4028,44 +3952,41 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "(we never show your email)" -#~ msgstr "(mes niekada nerodome jÅ«sų el. paÅ¡to)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Ne</strong>, leisti man patvirtinti mano praneÅ¡imÄ… el. paÅ¡tu:" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, praneÅ¡ta %s" -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Ne</strong>Ä leisti patvirtinti mano atnaujinimÄ… el. paÅ¡tu:" +#~ msgid "About us" +#~ msgstr "Apie Mus" -#~ msgid "Email me updates" -#~ msgstr "Atsiųsti man atnaujinimus" +#~ msgid "Email me new local problems" +#~ msgstr "Atsiųsti man naujas vietines problemas" -#~ msgid "Enter a new password:" -#~ msgstr "Ä®veskite nauja slaptažodį:" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Apleistas butas" -#~ 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" +#~ msgid "Empty house or bungalow" +#~ msgstr "Apleistas namas" -#~ 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." +#~ msgid "Empty office or other commercial" +#~ msgstr "Apleista įtaiga arba kitas komercinÄ—s paskirties objektas" -#~ msgid "Message:" -#~ msgstr "ŽinutÄ—:" +#~ msgid "Empty pub or bar" +#~ msgstr "Apleistas baras" -#~ msgid "More problems nearby" -#~ msgstr "Daugiau Å¡alia esanÄių problemų" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Apleistas vieÅ¡osios paskirties pastatas - mokyklaÄ ligonine ir t.t" -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Beveik baigta! Dabar patikrinkite savo el. paÅ¡tÄ…..." +#~ 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Ä…" -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Įžeidžiantis? Netinkamas? PraneÅ¡k mums" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "Photo:" -#~ msgstr "Nuotrauka:" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "ApgailestaujameÄ bet jÅ«s negalite patvirtinti nepatvirtintų praneÅ¡imų." -#~ msgid "Please check your email" -#~ msgstr "PraÅ¡ome patikrinti savo el. paÅ¡tÄ…" +#~ msgid "Problems in this area" +#~ msgstr "Problemos Å¡ioje srityje" -#~ 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>" +#~ msgid "Property type:" +#~ msgstr "NuosavybÄ—s tipas:" diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po index 471a81f2d..02960b577 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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Malay (http://www.transifex.com/mysociety/fixmystreet/language/ms/)\n" "Language: ms\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " dan " @@ -52,9 +52,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Badan" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -89,7 +88,7 @@ msgstr "%s update secara langsung" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s soalan selidik dihantar – %s dijawabi (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ruj; %s" @@ -108,10 +107,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s kawasan pentadbiran, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, dilaporkan pada %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, dalam kawasan pentadbiran %s" @@ -166,7 +161,7 @@ msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)" msgid "(not sent to council)" msgstr "(tidak dihantar kepada majlis)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(tidak diwajibkan)" @@ -178,12 +173,11 @@ msgstr "" msgid "(sent to both)" msgstr "(hantar kepada kedua-dua)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Pilih kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Pilih jenis harta --" @@ -218,26 +212,21 @@ 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/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ya</strong> Aku ada kata laluan" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Tentang kita" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Jadual tindakan" @@ -268,7 +257,7 @@ msgstr "Tambah kategori baru" msgid "Add user" msgstr "Tambah pengguna" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "%s telah ditambahi" @@ -288,7 +277,7 @@ msgstr "Alert %d diciptakan untuk %s, jenis %s, parameter %s/%s" msgid "Alert %d disabled (created %s)" msgstr "Pemberitahuan %d dihenti (dibuat pada %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Maklumkan aku sebarang kemas kini masa depan" @@ -301,7 +290,7 @@ msgstr "Semua Laporan" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -400,7 +389,7 @@ msgstr "Balik" msgid "Ban email address" msgstr "Melarang alamat emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -431,7 +420,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -446,7 +435,7 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategori rata masalah diselesai > 4 minggu" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -466,19 +455,19 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Menukar Kata Laluan" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -489,7 +478,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -530,8 +519,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -540,7 +529,7 @@ msgstr "" msgid "Closed" msgstr "Ditutup" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Ditutup oleh majlis" @@ -566,7 +555,7 @@ msgstr "Data Cobrand" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurasi" @@ -596,7 +585,7 @@ msgstr "" msgid "Confirmation" msgstr "Pengesahan" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -615,7 +604,7 @@ msgid "Confirmed:" msgstr "Disahkan:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -634,8 +623,8 @@ msgstr "Menghubungi pasukan" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Tidak dapat mencari pengguna" @@ -653,7 +642,7 @@ msgstr "Majlis" msgid "Council contacts for %s" msgstr "Hubungan Majlis untuk %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "Rujukan majlis: %s" @@ -672,7 +661,7 @@ msgstr "Kiraan" msgid "Create a report" msgstr "Laporan baru" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kategori baru" @@ -716,20 +705,20 @@ msgstr "Papan pemuka" msgid "Dealt with by subdivision within 5 working days" msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Dipadam" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -737,7 +726,7 @@ msgid "Description" msgstr "Huraian" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Perincian" @@ -762,11 +751,11 @@ msgid "Diligency prize league table" msgstr "Jadual liga hadiah ketekunan" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -784,8 +773,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Salinan" @@ -805,7 +794,7 @@ msgstr "" msgid "Edit" msgstr "Menyunting" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Edit perincian badah" @@ -835,7 +824,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -843,11 +832,11 @@ msgstr "Editor" msgid "Email" msgstr "Emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Emel ditambahkan kepada senarai penyalahguna" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Alamat emel:" @@ -859,19 +848,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Emel telah dalam senarai penyalahguna" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Emel aku masalah tempatan baru" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "Emel:" @@ -880,26 +864,6 @@ msgstr "Emel:" msgid "Email: %s" msgstr "Emel: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Flat atau apartmen lama" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Rumah kosong atau banglo" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Pejabat kosing atau komersial lain" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Pub kosong atau bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Bangunan awam kosong - sekolah, hospital, lain-lain" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -943,18 +907,14 @@ msgstr "Masukkan poskod terdekat, atau nama jalan dan kawasan" msgid "Enter a nearby street name and area" msgstr "Masukkan nama jalan dan kawasan terdekat" -#: 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Masukkan kata laluan" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Masukkan perincian masalah tersebut" @@ -980,7 +940,7 @@ msgstr "Contoh poskod %s" msgid "Examples:" msgstr "Contoh:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1017,19 +977,15 @@ msgstr "Pertama kali" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Diselesai" @@ -1056,7 +1012,7 @@ msgstr "Tanda sebagai dipadam" msgid "Flag user" msgstr "Tanda pengguna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Ditanda" @@ -1078,8 +1034,7 @@ msgstr "" msgid "Flagged:" msgstr "Ditanda:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Ikuti link kawasan pentadbiran untuk melihat laporan dalam kawasan tersebut sahaja." @@ -1110,18 +1065,18 @@ msgstr "Soalan lazim" msgid "GeoRSS on Google Maps" msgstr "GeoRSS atas Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Dapatkan kemas kini" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Dapatkan kemas kini masalah di %" @@ -1134,7 +1089,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1160,7 +1115,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1171,8 +1126,7 @@ msgstr "Bantuan" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hi %s" @@ -1188,11 +1142,11 @@ msgstr "Hi %s" msgid "Hidden" msgstr "Tersembunyi" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Sembunyikan lama" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Sembunyikan pin" @@ -1212,10 +1166,6 @@ msgstr "Bagaimana melaporkan masalah" msgid "How to send successful reports" msgstr "Bagaimana untuk menghantar laporan berjaya" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Anda tidak boleh mengesahkan laporan yang belum disahkan." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1226,7 +1176,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Masalah anda tidak dapat dijumpai dalam database.\n" @@ -1248,7 +1198,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1269,7 +1219,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1304,10 +1254,10 @@ msgstr "ID tak sah" msgid "Illegal feed selection" msgstr "Pilihan feed yang tak sah" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Dijalani" @@ -1358,7 +1308,7 @@ msgstr "Rujukan dalaman" msgid "Invalid agency_responsible value %s" msgstr "Nilai agency_responsible %s salah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Tarikh berakhir yang tak sah" @@ -1366,16 +1316,16 @@ msgstr "Tarikh berakhir yang tak sah" msgid "Invalid format %s specified." msgstr "Format dinyatakan %s salah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Tarikh mula yang tak sah" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Dalam siasatan" @@ -1397,7 +1347,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1435,7 +1385,6 @@ msgstr "Loading..." #: 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 "RSS feed tempatan dan pemberitahuan emel" @@ -1444,11 +1393,11 @@ msgstr "RSS feed tempatan dan pemberitahuan emel" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS feed tempatan dan pemberitahuan emel untuk '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Pemberitahuan tempatan" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Mengesan masalah dalam kawasan atas peta" @@ -1508,14 +1457,14 @@ msgstr "Bulan" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Nama" @@ -1539,8 +1488,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1562,7 +1511,7 @@ msgstr "Masalah<br>baru" msgid "New body added" msgstr "Badan baru ditambahi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Kategori hubungan baru ditambahi" @@ -1627,7 +1576,7 @@ msgstr "Seterusnya" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Tidak" @@ -1692,8 +1641,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Tidak Bertanggungjawab" @@ -1726,7 +1675,7 @@ 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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1740,15 +1689,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Hantarkan kemas kini anda sekarang…" @@ -1784,8 +1733,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1820,13 +1769,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1851,7 +1800,7 @@ msgstr "Induk" msgid "Partial" msgstr "Separa" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1860,7 +1809,7 @@ msgid "Password (optional)" msgstr "Kata Laluan (tidah diwajibkan)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Kata Laluan:" @@ -1868,7 +1817,7 @@ msgstr "Kata Laluan:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Nombor telefon" @@ -1884,13 +1833,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1914,8 +1871,8 @@ msgstr "Letakkan pin atas peta" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1931,16 +1888,16 @@ msgstr "Sila bersopan, ringkas dan tepat." msgid "Please check the passwords and try again" msgstr "Sila periksa kata laluan dan cuba lagi" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Sila periksa sama ada alamat emel anda adalah betul" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1950,7 +1907,7 @@ msgstr "Sila pilihkan kategori" msgid "Please choose a property type" msgstr "Sila pilihkan jenis bangunan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1971,11 +1928,10 @@ msgstr "" msgid "Please enter a message" msgstr "Sila masukkan pesanan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Sila masukkan nama anda" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1989,10 +1945,10 @@ msgstr "Sila masukkan kata laluan" msgid "Please enter a subject" msgstr "Sila masukkan tajuk" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2009,9 +1965,9 @@ msgid "Please enter some details" msgstr "Sila masukkan perincian" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2020,7 +1976,7 @@ msgid "Please enter your email" msgstr "Sila masukkan emel anda" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Sila masukkan alamat emel anda" @@ -2036,7 +1992,7 @@ msgstr "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika and #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Sila masukkan nama anda" @@ -2063,7 +2019,7 @@ msgstr "Sila <a href=\"%s\">log masuk lagi</a>, atau balik ke <a href=\"/\">hala msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Sila isikan perincian untuk masalah tersebut" @@ -2072,7 +2028,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2098,16 +2054,16 @@ msgstr "" msgid "Please note:" msgstr "Sila nota:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2123,22 +2079,23 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Sila memuat naik imej JPEG sahaja" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Sila tuliskan pesanan" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Sila tuliskan kemas kini anda di sini" @@ -2169,7 +2126,7 @@ msgstr "" msgid "Previous" msgstr "Sebelumnya" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2179,7 +2136,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2208,7 +2165,7 @@ msgstr "Masalah %s dihantar kepada majlis %s" msgid "Problem breakdown by state" msgstr "Pecahan masalah bagi negeri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Masalah ditanda sebagai terbukan" @@ -2220,10 +2177,6 @@ msgstr "" msgid "Problems" msgstr "Masalah-masalah" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Masalah dalam kawasan ini" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Masalah terdekat" @@ -2241,13 +2194,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Masalah dalam %.1fkm dalam lokasi ini" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Masalah dalam %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Masalah dalam kawasan pentadbiran %s" @@ -2266,15 +2217,11 @@ msgstr "Masalah dalam sempadan" msgid "Property address:" msgstr "Alamat bangunan" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Jenis bangunan:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Sediakan kemas kini" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2308,16 +2255,15 @@ 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:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Soalan selidik diisikan oleh pelapor masalah" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "Feed RSS" @@ -2345,18 +2291,12 @@ msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s" msgid "RSS feed of nearby problems" msgstr "Feed RSS untuk masalah berdekatan" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "Feed RSS untuk masalah dalam %s ini" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Feed RSS untuk masalah dalam %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s" @@ -2366,14 +2306,13 @@ msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s" msgid "RSS feed of recent local problems" msgstr "Feed RSS untuk masalah tempatan baru-baru ini" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Feed RSS untuk kemas kini bagi masalah ini" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Terima emel semasa kemas kini ditinggalkan bagi masalah ini" @@ -2409,12 +2348,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2424,7 +2362,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2439,7 +2377,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2449,7 +2387,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2463,27 +2401,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2504,7 +2442,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2547,15 +2485,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2570,7 +2508,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2626,7 +2564,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Dihantar kepada %s %s kemudian" @@ -2645,21 +2583,21 @@ msgstr "Kongsi" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Tunjukkan nama aku secara umum" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Tunjukkan lama" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Tunjukkan pin" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2727,14 +2665,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Tarikh bermula:" @@ -2743,7 +2677,7 @@ msgstr "Tarikh bermula:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Negeri" @@ -2756,7 +2690,7 @@ msgstr "Negeri" msgid "State:" msgstr "Negeri:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2796,10 +2730,10 @@ msgid "Subject:" msgstr "Tajuk:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Hantar" @@ -2827,9 +2761,8 @@ msgstr "Hantar soalan selidik" msgid "Submitted" msgstr "Dihantarkan" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Melanggan" @@ -2837,7 +2770,7 @@ msgstr "Melanggan" msgid "Subscribe me to an email alert" msgstr "Langgankan pemberitahuan emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2856,7 +2789,7 @@ msgstr "Ringkasan" msgid "Summary reports" msgstr "Laporan ringkasan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Kajian" @@ -2913,7 +2846,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2921,7 +2854,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2931,11 +2864,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2947,7 +2880,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3087,9 +3020,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3150,9 +3083,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3165,11 +3098,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Masalah ini telah diselesai" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Masalah ini belum diselesai" @@ -3206,7 +3139,7 @@ msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh penggu msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Garis masa" @@ -3251,8 +3184,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Tidak dapat diselesai" @@ -3269,7 +3202,7 @@ msgstr "Belum dipastikan" msgid "Unknown" msgstr "Tidak diketahui" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Jenis pemberitahuan tak diketahui" @@ -3284,7 +3217,7 @@ msgstr "Ralat tidak diketahui" msgid "Unknown problem ID" msgstr "ID masalah tidak diketahui" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Kemas kini" @@ -3336,10 +3269,10 @@ msgstr "Status kemas kini" msgid "Updated" msgstr "Dikemas kinikan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3366,7 +3299,7 @@ msgstr "Kemas kini atas {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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." @@ -3375,11 +3308,11 @@ msgstr "Gunakan <strong>nota</strong> untuk melaporkan maklumat yang hanya dipap msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Tanda pengguna dipadam" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Pengguna ditanda" @@ -3387,16 +3320,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:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Pengguna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Nilai dikemaskinikan" @@ -3433,16 +3366,15 @@ msgstr "Kita mendapati lebih daripada satu bersesuaian bagi lokasi tersebut. Kit #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Kita tidak akan mempaprkan emel anda" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda." @@ -3451,7 +3383,7 @@ msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda." 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:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Kita menghantar kepada majlis bagi pihak anda" @@ -3489,10 +3421,6 @@ msgstr "Bila dihantar" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3512,7 +3440,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3542,8 +3470,8 @@ msgstr "Tahun" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ya" @@ -3660,19 +3588,19 @@ msgid "Your Reports" msgstr "Laporan Anda" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Emel Anda" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3683,17 +3611,17 @@ msgstr "Alamat emel anda" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Nama anda" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3706,20 +3634,19 @@ msgstr "Kata laluan anda telah diubahi" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Nombor telefon anda" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Laporan anda" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Laporan anda" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Kemas kini anda" @@ -3745,7 +3672,7 @@ msgid "didn't use map" msgstr "tidak mengguna peta" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "seperti ‘%s’ atau ‘%s’" @@ -3851,8 +3778,7 @@ msgstr "kawasan lain:" msgid "reopened" msgstr "dibuka semula" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "log keluar" @@ -3925,7 +3851,7 @@ msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> laporan dikemaskini" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3961,71 +3887,44 @@ 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] "Kita <strong>belum</strong> ada maklumat tentang majlis lain yang menutupi lokasi ini." -#~ msgid "(we never show your email address or phone number)" -#~ 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)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ 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" - -#~ msgid "Email me updates" -#~ msgstr "Emel aku kemas kini" - -#~ msgid "Enter a new password:" -#~ msgstr "Masukkan kata laluan baru" - -#~ msgid "Message:" -#~ msgstr "Pesanan:" - -#~ msgid "More problems nearby" -#~ msgstr "Lebih masalah terdekat" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Hampir Dilakukan! Sila periksa emel anda sekarang..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Serangan? Tidak sesuai? Beritahu kami" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, dilaporkan pada %s" -#~ msgid "Photo:" -#~ msgstr "Foto:" +#~ msgid "About us" +#~ msgstr "Tentang kita" -#~ msgid "Please check your email" -#~ msgstr "Sila periksa emel anda" +#~ msgid "Email me new local problems" +#~ msgstr "Emel aku masalah tempatan baru" -#~ msgid "This problem has been closed" -#~ msgstr "Masalah ini telah ditutup" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Flat atau apartmen lama" -#~ msgid "This problem is in progress" -#~ msgstr "Masalah ini dalam kemajuan" +#~ msgid "Empty house or bungalow" +#~ msgstr "Rumah kosong atau banglo" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Masalah ini lama dan dalam keadaan tidak diketahui." +#~ msgid "Empty office or other commercial" +#~ msgstr "Pejabat kosing atau komersial lain" -#~ msgid "Update:" -#~ msgstr "Kemas kini:" +#~ msgid "Empty pub or bar" +#~ msgstr "Pub kosong atau bar" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Kita belum dapat mengesahkan akaun anda - maaf." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Bangunan awam kosong - sekolah, hospital, lain-lain" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Kita telah menghantarkan anda emel yang mengandungi link untuk mengesahkan akaun anda." +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ 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." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Anda tidak boleh mengesahkan laporan yang belum disahkan." -#~ 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." +#~ msgid "Problems in this area" +#~ msgstr "Masalah dalam kawasan ini" -#~ msgid "Your email:" -#~ msgstr "Emel anda:" +#~ msgid "Property type:" +#~ msgstr "Jenis bangunan:" -#~ msgid "Your name:" -#~ msgstr "Nama anda:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "Feed RSS untuk masalah dalam %s ini" -#~ msgid "Your email:" -#~ msgstr "Emel anda:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Seluruh blok flat kosong" diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po index d179c78d1..0678eba77 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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/mysociety/fixmystreet/language/my_MM/)\n" "Language: my_MM\n" @@ -24,7 +24,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "á‚ွင့္" @@ -57,9 +57,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "စာကá€á€¯á€šá€¹á€™á€ºá€¬á€¸" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -94,7 +93,7 @@ msgstr "%s á€á€á€¯á€€á€¹á€›á€á€¯á€€á€¹á€¡á€žá€…္ရယူျá€á€„္:" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s စစ်á€á€™á€ºá€¸á€™á€±á€¸á€á€½á€”်းလွှာပá€á€¯á€·á€•á€¼á€®á€¸ – %s အဖြေ (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -113,10 +112,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%sရပ္ကြက္አ%s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s သá€á€„္းပá€á€¯á‚”သည္မွာ %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%sአ%s ရပ္ကြက္အá€á€¼á€„္း" @@ -171,7 +166,7 @@ msgstr "(ဂရပ္ဖီá€á€®áŠ စည္းကမ္းမဲ့ အမဠmsgid "(not sent to council)" msgstr "(ေကာင္စီသá€á€¯á‚”မပá€á€¯á‚”ပါ)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(ေရြးá€á€ºá€šá€¹á‚á€á€¯á€„္á€á€¼á€„့္)" @@ -183,12 +178,11 @@ msgstr "" msgid "(sent to both)" msgstr "(á‚ွစ္á€á€¯á€œá€¶á€¯á€¸á€žá€á€¯á‚”ပá€á€¯á‚”မည္)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- ေá€á€«á€„္းစဥ္á€á€…္á€á€¯á€±á€›á€¼á€¸á€•á€« --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- ပစá¥á€Šá€¹á€¸á€¡á€™á€ºá€á€³á€¸á€¡á€…ားကá€á€¯á€±á€›á€¼á€¸á€•á€« --" @@ -220,26 +214,21 @@ msgstr "<strong>မဟုá€á€¹á€•á€«</strong> ကá½á€¼á‚္ုပ္áအစ msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>မဟုá€á€¹á€•á€«</strong> ကá½á€¼á‚္ုပ္áအသစ္မြမ္းမံျá€á€„္းကá€á€¯á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: 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:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>ဟုá€á€¹á€€á€²á€·</strong> ကá½á€¼á‚္ုပ္á€á€¼á€„္စကားá€á€½á€€á€¹á€á€…္á€á€¯á€›á€½á€á€žá€Šá€¹" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "ကá½á€¼á‚္ုပ္á€á€á€¯á‚”အေá¾á€€á€¬á€„္း" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "လုပ္ေဆာင္မႈကá€á€¯á€¡á€á€ºá€á€”္ဇယားျဖင့္ျပဳလုပ္ျပီး" @@ -270,7 +259,7 @@ msgstr "ေá€á€«á€„္းစဥ္အသစ္ထည့္မည္" msgid "Add user" msgstr "အသံုးျပဳသူထည့္မည္" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "%sကá€á€¯á€‘ည့္ျပီးျပီ" @@ -290,7 +279,7 @@ msgstr "Parameters %s/%s አအမ်á€á€³á€¸á€¡á€…ား %s አ%s အá€á€¼á msgid "Alert %d disabled (created %s)" msgstr "အသá€á€±á€•á€¸á€á€ºá€€á€¹%dကá€á€¯á€•á€á€á€¹á€‘ားသည္(%sကá€á€¯á€–န္á€á€®á€¸á€»á€•á€®á€¸)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "ေနာက္ထပ္အသစ္မ်ားအá€á€¼á€€á€¹á€œá€Šá€¹á€¸á€€á½á€¼á‚္ုပ္ကá€á€¯á€¡á€žá€á€±á€•á€¸á€™á€Šá€¹" @@ -303,7 +292,7 @@ msgstr "အစီရင္á€á€¶á€…ာအားလံုး" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -402,7 +391,7 @@ msgstr "ေနာက္သá€á€¯á‚”" msgid "Ban email address" msgstr "အီးေမးလ္လá€á€•á€¹á€…ာကá€á€¯á€•á€á€¹á€á€¹á€•á€„္မည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -433,7 +422,7 @@ msgstr "ေျမပံုကá€á€¯á€™á€»á€™á€„္ဘူးလားዠ<em>ဒá #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -448,7 +437,7 @@ msgstr "အမ်á€á€³á€¸á€¡á€…ား" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -468,19 +457,19 @@ msgstr "အမ်á€á€³á€¸á€¡á€…ား - %s" msgid "Change password" msgstr "စကားá€á€½á€€á€¹á€±á€»á€•á€¬á€„္းမည္" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -491,7 +480,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -532,8 +521,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -542,7 +531,7 @@ msgstr "" msgid "Closed" msgstr "ပá€á€á€¹á€™á€Šá€¹" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "ေကာင္စီမွပá€á€á€¹á€‘ားသည္" @@ -568,7 +557,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "အစီအစဥ္သá€á€¹á€™á€½á€á€¹á€»á€á€„္း" @@ -598,7 +587,7 @@ msgstr "" msgid "Confirmation" msgstr "အá€á€Šá€¹á€»á€•á€³á€»á€á€„္း" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -617,7 +606,7 @@ msgid "Confirmed:" msgstr "အá€á€Šá€¹á€»á€•á€³á€á€²á€·á€á€ºá€á€”္-" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -636,8 +625,8 @@ msgstr "အဖြဲ႕á‚ွင့္ဆက္သြယ္ပါ" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "အသံုးျပဳသူရွာမေá€á€¼á‚•á€•á€«" @@ -655,7 +644,7 @@ msgstr "ေကာင္စီ" msgid "Council contacts for %s" msgstr "%sအá€á€¼á€€á€¹á€±á€€á€¬á€„္စီအဆက္အသြယ္" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "ေကာင္စီ ရည္ညႊန္းá€á€ºá€€á€¹" @@ -674,7 +663,7 @@ msgstr "အေရအá€á€¼á€€á€¹" msgid "Create a report" msgstr "အစီရင္á€á€¶á€…ာá€á€…္á€á€¯á€€á€á€¯á€–န္á€á€®á€¸á€™á€Šá€¹" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "အမ်á€á€³á€¸á€¡á€…ားဖန္á€á€®á€¸á€™á€Šá€¹" @@ -718,20 +707,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "ဖ်က္ျပီးျပီ" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -739,7 +728,7 @@ msgid "Description" msgstr "ေဖာ္ျပá€á€ºá€€á€¹" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "အေသးစá€á€á€¹á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹" @@ -764,11 +753,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -786,8 +775,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "á‚ွစ္á€á€¯á€»á€•á€³á€œá€¯á€•á€¹á€™á€Šá€¹" @@ -807,7 +796,7 @@ msgstr "" msgid "Edit" msgstr "ျပင္ဆင္မည္" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "စာကá€á€¯á€šá€¹á€€á€á€¯á€¡á€±á€žá€¸á€…á€á€á€¹á€»á€•á€„္မည္" @@ -837,7 +826,7 @@ msgstr "အယ္ဒီá€á€¬" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -845,11 +834,11 @@ msgstr "အယ္ဒီá€á€¬" msgid "Email" msgstr "အီးေမးလ္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲá€á€¼á€„္အီးေမးလ္ထည့္ျပီး" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "အီးေမးလ္လá€á€•á€¹á€…ာ-" @@ -861,19 +850,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲá€á€¼á€„္အီးေမးလ္ရွá€á€»á€•á€®á€¸" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "ေဒသအá€á€¼á€„္းျပႆနာအသစ္မ်ားကá€á€¯á€€á½á€¼á‚္ုပ္ထံသá€á€¯á‚”အီးေမးလ္ပá€á€¯á‚”မည္" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "အီးေမးလ္-" @@ -882,26 +866,6 @@ msgstr "အီးေမးလ္-" msgid "Email: %s" msgstr "အီးေမးလ္ -%s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "á€á€á€¯á€€á€¹á€á€”္းအလြá€á€¹á€žá€á€¯á‚”မဟုá€á€¹ maisonette" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "အá€á€™á€¹á€¡á€œá€¼á€á€¹á€žá€á€¯á‚”မဟုá€á€¹á€˜á€”္ဂလá€á€¯á€¡á€œá€¼á€á€¹" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "ရံုးအလြá€á€¹á€žá€á€¯á‚”မဟုá€á€¹á€á€»á€á€¬á€¸á€…ီးပြားေရးအလြá€á€¹" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "အလြá€á€¹á€¡á€›á€€á€¹á€†á€á€¯á€„္သá€á€¯á‚”မဟုá€á€¹á€˜á€¬á€¸" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -945,18 +909,14 @@ msgstr "အနီးနားရွဠစာá€á€á€¯á€€á€¹á€”ံပါá€á€¹á 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "စကားá€á€½á€€á€¹á€›á€á€¯á€€á€¹á€‘ည့္ပါ" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "ျပႆနာáအေသးစá€á€á€¹á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" @@ -982,7 +942,7 @@ msgstr "နမူနာစာá€á€á€¯á€€á€¹á€±á€žá€á±á€¬á€”ံပါá€á€¹ %s msgid "Examples:" msgstr "နမူနာမ်ား -" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1019,19 +979,15 @@ msgstr "ပထမအá¾á€€á€á€™á€¹" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "ကá½á€¼á‚ု္ပ္လမ္းကá€á€¯á€»á€•á€„္ေပးပါ" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "ျပင္ျပီးျပီ" @@ -1058,7 +1014,7 @@ msgstr "ဖ်က္ျပီးျပီဟုသá€á€¹á€™á€½á€á€¹á€™á€Šá€¹" msgid "Flag user" msgstr "သá€á€¹á€™á€½á€á€¹á€žá€Šá€¹á€·á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€žá€°" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1080,8 +1036,7 @@ msgstr "" msgid "Flagged:" msgstr "အမွá€á€¹á€¡á€žá€¬á€¸á€»á€•á€³á€œá€¯á€•á€¹á€‘ားျá€á€„္း" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "ရပ္ကြက္ထဲမွအစီရင္á€á€¶á€…ာမ်ားကá€á€¯á€žá€¬á¾á€€á€Šá€¹á€·á€›á€”္ရပ္ကြက္လင့္á€á€¹á€€á€á€¯á€œá€á€¯á€€á€¹á¾á€€á€Šá€¹á€·á€•á€«" @@ -1112,18 +1067,18 @@ msgstr "မá¾á€€á€¬á€á€á€±á€™á€¸á€±á€žá€¬á€±á€™á€¸á€á€¼á€”္းမ်ား msgid "GeoRSS on Google Maps" msgstr "Google Maps ေပášá€€ GeoRSS" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "%ျပႆနာáအသစ္မြမ္းမံမႈမ်ားရယူရန္" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1136,7 +1091,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1162,7 +1117,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1173,8 +1128,7 @@ msgstr "အကူအညီ" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "မဂá¤á€œá€¬á€•á€«%s" @@ -1190,11 +1144,11 @@ msgstr "မဂá¤á€œá€¬á€•á€«%s" msgid "Hidden" msgstr "ေဖ်ာက္ထားေသာ" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "အေဟာင္းေဖ်ာက္ထားေသာ" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "" @@ -1214,10 +1168,6 @@ msgstr "ျပႆနာကá€á€¯á€˜á€šá€¹á€œá€á€¯á€¡á€…ီရင္á€á€¶á€…ာ msgid "How to send successful reports" msgstr "ေကာင္းမြန္ေသာအစီရင္á€á€¶á€…ာကá€á€¯á€˜á€šá€¹á€œá€á€¯á€•á€á€¯á‚”မလဲ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1228,7 +1178,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1250,7 +1200,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1271,7 +1221,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1306,10 +1256,10 @@ msgstr "á€á€›á€¬á€¸á€™á€á€„္ေသာအá€á€¯á€„္ဒီ" msgid "Illegal feed selection" msgstr "á€á€›á€¬á€¸á€™á€á€„္ေသာအá€á€¯á€„္ဒီ" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "လုပ္ေဆာင္ေနဆဲ" @@ -1360,7 +1310,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ" @@ -1368,16 +1318,16 @@ msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ" msgid "Invalid format %s specified." msgstr "ပံုစံ %s သည္မမွန္ကန္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "စမည့္ရက္မမွန္ကန္ပါ" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "စံုစမ္းစစ္ေဆးေနဆဲ" @@ -1399,7 +1349,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1437,7 +1387,6 @@ msgstr "ဖြင့္ေနသည္" #: 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 "ျပည္á€á€¼á€„္း RSS feed မ်ားá‚ွင့္ အီးေမးလ္ သá€á€á€±á€•á€¸á€á€ºá€€á€¹á€™á€ºá€¬á€¸" @@ -1446,11 +1395,11 @@ msgstr "ျပည္á€á€¼á€„္း RSS feed မ်ားá‚ွင့္ အီá msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "‘%s’ အá€á€¼á€€á€¹ ျပည္á€á€¼á€„္း RSS feed မ်ားá‚ွင့္ အီးေမးလ္ သá€á€á€±á€•á€¸á€á€ºá€€á€¹á€™á€ºá€¬á€¸" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "ေဒသá€á€¼á€„္းအသá€á€±á€•á€¸á€á€ºá€€á€¹" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "ဧရá€á€šá€¬áေျမပံုá€á€…္á€á€¯á€á€¼á€„္ျပႆနာကá€á€¯á€±á€”ရာသá€á€¹á€™á€½á€á€¹á€™á€Šá€¹" @@ -1510,14 +1459,14 @@ msgstr "လ" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "အမည္" @@ -1541,8 +1490,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1564,7 +1513,7 @@ msgstr "အသစ္<br>ျပႆနာမ်ား" msgid "New body added" msgstr "စာကá€á€¯á€šá€¹á€¡á€žá€…္ထည့္ျပီးျပီ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "ေá€á€«á€„္းစဥ္အသစ္အဆက္အသြယ္ထည့္ျပီးျပီ" @@ -1629,7 +1578,7 @@ msgstr "ေနာက္သá€á€¯á‚”" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "မရွá€á€•á€«" @@ -1694,8 +1643,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "á€á€¬á€á€”္ယူမႈမရွá€á€»á€á€„္း" @@ -1728,7 +1677,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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1742,15 +1691,15 @@ msgstr "မွá€á€¹á€…ု <strong> %s </strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "ယá€á€¯á€žá€„္áအစီရင္á€á€¶á€…ာကá€á€¯á€žá€¼á€„္းá‚á€á€¯á€„္ပါျပီ …" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1784,8 +1733,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1820,13 +1769,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1851,7 +1800,7 @@ msgstr "ပင္မ" msgid "Partial" msgstr "á€á€…္á€á€€á€¹" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1860,7 +1809,7 @@ msgid "Password (optional)" msgstr "စကားá€á€½á€€á€¹(ထည့္á€á€ºá€„္မွထည့္ပါ)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "စကားá€á€½á€€á€¹-" @@ -1868,7 +1817,7 @@ msgstr "စကားá€á€½á€€á€¹-" msgid "Permalink" msgstr "အျမဲá€á€™á€¹á€¸á€œá€„့္á€á€¹" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "ဖုန္းနံပါá€á€¹" @@ -1884,13 +1833,21 @@ msgid "Phone:" msgstr "ဖုန္း-" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "ဓာá€á€¹á€•á€¶á€¯" @@ -1914,8 +1871,8 @@ msgstr "ေျမပံုá€á€¼á€„္ပင္á€á€…္á€á€¯á€‘ားမည္ #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1931,16 +1888,16 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "စကားá€á€½á€€á€¹á€€á€á€¯á€»á€•á€”္စစ္ေဆးျပီးျပန္á¾á€€á€á€³á€¸á€…ားပါ" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "သင္áအီးေမးလ္လá€á€•á€¹á€…ာမွန္áŠá€™á€™á€½á€”္ကá€á€¯á€…စ္ေဆးပါ" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1950,7 +1907,7 @@ msgstr "ေá€á€«á€„္းစဥ္á€á€…္á€á€¯á€€á€á€¯á€±á€›á€¼á€¸á€•á€«" msgid "Please choose a property type" msgstr "ပစá¥á€Šá€¹á€¸á€¡á€™á€ºá€á€³á€¸á€¡á€…ားá€á€…္á€á€¯á€€á€á€¯á€±á€›á€¼á€¸á€•á€«" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1971,11 +1928,10 @@ msgstr "" msgid "Please enter a message" msgstr "စာá€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "သင္áအမည္ကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1989,10 +1945,10 @@ msgstr "စကားá€á€½á€€á€¹á€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ msgid "Please enter a subject" msgstr "ေá€á€«á€„္းစီးá€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2009,9 +1965,9 @@ msgid "Please enter some details" msgstr "á€á€…္á€á€ºá€á€³á‚•á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2020,7 +1976,7 @@ msgid "Please enter your email" msgstr "သင္áအီးေမးလ္ကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "သင္áအီးေမးလ္လá€á€•á€¹á€…ာကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" @@ -2036,7 +1992,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "သင္áအမည္ကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" @@ -2063,7 +2019,7 @@ msgstr "ျပန္လည္ á€á€„္ေရာက္ပါ သá€á€¯á‚”မဟá msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2072,7 +2028,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2098,16 +2054,16 @@ msgstr "" msgid "Please note:" msgstr "ေက်းဇူးျပဳျပီးမွá€á€¹á€žá€¬á€¸á€•á€«-" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "သင္ဘာလá€á€¯á‚”ဒီသá€á€„္းပá€á€¯á‚”á€á€ºá€€á€¹á€€á€á€¯á€»á€•á€”္ဖြင့္ရသလဲဆá€á€¯á€žá€Šá€¹á€·á€›á€½á€„္းလင္းá€á€ºá€€á€¹á€€á€á€¯á€±á€»á€•á€¬á€»á€•á€±á€•á€¸á€•á€«" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "စာအနည္းငယ္á‚ွင့္ဓာá€á€¹á€•á€¶á€¯á€á€…္ပံုကá€á€¯á€œá€Šá€¹á€¸á€±á€–ာ္ျပေပးပါ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "သင္áေကာင္စီသá€á€¯á‚”သင္ယá€á€„္ကသá€á€„္းပá€á€¯á‚”ဖူးေá¾á€€á€¬á€„္းေျပာျပေပးပါ" @@ -2123,22 +2079,23 @@ msgstr "သင္လá€á€¯á€á€ºá€„္ေသာ feed ကá€á€¯á€±á€›á€¼á€¸á€•á€« msgid "Please select the type of alert you want" msgstr "သင္လá€á€¯á€á€ºá€„္ေသာ အသá€á€±á€•á€¸á€á€ºá€€á€¹á€¡á€™á€ºá€á€³á€¸á€¡á€…ားမ်ားကá€á€¯á€±á€›á€¼á€¸á€•á€«" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "ျပႆနာေျဖရွင္းျပီးျပီáŠá€™á€›á€½á€„္းျပီးျပီကá€á€¯á€±á€–ာ္ျပပါ" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "JPEG ပံုá€á€…္ပံုသာá€á€„္ရန္" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "စာá€á€…္ေá¾á€€á€¬á€„္းေရးပါ" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "သင္áအသစ္မြမ္းမံမႈကá€á€¯á€’ီေနရာမွာေရးပါ" @@ -2169,7 +2126,7 @@ msgstr "" msgid "Previous" msgstr "ယá€á€„္က" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2179,7 +2136,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2208,7 +2165,7 @@ msgstr "ေကာင္စီ %s သá€á€¯á‚” ျပႆနာ %s ကá€á€¯á€•á€ msgid "Problem breakdown by state" msgstr "ျပည္နယ္မွ ျပႆနာကá€á€¯á€‘ပ္မံá€á€¼á€²á€…á€á€á€¹á€œá€á€¯á€€á€¹á€žá€Šá€¹" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "ျပႆနာကá€á€¯ ဖြင့္ထားသည္" @@ -2220,10 +2177,6 @@ msgstr "စစ္ေဆးမႈရလဒ္မ်ားအေပášá€á€¼á€„္ msgid "Problems" msgstr "ျပႆနာမ်ား" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "ဒီဧရá€á€šá€¬á€¡á€á€¼á€„္းရွá€á€»á€•á‚†á€”ာမ်ား" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "အနီးနားရွá€á€»á€•á‚†á€”ာမ်ား" @@ -2241,13 +2194,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2266,15 +2217,11 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 မ်ား ျပဳလုပ္ျá€á€„္းá‚ွင့္ အစီရင္á€á€¶á€…ာမ်ား စီမံá€á€”္႔á€á€¼á€²á€»á€á€„္းá€á€á€¯á‚”ကá€á€¯ ပá€á€¯á€™á€á€¯á€œá€¼á€šá€¹á€€á€°á€…ြာ ျပဳလုပ္á‚á€á€¯á€„္မည္á‹" @@ -2308,16 +2255,15 @@ msgstr "%d, %s ျပႆနာ အá€á€¼á€€á€¹ %d မွ %s ထံ ေျဖá¾á msgid "Questionnaire %d sent for problem %d" msgstr "%d ျပႆနာ အá€á€¼á€€á€¹ %d ေပးပá€á€¯á‚”သည့္ စစ္á€á€™á€¹á€¸á€±á€™á€¸á€á€¼á€”္းလႊာ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "ျပႆနာ အစီရင္á€á€¶á€žá€° ျဖည့္စြက္ရမည့္ စစ္á€á€™á€¹á€¸á€±á€™á€¸á€á€¼á€”္းလႊာ" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS feed" @@ -2345,18 +2291,12 @@ msgstr "%s အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” အá€á€¼á€„္းရဠmsgid "RSS feed of nearby problems" msgstr "အနီးအနားရá€á€½ ျပႆနာမ်ားá RSS feed" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "ဒီ %s ရá€á€½ ျပႆနာမ်ားá RSS feed" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "%s အá€á€¼á€„္းရá€á€½ ျပႆနာမ်ားá RSS feed" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "%s အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” အá€á€¼á€„္းရá€á€½ ျပႆနာမ်ားá RSS feed" @@ -2366,14 +2306,13 @@ msgstr "%s အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” အá€á€¼á€„္းရဠmsgid "RSS feed of recent local problems" msgstr "လá€á€¹á€á€±á€œá€¬ ျပည္á€á€¼á€„္း ျပႆနာမ်ား အá€á€¼á€€á€¹ RSS feed" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "လက္ရá€á€½ ျပႆနာကá€á€¯ update ျပဳလုပ္ထားသည့္ RSS feed" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2409,12 +2348,11 @@ msgstr "ဓာá€á€¹á€•á€¶á€¯ ဖယ္ရွားရန္ (မá¿á€•á€®á€¸á€± msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2424,7 +2362,7 @@ msgstr "ျပႆနာကá€á€¯ အစီရင္á€á€¶ á€á€„္ျပရနá msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2439,7 +2377,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "ေဒသá€á€¼á€„္း ျပႆနာမ်ားကá€á€¯ အစီရင္á€á€¶á€»á€á€„္းአá¾á€€á€Šá€¹á€·á‚ႈျá€á€„္းá‚ွင့္ ေဆြးေá‚ြးျá€á€„္း" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2449,7 +2387,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2463,27 +2401,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2504,7 +2442,7 @@ msgstr "" msgid "Reporting a problem" msgstr "ျပႆနာကá€á€¯ အစီရင္á€á€¶ á€á€„္ျပျá€á€„္း" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2547,15 +2485,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "ဘယ္ဘက္ကá€á€¯ လွည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2570,7 +2508,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2626,7 +2564,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2645,21 +2583,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2727,14 +2665,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2743,7 +2677,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2756,7 +2690,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2796,10 +2730,10 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "" @@ -2827,9 +2761,8 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2837,7 +2770,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2856,7 +2789,7 @@ msgstr "အက်ဥ္းá€á€ºá€³á€•á€¹" msgid "Summary reports" msgstr "အစီရင္á€á€¶á€…ာအက်ဥ္းá€á€ºá€³á€•á€¹" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "စစ္á€á€™á€¹á€¸" @@ -2913,7 +2846,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "ေက်းဇူးá€á€„္ပါသည္ዠျပင္ဆင္á¿á€•á€®á€¸ ျဖစ္ေá¾á€€á€¬á€„္း á¾á€€á€¬á€¸á€žá€á€›á á€á€™á€¹á€¸á€žá€¬á€™á€á€•á€«á€žá€Šá€¹á‹ သင့္အေနျဖင့္ ယá€á€„္က ေကာင္စီထံ ျပႆနာá€á€…္á€á€¯á€€á€á€¯ အစီရင္á€á€¶á€á€„္ျပဖူးပါသလား?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2921,7 +2854,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2931,11 +2864,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "ထá€á€¯á€»á€•á‚†á€”ာကá€á€¯á€šá€á€¯á€•á€„္ျပန္ပá€á€¯á‚”ပါမည္" @@ -2947,7 +2880,7 @@ msgstr "ဒီအစီရင္á€á€¶á€…ာကá€á€¯ %s ေပášá€á€¼á€„္ဠmsgid "That report has been removed from FixMyStreet." msgstr "ကá½á€¼á‚္ုပ္လမ္းကá€á€¯á€»á€•á€„္ေပးပါ မွဒီအစီရင္á€á€¶á€…ာကá€á€¯á€–ယ္ျပီးပါျပီ" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3087,9 +3020,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "အီးေမးလ္á‚ွင့္ လ်ွá€á€³á‚•á€á€½á€€á€¹á€”ံပါá€á€¹á€á€¼á€„္ ျပႆနာ ျဖစ္ေပášá€á€²á€·á€•á€«á€žá€Šá€¹á‹ သင္á လွ်á€á€³á‚•á€á€½á€€á€¹á€”ံပါá€á€¹á€€á€á€¯ မမွá€á€¹á€™á€á€•á€«á€€ သá€á€¯á‚”မဟုá€á€¹ မရá€á€½á€±á€žá€¸á€•á€«á€€ ေလွ်က္လႊာá \"အီးေမးလ္ျဖင့္ á€á€„္ရန္\" ေနရာá€á€¼á€„္ ျဖည့္ပါá‹" @@ -3150,9 +3083,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "ဒီအá€á€ºá€€á€¹á€¡á€œá€€á€¹ ျဖည့္စြက္ရန္ လá€á€¯á€¡á€•á€¹á€žá€Šá€¹" @@ -3165,11 +3098,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "ဒီျပႆနာကá€á€¯á€±á€»á€–ရွင္းျပီးပါျပီ" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "ဒီျပႆနာကá€á€¯á€™á€±á€»á€–ရွင္းရေသးပါ" @@ -3206,7 +3139,7 @@ msgstr "ဒီ web စာမ်က္á‚ွာသည္ အသံုးျပဳ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3251,8 +3184,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3269,7 +3202,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3284,7 +3217,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3336,10 +3269,10 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3366,7 +3299,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "စီမံသူá€á€¼á€„္သာ ေဖာ္ျပေပးသည့္ အေသးစá€á€á€¹á€€á€á€¯ မွá€á€¹á€á€™á€¹á€¸á€á€„္ရန္ မွá€á€¹á€…ုကá€á€¯ အသုံးျပဳပါዠမွá€á€¹á€…ုမ်ားကá€á€¯ လူအမ်ားမေá€á€¼á‚”ျမင္ရ သလá€á€¯ အဖြဲ႔ထံသá€á€¯á‚”လည္း မေပးပá€á€¯á‚”á‚á€á€¯á€„္ပါá‹" @@ -3375,11 +3308,11 @@ msgstr "စီမံသူá€á€¼á€„္သာ ေဖာ္ျပေပးသညဠmsgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "သုံးစြဲသူ အမွá€á€¹á€¡á€žá€¬á€¸ ျပဳလုပ္ျá€á€„္းကá€á€¯ ဖယ္ရွားလá€á€¯á€€á€¹á€žá€Šá€¹á‹" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "သုုံးစြဲသူက အမွá€á€¹á€¡á€žá€¬á€¸ ျပဳလုပ္ျá€á€„္း" @@ -3387,16 +3320,16 @@ msgstr "သုုံးစြဲသူက အမွá€á€¹á€¡á€žá€¬á€¸ ျပဳá msgid "User search finds matches in users' names and email addresses." msgstr "သုံးစြဲသူရွာေဖြမႈသည္ áŽá€á€á€¯á‚”á အီးေမးလá€á€•á€¹á€…ာá‚ွင့္ နာမည္မ်ားရွဠá€á€°á€Šá€®á€™á‚ˆá€™á€ºá€¬á€¸á€€á€á€¯ ေá€á€¼á‚”ရွá€á‚á€á€¯á€„္သည္ዠ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "အသံုးျပဳသူမ်ား" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3433,16 +3366,15 @@ msgstr "ယá€á€¯á€á€Šá€¹á€±á€”ရာ အá€á€¼á€€á€¹ á€á€…္á€á€¯á€‘က္á #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ဖုန္းနံပါá€á€¹ သá€á€¯á‚”မဟုá€á€¹ အီးေမးလá€á€•á€¹á€…ာကá€á€¯ ျပသသြားမည္ မဟုá€á€¹á€•á€«" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "သင့္အီးေမးလá€á€•á€¹á€…ာကá€á€¯ ျပသ သြားမည္မဟုá€á€¹á€•á€«á‹" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ဖုန္းနံပါá€á€¹ သá€á€¯á‚”မဟုá€á€¹ အီးေမးလá€á€•á€¹á€…ာကá€á€¯ ျပသသြားမည္ မဟုá€á€¹á€•á€«" @@ -3451,7 +3383,7 @@ msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ဖုန္းနံပဠ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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "သင္áကá€á€¯á€šá€¹á€…ား ေကာင္စီထံ ကá½á€¼á€”္ေá€á€¬á€¹á€á€á€¯á‚” ေပးပá€á€¯á‚”ပါမည္" @@ -3489,10 +3421,6 @@ msgstr "ေပးပá€á€¯á‚”á€á€²á€·á€žá€Šá€¹á€· အá€á€ºá€á€”္" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3514,7 +3442,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "သင့္အေနျဖင့္ ေလးပá€á€¹á€¡á€á€¼á€„္း အျá€á€¬á€¸á€±á€™á€¸á€á€¼á€”္းမ်ား ရရွá€á€œá€á€¯á¿á€•á€®á€¸ အေျá€á€¡á€±á€”ကá€á€¯ သá€á€á€›á€±á€…ရန္ သá€á€á€±á€•á€¸á€œá€á€¯á€•á€«á€žá€œá€¬á€¸á‹" @@ -3544,8 +3472,8 @@ msgstr "á€á€¯á‚ွစ္" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "ဟုá€á€¹á€žá€Šá€¹á‹" @@ -3664,19 +3592,19 @@ msgid "Your Reports" msgstr "သင္á အစီရင္á€á€¶á€…ာမ်ား" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "သင္á အီးေမးလ္" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3687,17 +3615,17 @@ msgstr "သင္á အီးေမးလ္လá€á€•á€¹á€…ာ" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "သင့္áအá€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ ကá½á€¼á‚ု္ပ္á€á€á€¯á‚”á သီးသန္႔á€á€Šá€¹á€›á€½á€á€™á‚ˆ ေပášá€œá€…ီ á‚ွင့္အညီ အသုံးျပဳသြားမည္ ျဖစ္သည္á‹" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "သင့္အမည္" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3710,20 +3638,19 @@ msgstr "သင္á စကားá€á€½á€€á€¹á€€á€á€¯ ေျပာင္းလá #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "သင္á ဖုန္းနံပါá€á€¹" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "သင္á အစီရင္á€á€¶á€…ာမ်ား" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "သင္á အစီရင္á€á€¶á€…ာမ်ား" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "သင္á မြမ္းမံျပင္ဆင္ထားမႈမ်ား" @@ -3749,7 +3676,7 @@ msgid "didn't use map" msgstr "ေျမပံု မသံုးá€á€²á€·á€•á€«" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "ဥပမာ ‘%s’ သá€á€¯á‚”မဟုá€á€¹ ‘%s’" @@ -3855,8 +3782,7 @@ msgstr "အျá€á€¬á€¸ ဧရá€á€šá€¬á€™á€ºá€¬á€¸" msgid "reopened" msgstr "ျပန္ဖြင့္ပါ" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "ထြက္ရန္" @@ -3929,7 +3855,7 @@ 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 +#: templates/web/base/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." @@ -3965,71 +3891,41 @@ 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] "ကá½á€¼á‚ု္ပ္á€á€á€¯á‚”á€á€¼á€„္ ဒီá€á€Šá€¹á€±á€”ရာá‚ွင့္ ပá€á€¹á€žá€€á€¹á€žá€Šá€¹á€· အျá€á€¬á€¸á€±á€€á€¬á€„္အá€á€¼á€€á€¹ အေသးစá€á€á€¹á€™á€›á€½á€á€±á€žá€¸á€•á€«á‹" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(သင္áအီးေမလ္လá€á€•á€¹á€…ာ သá€á€¯á‚”မဟုá€á€¹ ဖုန္းနံပါá€á€¹á€€á€á€¯á€€á½á€¼á‚္ုပ္á€á€á€¯á‚”မွ ဘယ္ေá€á€¬á€·á€™á€½á€™á€±á€–ာ္ျပပါ)" - -#~ msgid "(we never show your email)" -#~ msgstr "(သင္áအီးေမးလ္ကá€á€¯á€€á½á€¼á‚္ုပ္á€á€á€¯á‚”မွဘယ္ေá€á€¬á€·á€™á€½á€™á€±á€–ာ္ျပပါ)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>မဟုá€á€¹á€•á€«</strong>ကá½á€¼á‚္ုပ္áအစီရင္á€á€¶á€…ာကá€á€¯á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹ -" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>မဟုá€á€¹á€•á€«</strong>ကá½á€¼á‚္ုပ္áအသစ္မြမ္းမံျá€á€„္းကá€á€¯á€¡á€®á€¸á€±á€™á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹ -" - -#~ msgid "Email me updates" -#~ msgstr "အသစ္မြမ္းမံမႈမ်ားကá€á€¯á€€á½á€¼á‚္ုပ္ထံသá€á€¯á‚•á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€•á€á€¯á‚”မည္" - -#~ msgid "Enter a new password:" -#~ msgstr "စကားá€á€½á€€á€¹á€¡á€žá€…္á€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ-" - -#~ msgid "Message:" -#~ msgstr "စာ-" - -#~ msgid "More problems nearby" -#~ msgstr "အနီးနားရွá€á€»á€•á‚†á€”ာမ်ားစြာ" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "လုပ္ေဆာင္မႈနီးပါးျပီးပါျပီአသင္áအီးေမးလ္ကá€á€¯á€…စ္ေဆးပါ" - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "ထá€á€á€á€¯á€€á€¹á€±á€…á‚á€á€¯á€„္ေသာáŠá€™á€žá€„့္ေá€á€¬á€¹á€˜á€°á€¸á€œá€¬á€¸áŠ ကá½á€¼á‚္ုပ္á€á€á€¯á‚”ကá€á€¯á€±á€»á€•á€¬á€•á€«" - -#~ msgid "Photo:" -#~ msgstr "ဓာá€á€¹á€•á€¶á€¯-" +#~ msgid "%s, reported at %s" +#~ msgstr "%s သá€á€„္းပá€á€¯á‚”သည္မွာ %s" -#~ msgid "Please check your email" -#~ msgstr "သင္áအီးေမးလ္ကá€á€¯á€…စ္ပါ" +#~ msgid "About us" +#~ msgstr "ကá½á€¼á‚္ုပ္á€á€á€¯á‚”အေá¾á€€á€¬á€„္း" -#~ msgid "This problem has been closed" -#~ msgstr "ဒီျပႆနာကá€á€¯á€•á€á€á€¹á€‘ားျပီးျဖစ္သည္á‹" +#~ msgid "Email me new local problems" +#~ msgstr "ေဒသအá€á€¼á€„္းျပႆနာအသစ္မ်ားကá€á€¯á€€á½á€¼á‚္ုပ္ထံသá€á€¯á‚”အီးေမးလ္ပá€á€¯á‚”မည္" -#~ msgid "This problem is in progress" -#~ msgstr "ဒီျပႆနာကá€á€¯á€±á€»á€–ရွင္းေနဆဲျဖစ္သည္" +#~ msgid "Empty flat or maisonette" +#~ msgstr "á€á€á€¯á€€á€¹á€á€”္းအလြá€á€¹á€žá€á€¯á‚”မဟုá€á€¹ maisonette" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "ဒီျပႆနာသည္အရမ္းá¾á€€á€¬á€»á€•á€®á€»á€–စ္ျပီး အေျá€á€¡á€±á€”ကá€á€¯á€™á€žá€á€›á€•á€«" +#~ msgid "Empty house or bungalow" +#~ msgstr "အá€á€™á€¹á€¡á€œá€¼á€á€¹á€žá€á€¯á‚”မဟုá€á€¹á€˜á€”္ဂလá€á€¯á€¡á€œá€¼á€á€¹" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "သင့္ account ကá€á€¯á€¡á€á€Šá€¹ မျပဳá‚á€á€¯á€„္ေသးပါ- á€á€™á€¹á€¸á€”ည္းပါá€á€šá€¹á‹" +#~ msgid "Empty office or other commercial" +#~ msgstr "ရံုးအလြá€á€¹á€žá€á€¯á‚”မဟုá€á€¹á€á€»á€á€¬á€¸á€…ီးပြားေရးအလြá€á€¹" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ account ကá€á€¯á€¡á€á€Šá€¹á€»á€•á€³á€±á€•á€¸á€™á€Šá€¹á€· လင့္á€á€¹á€•á€«á€á€„္ေသာ အီးေမးကá€á€¯ ေပးပá€á€¯á‚”ထားပါသည္á‹" +#~ msgid "Empty pub or bar" +#~ msgstr "အလြá€á€¹á€¡á€›á€€á€¹á€†á€á€¯á€„္သá€á€¯á‚”မဟုá€á€¹á€˜á€¬á€¸" -#~ 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>: သá€á€¯á‚” အီးေမး ေပးပá€á€¯á‚”á‚á€á€¯á€„္ပါသည္á‹" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "အမ်ားျပည္သူá‚ွင့္ဆá€á€¯á€„္ေသာá€á€á€¯á€€á€¹á€¡á€œá€¼á€á€¹-ေက်ာင္းáŠá€±á€†á€¸á€›á€¶á€¯á€…သည္ျဖင့္.." -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "ဒီအစီရင္á€á€¶á€…ာá€á€¼á€„္ ဓာá€á€¹á€•á€¯á€¶á€á€¼á€²á€á€„္ထားá¿á€•á€® ျဖစ္á¿á€•á€®á€¸ အျá€á€¬á€¸á€á€…္á€á€¯ á€á€¼á€²á€á€„္ျá€á€„္းသည္ အရင္ေနရာá€á€¼á€„္ အစားထá€á€¯á€¸á€žá€¼á€¬á€¸á€•á€«á€™á€Šá€¹á‹" +#~ msgid "FixMyStreet" +#~ msgstr "ကá½á€¼á‚ု္ပ္လမ္းကá€á€¯á€»á€•á€„္ေပးပါ" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "ယá€á€¯ ျပင္ဆင္မြမ္းမံမႈကá€á€¯ ဓာá€á€¹á€•á€¯á€¶á€»á€–င့္ á€á€¼á€²á€á€„္ထားá¿á€•á€®á€¸ ျဖစ္á¿á€•á€®á€¸ အျá€á€¬á€¸á€á€…္á€á€¯á€á€¼á€²á€á€„္လွ်င္ အရင္ေနရာá€á€¼á€„္ အစားထá€á€¯á€¸á€±á€•á€¸á€žá€¼á€¬á€¸á€™á€Šá€¹ ျဖစ္သည္á‹" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "အá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸á€±á€žá€¬á€¡á€…ီရင္á€á€¶á€…ာကá€á€¯á€žá€„္အá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸á€•á€«" -#~ msgid "Your email:" -#~ msgstr "သင္á အီးေမးလ္" +#~ msgid "Problems in this area" +#~ msgstr "ဒီဧရá€á€šá€¬á€¡á€á€¼á€„္းရွá€á€»á€•á‚†á€”ာမ်ား" -#~ msgid "Your name:" -#~ msgstr "သင့္အမည္" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "ဒီ %s ရá€á€½ ျပႆနာမ်ားá RSS feed" -#~ msgid "Your email:" -#~ msgstr "သင္á အီးေမးလ္" +#~ msgid "Whole block of empty flats" +#~ msgstr "á€á€á€¯á€€á€¹á€á€”္းလြá€á€¹á€™á€ºá€¬á€¸ ရွá€á€›á€¬ ဘေလာက္" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index d9daeb663..31fd59846 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,15 +9,14 @@ # Ole-Erik Yrvin <oeyrvin@gmail.com>, 2015 # Ørjan Vøllestad <orjanv@gmail.com>, 2014 # 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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2016-01-06 11:44+0000\n" -"Last-Translator: Jan Høydahl <jh@cominvent.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/mysociety/fixmystreet/language/nb_NO/)\n" "Language: nb_NO\n" "MIME-Version: 1.0\n" @@ -25,7 +24,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " og " @@ -58,9 +57,8 @@ msgid "%s admin:" msgstr "%s administrator:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Administrasjoner" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -99,7 +97,7 @@ msgstr "%s aktive oppdateringer" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s spørreskjema sendt – %s besvart (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -118,10 +116,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, rapportert %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" @@ -176,7 +170,7 @@ msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(valgfritt)" @@ -188,12 +182,11 @@ msgstr "(offentlig)" msgid "(sent to both)" msgstr "(sendt til begge)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" @@ -225,26 +218,21 @@ 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/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, la meg logge inn med e-post:" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jeg har et passord" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Om oss" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Handling planlagt" @@ -275,7 +263,7 @@ msgstr "Legg til ny kategori" msgid "Add user" msgstr "Legg til bruker" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "La til %s" @@ -295,7 +283,7 @@ msgstr "Varsel %d opprettet for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d koblet ut (opprettet %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Send meg varsel ved fremtidige oppdateringer" @@ -308,7 +296,7 @@ msgstr "Alle rapporter" msgid "All Reports as CSV" msgstr "Alle rapporter som CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -407,7 +395,7 @@ msgstr "Tilbake" msgid "Ban email address" msgstr "Bannlys epostadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -438,7 +426,7 @@ msgstr "Hvis du ikke kan se kartet, <em>hopp over dette steget</em>." #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -453,7 +441,7 @@ 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:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -473,7 +461,7 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Bytt passord" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -481,7 +469,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:171 +#: templates/web/base/admin/body.html:169 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." @@ -489,7 +477,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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -505,7 +493,7 @@ msgstr "" "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:130 +#: templates/web/base/admin/body.html:129 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,8 +534,8 @@ msgstr "Klikk lenken i bekreftelses-eposten for Ã¥ logge inn." #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -556,7 +544,7 @@ msgstr "Klikk lenken i bekreftelses-eposten for Ã¥ logge inn." msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" @@ -582,7 +570,7 @@ msgstr "Merkevaresamarbeidsdata:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Oppsett" @@ -601,9 +589,8 @@ msgstr "Bekreft konto" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Bekreft via epost under, og oppgi et nytt passord der. NÃ¥r du har bekreftet vil passordet ditt bli oppdatert." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -613,7 +600,7 @@ 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:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -632,7 +619,7 @@ msgid "Confirmed:" msgstr "Bekreftet:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "Kontakt %s" @@ -651,8 +638,8 @@ msgstr "Kontakt prosjektgruppen" msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -670,7 +657,7 @@ msgstr "Administrasjon" msgid "Council contacts for %s" msgstr "Administrasjonskontakter for %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "administrasjonsreferanse: %s" @@ -689,7 +676,7 @@ msgstr "Antall" msgid "Create a report" msgstr "Lag en rapport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Lag kategori" @@ -733,20 +720,20 @@ msgstr "Oversikt" msgid "Dealt with by subdivision within 5 working days" msgstr "Behandlet av underavdeling innen 5 arbeidsdager" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Slett mal" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Slettet" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: 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 +741,7 @@ msgid "Description" msgstr "Beskrivelse" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detaljer" @@ -779,11 +766,11 @@ msgid "Diligency prize league table" msgstr "Arbeidshester" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "Har du et FiksGataMi-passord?" @@ -801,8 +788,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplikat" @@ -825,7 +812,7 @@ msgstr "" msgid "Edit" msgstr "Rediger" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Rediger detaljer for administrasjon" @@ -855,7 +842,7 @@ msgstr "Oppdatert av" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -863,11 +850,11 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-postadresse:" @@ -879,19 +866,14 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Send meg e-post om lokale problemer" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "E-post:" @@ -900,26 +882,6 @@ msgstr "E-post:" msgid "Email: %s" msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Tom leilighet" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Tomt hus eller bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Tomt kontor eller forretningsbygg" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Tom pub eller bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Tom offentlig bygning - skole, sykehus, etc." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -969,18 +931,14 @@ msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" 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 "Velg et nærliggende gatenavn og omrÃ¥de, postnummer eller distrikt i Delhi" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Skriv inn et nytt passord" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" @@ -1006,7 +964,7 @@ msgstr "Eksempel-postnummer %s" msgid "Examples:" msgstr "Eksempler:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 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..." @@ -1043,19 +1001,15 @@ msgstr "Første gang" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Fiks dette ved Ã¥ velge en <strong>area covered</strong> i <em> Edit body details</em>-skjemaet nedenfor." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FiksGataMi" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Løst" @@ -1082,7 +1036,7 @@ msgstr "Merk som slettet" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flagget:" @@ -1104,8 +1058,7 @@ msgstr "Flaggede brukere er ikke begrenset pÃ¥ noe mÃ¥te. Dette er bare en list msgid "Flagged:" msgstr "Flagget:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Følg en bydelslenke for Ã¥ kun se rapporter innenfor den bydelen." @@ -1136,18 +1089,18 @@ msgstr "Ofte spurte spørsmÃ¥l" msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "FÃ¥ oppdateringer" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "FÃ¥ oppdateringer for problemer i denne %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "FÃ¥ oppdateringer for problemer i denne %s" @@ -1160,7 +1113,7 @@ 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:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1186,7 +1139,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1197,8 +1150,7 @@ 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/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hei, %s" @@ -1214,11 +1166,11 @@ msgstr "Hei, %s" msgid "Hidden" msgstr "Skjul" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Skjul gamle" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Skjul nÃ¥ler" @@ -1238,10 +1190,6 @@ 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:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Jeg er redd du ikke kan bekrefte ubekreftede 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" @@ -1252,7 +1200,7 @@ msgstr "Jeg rapporterte akkurat et problem pÃ¥ @fiksgatami" msgid "I just updated a problem on @fixmystreet" msgstr "Jeg oppdaterte akkurat et problem pÃ¥ @fiksgatami" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1274,7 +1222,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "Identifiser en <strong>parent</strong> hvis instansen selv er en del av en annen administrasjon." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1295,7 +1243,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "Hvis du ønsker Ã¥ legge til en offentlig kommentar pÃ¥ problemet, legg den til her (denne blir ikke sendt til administrasjonen)." -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 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." @@ -1337,10 +1285,10 @@ msgstr "Ugyldig ID" msgid "Illegal feed selection" msgstr "Ugyldig valg av feed" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Under arbeid" @@ -1391,7 +1339,7 @@ msgstr "Interne referanser" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1399,16 +1347,16 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Undersøkes" @@ -1430,7 +1378,7 @@ msgstr "Ukjent omrÃ¥de" msgid "Jurisdiction unknown" msgstr "Ukjent omrÃ¥de" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1468,7 +1416,6 @@ msgstr "Laster..." #: 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 "Lokal RSS-strøm og e-postvarsel" @@ -1477,11 +1424,11 @@ msgstr "Lokal RSS-strøm og e-postvarsel" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokale varsler" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet pÃ¥ kartet over omrÃ¥det" @@ -1541,14 +1488,14 @@ msgstr "MÃ¥ned" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Navn" @@ -1572,8 +1519,8 @@ msgstr "Nærmeste navngitte vei til nÃ¥len plassert pÃ¥ kartet (automatisk gener msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Nærmeste postnummer til nÃ¥len plassert pÃ¥ kartet (automatisk generert): %s (%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1597,7 +1544,7 @@ msgstr "Nye <br>problemer" msgid "New body added" msgstr "Ny administrasjon lagt til" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1662,7 +1609,7 @@ msgstr "Neste" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nei" @@ -1734,8 +1681,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Ikke ansvarlig" @@ -1768,7 +1715,7 @@ 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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1782,15 +1729,15 @@ msgstr "Note: <strong>%d</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "PÃ¥ tide Ã¥ sende din rapport…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "PÃ¥ tide Ã¥ registrere din oppdatering…" @@ -1824,8 +1771,8 @@ msgstr "Enlinjers oppsummering" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1860,13 +1807,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1891,7 +1838,7 @@ msgstr "Forelder" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1900,7 +1847,7 @@ msgid "Password (optional)" msgstr "Passord (valgfritt)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Passord:" @@ -1908,7 +1855,7 @@ msgstr "Passord:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnummer" @@ -1924,13 +1871,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Bilde" @@ -1954,8 +1909,8 @@ msgstr "Plasser tegnestiften pÃ¥ kartet" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1971,16 +1926,16 @@ msgstr "Vær høflig, poengtert og kortfattet." msgid "Please check the passwords and try again" msgstr "Vennligst sjekk passordene og prøv igjen" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1990,7 +1945,7 @@ msgstr "Velg en kategori" msgid "Please choose a property type" msgstr "Velg en type egenskap" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Husk Ã¥ rette opp feilene nedenfor." @@ -2014,11 +1969,10 @@ msgstr "Ikke vær ufin — Ã¥ kjefte pÃ¥ din administrasjon skader verdien a msgid "Please enter a message" msgstr "Vennligst legg til en melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Legg inn ditt navn" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2032,10 +1986,10 @@ msgstr "Skriv inn et passord" msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2052,9 +2006,9 @@ msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2063,7 +2017,7 @@ msgid "Please enter your email" msgstr "Legg inn din e-post" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Vennligst tast inn din e-postadresse" @@ -2079,7 +2033,7 @@ msgstr "Vennligst legg inn ditt fulle navn, administrasjoner som mottar ditt pro #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Legg inn ditt navn" @@ -2106,7 +2060,7 @@ msgstr "Du kan ogsÃ¥ <a href=\"%s\">logge inn igjen</a> eller gÃ¥ tilbake til <a msgid "Please fill in details of the problem below." msgstr "Vennligst fyll ut detaljer om problemet under" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Vennligst fyll ut detaljer om problemet." @@ -2117,7 +2071,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker Ã¥ motta et nytt spørreskjema" @@ -2126,9 +2080,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Vær oppmerksom pÃ¥ at oppdateringer ikke blir videresendt til administrasjonen." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Merk at din rapport <strong>ennÃ¥ ikke er sendt</strong. Velg en kategori og legg til mer informasjon under før du sender inn." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2144,16 +2097,16 @@ msgstr "" msgid "Please note:" msgstr "Vennligst merk deg:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Vennligst bidra med en forklaring for hvorfor du gjenÃ¥pner denne problemrapporten" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Vennligst bidra med litt tekst i tillegg til et bilde" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Vennligst opplys om du har rapportert et problem til din administrasjon tidligere" @@ -2169,22 +2122,23 @@ msgstr "Velg den kilden du ønsker" msgid "Please select the type of alert you want" msgstr "Vennligst velg hvilken type varsel du ønsker" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Vennligst last opp kun JPEG-bilder" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Skriv inn en melding" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Vennligst skriv inn din oppdatering her" @@ -2215,7 +2169,7 @@ msgstr "Drevet av <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">Fi msgid "Previous" msgstr "Forrige" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Personvern" @@ -2225,7 +2179,7 @@ msgstr "Personvern" msgid "Privacy and cookies" msgstr "Personvern og cookies" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2254,7 +2208,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem markert som Ã¥pent." @@ -2266,10 +2220,6 @@ msgstr "Problemtilstandsendring basert pÃ¥ spørreundersøkelsesresultater" msgid "Problems" msgstr "Problemer" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemer i dette omrÃ¥det" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemer i nærheten" @@ -2287,13 +2237,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemer innenfor %.1fkm av denne posisjonen" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemer innenfor %s bydel" @@ -2312,15 +2260,11 @@ msgstr "Problemer innenfor grensene av:" msgid "Property address:" msgstr "Eiendomsadresse:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Type egenskap:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidra med en oppdatering" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2354,16 +2298,15 @@ 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:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-strøm" @@ -2391,18 +2334,12 @@ msgstr "RSS-strøm av %s, innenfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheten" -#: 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:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer innenfor %s bydel" @@ -2412,14 +2349,13 @@ msgstr "RSS-strøm for problemer innenfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med oppdateringer for dette problemet" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post nÃ¥r det er oppdateringer pÃ¥ dette problemet" @@ -2455,12 +2391,11 @@ msgstr "Fjern bilde (kan ikke gjøres om!)" msgid "Reply to user:" msgstr "Svar til bruker:" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Rapport" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2470,7 +2405,7 @@ msgstr "Rapporter et problem" msgid "Report abuse" msgstr "Rapporter misbruk" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Rapport pÃ¥ %s" @@ -2485,7 +2420,7 @@ msgstr "Rapporter problemet ditt" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -2495,7 +2430,7 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -2509,27 +2444,27 @@ msgstr "Rapportert av:" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2550,7 +2485,7 @@ msgstr "Rapportert:" msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2593,15 +2528,15 @@ msgstr "Veioperatør for denne navngitte veien (utledet fra veiens referansenumm msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Roter til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2616,7 +2551,7 @@ msgstr "Hvis du roterer dette bildet, mister du ikke lagrede endringer til rappo msgid "Satellite" msgstr "Satelitt" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2672,7 +2607,7 @@ msgstr "" msgid "Sent report back" msgstr "Rapport sendt tilbake" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -2691,21 +2626,21 @@ msgstr "Dele" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Vis gamle" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Vis nÃ¥ler" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2767,9 +2702,8 @@ msgstr "Beklager, vi kunne ikke finne det stedet." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv pÃ¥ nytt." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2777,15 +2711,10 @@ msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv pÃ¥ nytt. msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv pÃ¥ nytt." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Beklager, vi kunne ikke lagre bildet ditt. Forsøk igjen." -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Det var problemer med Ã¥ vise denne siden. Vennligst prøv igjen senere." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Start-dato:" @@ -2794,7 +2723,7 @@ msgstr "Start-dato:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Tilstand" @@ -2807,7 +2736,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2847,10 +2776,10 @@ msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Send inn" @@ -2878,9 +2807,8 @@ msgstr "Send inn spørreskjema" msgid "Submitted" msgstr "Sendt inn" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Abonner" @@ -2888,7 +2816,7 @@ msgstr "Abonner" msgid "Subscribe me to an email alert" msgstr "Jeg ønsker Ã¥ abonnere pÃ¥ e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2907,7 +2835,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Spørreundersøkelse" @@ -2964,7 +2892,7 @@ msgstr "Takk for at du lastet opp ditt bilde. Vi mÃ¥ nÃ¥ plassere ditt problem, msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Takk, glad for Ã¥ høre at problemet er fikset! Vi vil gjerne spørre deg om du har rapportert et problem til en administrasjon tidligere?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bildet ser ikke ut til Ã¥ ha blitt lastet opp riktig (%s), prøv pÃ¥ nytt." @@ -2972,7 +2900,7 @@ msgstr "Bildet ser ikke ut til Ã¥ ha blitt lastet opp riktig (%s), prøv pÃ¥ nyt msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Det stedet dekkes ikke av noen administrasjon, kanskje det er til havs eller utenfor landet - vennligst forsøk et annet sted." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2982,11 +2910,11 @@ msgstr "Det stedet virker ikke Ã¥ være i Storbritannia. Vennligst prøv igjen." msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Det problemer har blitt markert som sendt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Det problemet vil nÃ¥ bli sendt pÃ¥ nytt." @@ -2998,7 +2926,7 @@ msgstr "Den rapporten kan ikke ses pÃ¥ %s." msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3154,9 +3082,9 @@ msgstr "Det var problemer med Ã¥ vise 'Alle rapporter'-siden. Vennligst prøv i msgid "There was a problem showing this page. Please try again later." msgstr "Det var problemer med Ã¥ vise denne siden. Vennligst prøv igjen senere." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Det var problemer med din e-post/passord-kombinasjon. Hvis du har glemt ditt passord, eller hvis du ikke har et, vennligst fyll inn «Logg inn via e-post»-delen av skjemaet" @@ -3226,9 +3154,9 @@ msgstr "Denne e-posten har blitt sendt til begge administrasjonene som dekker st msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Denne e-posten har blitt sendt til flere administrasjoner som dekker stedet for problemet, da den valgte kategorien er tilgjengelig for disse. Vær sÃ¥ snill Ã¥ ignorere e-posten hvis dere ikke er korrekt administrasjon for Ã¥ hÃ¥ndtere denne saken." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Denne informasjonen er pÃ¥krevd" @@ -3241,11 +3169,11 @@ msgstr "Dette er et utviklernettsted. Ting kan knekke nÃ¥r som helst og database msgid "This is a summary of all reports on this site." msgstr "Dette er en opplisting av alle problemene i denne tjenesten." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dette problemet er løst" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dette problemet har ikke blitt løst" @@ -3282,7 +3210,7 @@ msgstr "Denne nettsiden inneholder ogsÃ¥ et bilde av problemet, sendt inn av bru msgid "Time spent (in minutes):" msgstr "Tid brukt (i minutter):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3327,8 +3255,8 @@ msgstr "Forsøk Ã¥ sende epost direkte til oss:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Kan ikke fikses" @@ -3345,7 +3273,7 @@ msgstr "Ubekreftet" msgid "Unknown" msgstr "Ukjent" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Ukjent varsel-type" @@ -3360,7 +3288,7 @@ msgstr "Ukjent feil" msgid "Unknown problem ID" msgstr "Ukjent problem-Id" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Oppdatering" @@ -3412,10 +3340,10 @@ msgstr "Oppdater tilstanden" msgid "Updated" msgstr "Oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3442,7 +3370,7 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, %s" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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>notater</strong> for Ã¥ notere detaljer som skal vises frem i admin-grensesnittet. Notater vises ikke offentlig og blir ikke sendt til myndigheten." @@ -3451,11 +3379,11 @@ msgstr "Bruk <strong>notater</strong> for Ã¥ notere detaljer som skal vises frem msgid "Used map" msgstr "Brukte kart" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Bruker flagget" @@ -3463,16 +3391,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:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brukere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Verdier oppdatert" @@ -3509,16 +3437,15 @@ msgstr "Vi fant mer en ett treff for den plassen. Vi viser opp til ti treff, sà #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Vi viser aldri din e-postadresse" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" @@ -3527,7 +3454,7 @@ msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Vi innser at %s kan være ansvarlig for dette problemet, men vi mangler for tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, sÃ¥ ta kontakt med oss." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon pÃ¥ dine vegne" @@ -3565,10 +3492,6 @@ msgstr "NÃ¥r sendt" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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." @@ -3588,7 +3511,7 @@ msgstr "NÃ¥r du søker etter forespørsler, sÃ¥ er det ogsÃ¥ mulig Ã¥ søke ette 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>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tenke deg Ã¥ motta en ny forespørsel om 4 uker, som minner deg om Ã¥ sjekke status?" @@ -3618,8 +3541,8 @@ msgstr "Ã…r" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3688,9 +3611,8 @@ msgstr "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maks #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maksimalt legge ved 3 til rapporten (hvis du laster opp flere blir det eldste slettet)." +msgstr "" #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3738,19 +3660,19 @@ msgid "Your Reports" msgstr "Dine rapporter" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Din e-post" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3761,17 +3683,17 @@ msgstr "Din e-postadresse" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Vi vil kun bruke personlig informasjon om deg i henhold til vÃ¥re <a href=\"/faq#privacy\">personvernsregler.</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ditt navn" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3784,20 +3706,19 @@ msgstr "Ditt passord har blitt endret" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ditt telefonnummer" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Dine oppdateringer" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Dine oppdateringer" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Dine oppdateringer" @@ -3823,7 +3744,7 @@ msgid "didn't use map" msgstr "brukte ikke kart" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "for eksempel «%s» eller «%s»" @@ -3929,8 +3850,7 @@ msgstr "andre omrÃ¥der:" msgid "reopened" msgstr "Ã¥pnet pÃ¥ nytt" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "logg ut" @@ -4008,7 +3928,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> rapport-<br>oppdatering" msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -4050,86 +3970,47 @@ 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 "(we never show your email address or phone number)" -#~ msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" - -#~ msgid "(we never show your email)" -#~ msgstr "(vi viser aldri din e-postadresse)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ 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:" - -#~ msgid "Email me updates" -#~ msgstr "Send meg oppdateringer" - -#~ msgid "Enter a new password:" -#~ msgstr "Skriv inn et nytt passord:" - -#~ 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" - -#~ 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 bruker web-basert e-post eller har filtre for søppel-e-post pÃ¥ din e-postkonto, kan du i noen tilfellet mÃ¥tte se etter vÃ¥re meldinger der." - -#~ msgid "Message:" -#~ msgstr "Melding:" - -#~ msgid "More problems nearby" -#~ msgstr "Flere problemer i nærheten" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Nesten ferdig! NÃ¥ mÃ¥ du sjekke e-posten din..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Støtende? Upassende? Gi oss beskjed" - -#~ msgid "Photo:" -#~ msgstr "Bilde:" - -#~ msgid "Please check your email" -#~ msgstr "Vennligst sjekk e-posten du oppgav" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, rapportert %s" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Vennligst merk at oppdateringer ikke blir sendt til administrasjonen. Hvis du legger igjen navnet ditt sÃ¥ vil det være offentlig tilgjengelig. Din informasjon vil kun bli brukt i henhold til vÃ¥re <a href=\"/faq#privacy\">personvernpolicy</a>" +#~ msgid "About us" +#~ msgstr "Om oss" -#~ 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 lenken er for gammel eller allerede brukt, eller at lenken ikke ble kopiert riktig." +#~ msgid "Email me new local problems" +#~ msgstr "Send meg e-post om lokale problemer" -#~ msgid "This problem has been closed" -#~ msgstr "Dette problemet er lukket" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Tom leilighet" -#~ msgid "This problem is in progress" -#~ msgstr "Dette problemet er under arbeid" +#~ msgid "Empty house or bungalow" +#~ msgstr "Tomt hus eller bungalow" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Dette problemet er gammelt og med ukjent status." +#~ msgid "Empty office or other commercial" +#~ msgstr "Tomt kontor eller forretningsbygg" -#~ msgid "Update:" -#~ msgstr "Oppdatering:" +#~ msgid "Empty pub or bar" +#~ msgstr "Tom pub eller bar" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Vi har ikke klart Ã¥ bekrefte din konto - beklager." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Tom offentlig bygning - skole, sykehus, etc." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Vi har sendt deg en epost som inneholder link for Ã¥ bekrefte din konto." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Velg et nærliggende gatenavn og omrÃ¥de, postnummer eller distrikt i Delhi" -#~ 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>:" +#~ msgid "FixMyStreet" +#~ msgstr "FiksGataMi" -#~ 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." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." -#~ 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." +#~ msgid "Problems in this area" +#~ msgstr "Problemer i dette omrÃ¥det" -#~ msgid "Your email:" -#~ msgstr "Din e-post" +#~ msgid "Property type:" +#~ msgstr "Type egenskap:" -#~ msgid "Your name:" -#~ msgstr "Ditt navn:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS-strøm for problemer i denne %s" -#~ msgid "Your email:" -#~ msgstr "Din e-post:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Hel blokk med tomme leiligheter" diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po index 83fea7b83..e244530ae 100644 --- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-12-04 12:53+0000\n" -"Last-Translator: Milo van der Linden <milo@dogodigi.net>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Dutch (Netherlands) (http://www.transifex.com/mysociety/fixmystreet/language/nl_NL/)\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "en" @@ -89,7 +89,7 @@ msgstr "%s live updates" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s vragenlijsten verzonden – %s beantwoord (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -108,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s district, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, gemeld aan %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, in %s district" @@ -166,7 +162,7 @@ msgstr "(zoals graffiti, zwerfafval, losliggende tegels of straatverlichting) " msgid "(not sent to council)" msgstr "(niet verstuurd naar de gemeente)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(optioneel)" @@ -178,12 +174,11 @@ msgstr "(publiek)" msgid "(sent to both)" msgstr "(verstuurd naar beide)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Kies een categorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Kies een woning type --" @@ -215,26 +210,21 @@ 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/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nee</strong> Laat me inloggen per e-mail" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong, ik heb een wachtwoord" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Over ons" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Actie ingepland" @@ -265,7 +255,7 @@ msgstr "Voeg een nieuwe categorie toe" msgid "Add user" msgstr "Gebruiker toevoegen" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "%s toegevoegd" @@ -285,7 +275,7 @@ msgstr "Melding %d gemaakt voor %s, type %s, parameters %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Melding %d inactief gemaakt (gemaakt %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Meld het me als er updates zijn" @@ -298,7 +288,7 @@ msgstr "Alle meldingen" msgid "All Reports as CSV" msgstr "Alle rapporten als CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -397,7 +387,7 @@ msgstr "Vorige" msgid "Ban email address" msgstr "Verban e-mailadres" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -428,7 +418,7 @@ msgstr "Kan je de kaart niet zien? <em>Sla deze stap over</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -443,7 +433,7 @@ 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:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -463,19 +453,19 @@ msgstr "Categorie: %s" msgid "Change password" msgstr "Verander Wachtwoord" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -486,7 +476,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -527,8 +517,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -537,7 +527,7 @@ msgstr "" msgid "Closed" msgstr "Gesloten" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Gesloten door gemeente" @@ -563,7 +553,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -582,9 +572,8 @@ msgstr "Bevestig account" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Bevestig door e-mail beneden en kies een wachtwoord. Als je bevestigd wordt je wachtwoord bijgewerkt." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -594,7 +583,7 @@ msgstr "Bevestig door e-mail beneden en kies een wachtwoord. Als je bevestigd wo msgid "Confirmation" msgstr "Bevestiging" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -613,7 +602,7 @@ msgid "Confirmed:" msgstr "Bevestigd:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -632,8 +621,8 @@ msgstr "Neem contact op met het team" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kan de gebruiker niet vinden" @@ -651,7 +640,7 @@ msgstr "Gemeente" msgid "Council contacts for %s" msgstr "Gemeente contactpersongen voor %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "gemeente ref.: %s" @@ -670,7 +659,7 @@ msgstr "Aantal" msgid "Create a report" msgstr "Maak een melding" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Maak een categorie" @@ -714,20 +703,20 @@ msgstr "Dashboard" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Verwijderd" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -735,7 +724,7 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Details" @@ -760,11 +749,11 @@ msgid "Diligency prize league table" msgstr "Toewijdingsranglijst" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -782,8 +771,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -803,7 +792,7 @@ msgstr "" msgid "Edit" msgstr "Bewerk" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -833,7 +822,7 @@ msgstr "Redacteur" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -841,11 +830,11 @@ msgstr "Redacteur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Email toegevoegd aan zwarte lijst" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -857,19 +846,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Email staat al op zwarte lijst" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Email me nieuwe lokale meldingen" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -878,26 +862,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Lege flat of maisonette" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Leeg huis of bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Leeg kantoor of ander commercieel" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Lege kroeg of bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Leeg publiek gebouw - school, ziekenhuis etc." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -941,18 +905,14 @@ msgstr "Geef dichtstbijzijnde postcode, of straatnaam en plaats" msgid "Enter a nearby street name and area" msgstr "Geef dichtstbijzijnde straatnaam en plaats" -#: 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Geef wachtwoord " -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Geef details van het probleem" @@ -978,7 +938,7 @@ msgstr "Voorbeeld van postcode %s" msgid "Examples:" msgstr "Voorbeelden:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1015,19 +975,15 @@ msgstr "Eerste keer" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Opgelost" @@ -1054,7 +1010,7 @@ msgstr "" msgid "Flag user" msgstr "Gemarkeerde gebruikr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Gemarkeerd" @@ -1076,8 +1032,7 @@ msgstr "" msgid "Flagged:" msgstr "Gemarkeerd:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 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." @@ -1108,18 +1063,18 @@ msgstr "Veelgestelde Vragen" msgid "GeoRSS on Google Maps" msgstr "GeoRSS op Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Updates ontvangen" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Updates over %s problemen ontvangen" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Updates in deze %s ontvangen" @@ -1132,7 +1087,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1158,7 +1113,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1169,8 +1124,7 @@ 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/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hoi %s" @@ -1186,11 +1140,11 @@ msgstr "Hoi %s" msgid "Hidden" msgstr "Verborgen" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Verberg oud" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Verberg spelden" @@ -1210,10 +1164,6 @@ msgstr "Hoe een melding maken" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Ik ben bang dat je geen ongeverifieerde meldingen kunt bevestigen." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1224,7 +1174,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1246,7 +1196,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1267,7 +1217,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1302,10 +1252,10 @@ msgstr "Illegaal ID" msgid "Illegal feed selection" msgstr "Illegale RSS feed selectie" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "In Behandeling" @@ -1356,7 +1306,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ongeldige agency_responsible waarde %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ongeldige einddatum" @@ -1364,16 +1314,16 @@ msgstr "Ongeldige einddatum" msgid "Invalid format %s specified." msgstr "Ongeldig formaat %s gespecifieerd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ongeldige startdatum" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Onderzoeken" @@ -1395,7 +1345,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1433,7 +1383,6 @@ msgstr "Laden..." #: 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 feeds en e-mail meldingen" @@ -1442,11 +1391,11 @@ msgstr "Lokale RSS feeds en e-mail meldingen" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokale RSS feeds en e-mail meldingen voor '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokale melding" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Vind het probleem op de kaart van de omgeving" @@ -1506,14 +1455,14 @@ msgstr "Maand" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Naam" @@ -1537,8 +1486,8 @@ msgstr "Dichtstbijzijnde straat met naam voor lokatie op de kaart (automatisch g msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Dichtstbijzijnde postcode voor lokatie op de kaart (automatisch gegenereerd): %s (%sm afstand)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1562,7 +1511,7 @@ msgstr "Nieuw <br>problemen" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Nieuw contactpersonen voor categorie toegevoegd" @@ -1627,7 +1576,7 @@ msgstr "Volgende" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nee" @@ -1692,8 +1641,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1726,7 +1675,7 @@ 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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1740,15 +1689,15 @@ msgstr "Opmerking: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Nu om je melding te verzend…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Nu om je update te verzend…" @@ -1782,8 +1731,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1818,13 +1767,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1849,7 +1798,7 @@ msgstr "" msgid "Partial" msgstr "Gedeeltelijk" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1858,7 +1807,7 @@ msgid "Password (optional)" msgstr "Wachtwoord (optioneel)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Wachtwoord:" @@ -1866,7 +1815,7 @@ msgstr "Wachtwoord:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1882,13 +1831,21 @@ msgid "Phone:" msgstr "Telefoonnummer:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1912,8 +1869,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1929,16 +1886,16 @@ msgstr "Wees beleefd, precies en beknopt" msgid "Please check the passwords and try again" msgstr "Controleer de wachtwoorden en probeer opnieuw" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Controleer of je e-mailadres klopt" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1948,7 +1905,7 @@ msgstr "Kies een categorie" msgid "Please choose a property type" msgstr "Kies een pand type" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1969,11 +1926,10 @@ msgstr "" msgid "Please enter a message" msgstr "Geef bericht in" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Geef je naam" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1987,10 +1943,10 @@ msgstr "Geef wachtwoord" msgid "Please enter a subject" msgstr "Geef onderwerp" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2007,9 +1963,9 @@ msgid "Please enter some details" msgstr "Geef details" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2018,7 +1974,7 @@ msgid "Please enter your email" msgstr "Geef een geldig e-mailadres" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Geef een geldig e-mailadres" @@ -2034,7 +1990,7 @@ msgstr "Geef je volledige naam, gemeentes hebben deze informatie nodig. Mocht je #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Geef je naam" @@ -2061,7 +2017,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "Vul de details van het probleem beneden in." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Vul de details van het probleem in." @@ -2070,7 +2026,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Geef aan of je een vragenlijst wilt ontvangen" @@ -2079,9 +2035,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Let op, updates worden niet aan de gemeente verzonden." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Let op dat je melding <strong>nog niet is verzonden</strong>. Kies een categorie en vermeld verdere informatie hierbeneden en klik op insturen." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2097,16 +2052,16 @@ msgstr "" msgid "Please note:" msgstr "Let op:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Geef een reden op waarom je deze melding heropent" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Vermeld wat tekst en een foto" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Geef aan of je het probleem al eerder hebt doorgegeven aan de gemeente" @@ -2122,22 +2077,23 @@ msgstr "Kies de feed die je wilt" msgid "Please select the type of alert you want" msgstr "Kies de melding die je wilt" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Geef aan of het probleem is verholpen" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Je kan alleen een JPEG foto insturen" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Schrijf een bericht" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Schrijf je update hier" @@ -2168,7 +2124,7 @@ msgstr "" msgid "Previous" msgstr "Vorige" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2178,7 +2134,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2207,7 +2163,7 @@ msgstr "Probleem %s verzonden naar gemeente %s" msgid "Problem breakdown by state" msgstr "Probleem verdeeld per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Probleem gemarkeerd als open" @@ -2219,10 +2175,6 @@ msgstr "Probleem status gewijzigd op basis van onderzoeksresultaten" msgid "Problems" msgstr "Problemen" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemen in dit gebied" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemen dichtbij" @@ -2240,13 +2192,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemen binnen een straal van %.1fkm van deze lokatie" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemen binnen %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemen binnen wijk %s" @@ -2265,15 +2215,11 @@ msgstr "Problemen binnen de grenzen van:" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Pand soort:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Geef een update" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2307,16 +2253,15 @@ 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:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Vragenlijst ingevuld door melder" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS feed" @@ -2344,18 +2289,12 @@ msgstr "RSS feed van %s, binnen wijk %s" msgid "RSS feed of nearby problems" msgstr "RSS feed van nabije problemen" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS feed van problemen in dit %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed van problemen binnen %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed van problemen in wijk %s" @@ -2365,14 +2304,13 @@ msgstr "RSS feed van problemen in wijk %s" msgid "RSS feed of recent local problems" msgstr "RSS feed van recente lokale problemen" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS feed van updates voor dit probleem" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Ontvang een e-mail als updates worden achtergelaten bij dit probleem." @@ -2408,12 +2346,11 @@ msgstr "Verwijder foto (kan niet ongedaan worden!)" msgid "Reply to user:" msgstr "Beantwoord" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Melding" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2423,7 +2360,7 @@ msgstr "Meld een probleem" msgid "Report abuse" msgstr "Meld misbruik" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Meld op %s" @@ -2438,7 +2375,7 @@ msgstr "Probleem melden" msgid "Report, view, or discuss local problems" msgstr "Meld, bekijk of discussier over lokale problemen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Anoniem gemeld bij %s" @@ -2448,7 +2385,7 @@ msgstr "Anoniem gemeld bij %s" msgid "Reported before" msgstr "Eerder gemeld" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Gemeld door %s bij %s" @@ -2462,27 +2399,27 @@ msgstr "Gemeld door:" msgid "Reported in the %s category" msgstr "Toegewezen aan categorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Anoniem gemeld in de categorie %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Anoniem door %s gemeld bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Gemeld door %s door %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeld door %s in de categorie %s door %s bij %s" @@ -2503,7 +2440,7 @@ msgstr "Gemeld:" msgid "Reporting a problem" msgstr "Meld een probleem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2546,15 +2483,15 @@ msgstr "Wegbeheerder voor deze straat (afgeleid van wegnummer en type): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Wegbeheerder voor deze straat (uit OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Linksom roteren" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2569,7 +2506,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2625,7 +2562,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Verzonden aan %s %s later" @@ -2644,21 +2581,21 @@ msgstr "Deel" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Toon mijn naam publiekelijk" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Toon oud" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Toon spelden" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2726,15 +2663,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog eens." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Startdatum:" @@ -2743,7 +2675,7 @@ msgstr "Startdatum:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Staat" @@ -2756,7 +2688,7 @@ msgstr "Staat" msgid "State:" msgstr "Staat:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2796,10 +2728,10 @@ msgid "Subject:" msgstr "Onderwerp:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Opslaan" @@ -2827,9 +2759,8 @@ msgstr "Vragenlijst opslaan" msgid "Submitted" msgstr "Opgeslagen" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2837,7 +2768,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2856,7 +2787,7 @@ msgstr "Samenvatting" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2913,7 +2844,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2921,7 +2852,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2931,11 +2862,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "De postcode is niet geldig." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Het probleem is gemarkeerd als verzonden." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Het probleem wordt opnieuw verzonden." @@ -2947,7 +2878,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3087,9 +3018,9 @@ msgstr "Er was een probleem bij het tonen van de Alle Meldingen pagina. Probeer msgid "There was a problem showing this page. Please try again later." msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog eens." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Er was een probleem met je e-mailadres/wachtwoord combinatie. Als je het wachtwoord niet kunt herinneren, of je hebt er geen een, vul dan het formulier ‘inloggen via email’ in." @@ -3150,9 +3081,9 @@ msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïn msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïnteresseerd zijn in deze lokatie. Negeer deze melding als je niet de juiste contactpersoon bent." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Deze informatie is verplicht" @@ -3165,11 +3096,11 @@ msgstr "Dit is een ontwikkelingssite; er kunnen mogelijk problemen optreden, en msgid "This is a summary of all reports on this site." msgstr "Dit is een samenvatting van alle meldingen op deze site." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dit probleem is opgelost" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dit probleem is niet opgelost" @@ -3206,7 +3137,7 @@ msgstr "Deze pagina bevat een door de gebruiker aangeleverde foto van het proble msgid "Time spent (in minutes):" msgstr "Gespendeerde tijd (in minuten):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tijdslijn" @@ -3251,8 +3182,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3269,7 +3200,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3284,7 +3215,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3336,10 +3267,10 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3366,7 +3297,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3375,11 +3306,11 @@ msgstr "" msgid "Used map" msgstr "Gebruikte kaart" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3387,16 +3318,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Gebruikers" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3433,16 +3364,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "(we zullen je telefoonnummer of e-mailadres niet tonen)" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3451,7 +3381,7 @@ msgstr "" 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3489,10 +3419,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3512,7 +3438,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3542,8 +3468,8 @@ msgstr "Jaar" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3657,19 +3583,19 @@ msgid "Your Reports" msgstr "Jouw meldingen" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Jouw e-mail" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3680,17 +3606,17 @@ msgstr "Jouw e-mailadres" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Je informatie wordt alleen gebruikt zoals vermeld in onze <a href=\"/privacy\">privacy policy</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Jouw naam" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3703,20 +3629,19 @@ msgstr "Je wachtwoord is gewijzigd" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Je telefoonnummer" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Jouw meldingen" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Jouw meldingen" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Jouw updates" @@ -3742,7 +3667,7 @@ msgid "didn't use map" msgstr "kaart niet gebruikt" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "bv. '%s' of '%s'" @@ -3848,8 +3773,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3927,7 +3851,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3969,68 +3893,41 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#~ msgid "(we never show your email)" -#~ msgstr "(we zullen je e-mailadres niet tonen)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ 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" - -#~ msgid "Email me updates" -#~ msgstr "Email me updates" - -#~ msgid "Enter a new password:" -#~ msgstr "Geef nieuw wachtwoord:" - -#~ 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" - -#~ 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 "Als je een gratis e-mailadres of spamfilter hebt kan het voorkomen dat deze de e-mail tegenhoud. " - -#~ msgid "Message:" -#~ msgstr "Bericht:" - -#~ msgid "More problems nearby" -#~ msgstr "Meer problemen dichtbij" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Bijna klaar! Kijk nu in je e-mail..." +#~ msgid "%s, reported at %s" +#~ msgstr "%s, gemeld aan %s" -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Beledigend? Ongeschikt? Meld het ons" +#~ msgid "About us" +#~ msgstr "Over ons" -#~ msgid "Photo:" -#~ msgstr "Foto:" +#~ msgid "Email me new local problems" +#~ msgstr "Email me nieuwe lokale meldingen" -#~ msgid "Please check your email" -#~ msgstr "Controleer je e-mail" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Lege flat of maisonette" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Let op, updates worden niet aan de gemeente verzonden. Als je je naam achterlaat zal het publiekelijk getoond worden. Jouw gegevens worden alleen gebruikt volgens de vermeldingen van onze <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgid "Empty house or bungalow" +#~ msgstr "Leeg huis of bungalow" -#~ msgid "This problem has been closed" -#~ msgstr "Dit probleem is gesloten" +#~ msgid "Empty office or other commercial" +#~ msgstr "Leeg kantoor of ander commercieel" -#~ msgid "This problem is in progress" -#~ msgstr "Aan dit probleem wordt gewerkt" +#~ msgid "Empty pub or bar" +#~ msgstr "Lege kroeg of bar" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Dit probleem is oud, en de status is onbekend." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Leeg publiek gebouw - school, ziekenhuis etc." -#~ 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." +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ 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." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Ik ben bang dat je geen ongeverifieerde meldingen kunt bevestigen." -#~ msgid "Your email:" -#~ msgstr "Jouw e-mail:" +#~ msgid "Problems in this area" +#~ msgstr "Problemen in dit gebied" -#~ msgid "Your name:" -#~ msgstr "Jouw naam:" +#~ msgid "Property type:" +#~ msgstr "Pand soort:" -#~ msgid "Your email:" -#~ msgstr "Jouw e-mail" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS feed van problemen in dit %s" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index af7a6fe98..bc6b0ffb8 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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:36+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/mysociety/fixmystreet/language/nn_NO/)\n" "Language: nn_NO\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " og " @@ -90,7 +90,7 @@ msgstr "%s aktive oppdateringar" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s spørjeskjema sendt – %s svart (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -109,10 +109,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" @@ -167,7 +163,7 @@ msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(valfritt)" @@ -179,12 +175,11 @@ msgstr "" msgid "(sent to both)" msgstr "(sendt til begge)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" @@ -216,26 +211,21 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, eg har eit passord" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Om oss" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -266,7 +256,7 @@ msgstr "Legg til ny kategori" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "La til %s" @@ -286,7 +276,7 @@ msgstr "Varsel %d oppretta for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d kobla ut (oppretta %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Send meg varsel ved framtidige oppdateringar" @@ -299,7 +289,7 @@ msgstr "" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -398,7 +388,7 @@ msgstr "" msgid "Ban email address" msgstr "Bannlys e-postadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -429,7 +419,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -444,7 +434,7 @@ 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:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -464,19 +454,19 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Byt passord" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -487,7 +477,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -528,8 +518,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -538,7 +528,7 @@ msgstr "" msgid "Closed" msgstr "Lukka" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -564,7 +554,7 @@ msgstr "Data om merkevaresamarbeid:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -594,7 +584,7 @@ msgstr "" msgid "Confirmation" msgstr "Stadfesting" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -613,7 +603,7 @@ msgid "Confirmed:" msgstr "Stadfesta:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -632,8 +622,8 @@ msgstr "Kontakt prosjektgruppa" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -651,7 +641,7 @@ msgstr "Administrasjon" msgid "Council contacts for %s" msgstr "Administrasjonskontaktar for %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -670,7 +660,7 @@ msgstr "Mengd" msgid "Create a report" msgstr "Lag ein rapport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Lag kategori" @@ -714,20 +704,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Sletta" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -735,7 +725,7 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "" @@ -760,11 +750,11 @@ msgid "Diligency prize league table" msgstr "Arbeidshestar" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -782,8 +772,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -803,7 +793,7 @@ msgstr "" msgid "Edit" msgstr "Rediger" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -833,7 +823,7 @@ msgstr "Oppdatert av" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -841,11 +831,11 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -857,19 +847,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Send meg e-post om lokale problem" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "E-post:" @@ -878,26 +863,6 @@ msgstr "E-post:" msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Tom leilegheit" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Tomt hus eller bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Tomt kontor eller forretningsbygg" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Tom pub eller bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Tom offentleg bygning – skule, sjukehus, osb." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -941,18 +906,14 @@ msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Enter a password" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Legg inn detaljar om problemet" @@ -978,7 +939,7 @@ msgstr "Postnummerdøme %s" msgid "Examples:" msgstr "Døme:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1015,19 +976,15 @@ msgstr "Første gong" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Løyst" @@ -1054,7 +1011,7 @@ msgstr "" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flagga:" @@ -1076,8 +1033,7 @@ msgstr "" msgid "Flagged:" msgstr "Flagga:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Følg ei bydellenkje for Ã¥ berre sjÃ¥ rapportar innanfor den bydelen." @@ -1108,18 +1064,18 @@ msgstr "Ofte spurde spurnader" msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1132,7 +1088,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1158,7 +1114,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1169,8 +1125,7 @@ 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/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "" @@ -1186,11 +1141,11 @@ msgstr "" msgid "Hidden" msgstr "Skjult" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Skjul nÃ¥ler" @@ -1210,10 +1165,6 @@ msgstr "Korleis rapportera eit problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1224,7 +1175,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1246,7 +1197,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1267,7 +1218,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1302,10 +1253,10 @@ msgstr "Ugyldig ID" msgid "Illegal feed selection" msgstr "Ugyldig val av straum" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Under arbeid" @@ -1356,7 +1307,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1364,16 +1315,16 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Undersøkjer" @@ -1395,7 +1346,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1433,7 +1384,6 @@ msgstr "Lastar …" #: 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 "Lokal RSS-straum og e-postvarsel" @@ -1442,11 +1392,11 @@ msgstr "Lokal RSS-straum og e-postvarsel" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-straum og e-postvarsel for «%s»" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokale varsel" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet pÃ¥ kartet over omrÃ¥det" @@ -1506,14 +1456,14 @@ msgstr "MÃ¥nad" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Namn" @@ -1537,8 +1487,8 @@ msgstr "Næraste namngjevne veg til nÃ¥len plassert pÃ¥ kartet (automatisk gener msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Næraste postnummer til nÃ¥len plassert pÃ¥ kartet (automatisk generert): %s (%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1560,7 +1510,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1625,7 +1575,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nei" @@ -1690,8 +1640,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1724,7 +1674,7 @@ 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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1738,15 +1688,15 @@ msgstr "Merk: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1780,8 +1730,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1816,13 +1766,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1847,7 +1797,7 @@ msgstr "" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1856,7 +1806,7 @@ msgid "Password (optional)" msgstr "" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Passord:" @@ -1864,7 +1814,7 @@ msgstr "Passord:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1880,13 +1830,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "" @@ -1910,8 +1868,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1927,16 +1885,16 @@ msgstr "Ver høfleg, poengtert og kortfatta." msgid "Please check the passwords and try again" msgstr "Ver venleg og sjekk passorda og prøv igjen" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1946,7 +1904,7 @@ msgstr "Vel ein kategori" msgid "Please choose a property type" msgstr "Vel ein type eigenskap" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1967,11 +1925,10 @@ msgstr "" msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Ver venleg og legg inn namnet ditt" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1985,10 +1942,10 @@ msgstr "Skriv inn eit passord" msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2005,9 +1962,9 @@ msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2016,7 +1973,7 @@ msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "" @@ -2032,7 +1989,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Ver venleg og legg inn namnet ditt" @@ -2059,7 +2016,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "Ver venleg og fyll ut detaljar om problemet under." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2070,7 +2027,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ver venleg og indiker om du ynskjer Ã¥ motta eit nytt spørjeskjema" @@ -2079,9 +2036,8 @@ msgid "Please note that updates are not sent to the council." msgstr "" #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Merk at rapporten din <strong>enno ikkje er send</strong. Vel ein kategori og legg til meir informasjon under før du sender inn." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2097,16 +2053,16 @@ msgstr "" msgid "Please note:" msgstr "Merk:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Ver venleg og bidra med ei forklaring pÃ¥ kvifor du gjenopnar denne problemrapporten" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 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:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Ver venleg og opplys om du har rapportert eit problem til administrasjonen din tidlegare" @@ -2122,22 +2078,23 @@ msgstr "Vel den kjelda du ynskjer" msgid "Please select the type of alert you want" msgstr "Ver venleg og vel kva for ein type varsel du ynskjer" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Ver venleg og berre last opp JPEG-bilete" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Skriv inn ei melding" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "" @@ -2168,7 +2125,7 @@ msgstr "" msgid "Previous" msgstr "" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2178,7 +2135,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2207,7 +2164,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2219,10 +2176,6 @@ msgstr "Endring av problemtilstand basert pÃ¥ spørjeundersøkingsresultat" msgid "Problems" msgstr "Problem" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problem i dette omrÃ¥det" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" @@ -2240,13 +2193,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problem innanfor %.1fkm av denne posisjonen" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problem innanfor %s bydel" @@ -2265,15 +2216,11 @@ msgstr "Problem innanfor grensene av:" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Type eigenskap:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidra med ei oppdatering" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2307,16 +2254,15 @@ 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:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Spørjeskjema fylt inn av feilrapportøren" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-straum" @@ -2344,18 +2290,12 @@ msgstr "RSS-straum av %s, innanfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-straum med problem i nærleiken" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS-straum for problem i denne %s-en" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-straum for problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-straum for problem innanfor %s bydel" @@ -2365,14 +2305,13 @@ msgstr "RSS-straum for problem innanfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-straum med nye lokale problem" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS-straum med oppdateringar for dette problemet" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post nÃ¥r det er oppdateringar pÃ¥ dette problemet" @@ -2408,12 +2347,11 @@ msgstr "Fjern bilete (kan ikkje gjerast om!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2423,7 +2361,7 @@ msgstr "Rapporter eit problem" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Rapport pÃ¥ %s" @@ -2438,7 +2376,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -2448,7 +2386,7 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -2462,27 +2400,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2503,7 +2441,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2546,15 +2484,15 @@ msgstr "Vegoperatør for denne namngjevne vegen (utleia frÃ¥ vegreferansenummer msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frÃ¥ OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2569,7 +2507,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2625,7 +2563,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -2644,21 +2582,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Vis nÃ¥ler" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2717,9 +2655,8 @@ msgstr "Orsak, vi kunne ikkje finna den staden." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv pÃ¥ nytt." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2727,15 +2664,10 @@ msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv pÃ¥ nytt msgid "Sorry, we could not parse that location. Please try again." msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv pÃ¥ nytt." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv pÃ¥ nytt." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2744,7 +2676,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Tilstand" @@ -2757,7 +2689,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2797,10 +2729,10 @@ msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Send inn" @@ -2828,9 +2760,8 @@ msgstr "Send inn spørjeskjema" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Abonner" @@ -2838,7 +2769,7 @@ msgstr "Abonner" msgid "Subscribe me to an email alert" msgstr "Eg ynskjer Ã¥ abonnera pÃ¥ e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2857,7 +2788,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2917,7 +2848,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Takk, glad for Ã¥ høyra at problemet er løyst! Vi vil gjerne spørja deg om du har rapportert eit problem til ein administrasjon tidlegare?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 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." @@ -2925,7 +2856,7 @@ msgstr "Biletet ser ikkje ut til Ã¥ ha vorte lasta opp riktig (%s), prøv pÃ¥ ny msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2935,11 +2866,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast pÃ¥ nytt." @@ -2951,7 +2882,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frÃ¥ FiksGataMi." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3091,9 +3022,9 @@ msgstr "Det oppstod problem med Ã¥ visa «Alle rapportar»-sida. Ver venleg og msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3154,9 +3085,9 @@ msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden f msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Denne e-posten er sendt til fleire administrasjonar som dekkjer staden for problemet, sidan den valde kategorien er tilgjengeleg for desse. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for Ã¥ handtera denne saka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Denne informasjonen er pÃ¥kravd" @@ -3169,11 +3100,11 @@ msgstr "Dette er ein utviklarnettstad. Ting kan knekka nÃ¥r som helst og databas msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dette problemet er løyst" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dette problemet har ikkje vorte løyst" @@ -3210,7 +3141,7 @@ msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukar msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3255,8 +3186,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3273,7 +3204,7 @@ msgstr "Ikkje stadfesta" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Ukjend varsel-type" @@ -3288,7 +3219,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "Ukjend problem-ID" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3340,10 +3271,10 @@ msgstr "Oppdater tilstanden" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3370,7 +3301,7 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3379,11 +3310,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Brukar flagga" @@ -3391,16 +3322,16 @@ msgstr "Brukar flagga" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brukarar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Verdi oppdatert" @@ -3437,16 +3368,15 @@ msgstr "Vi fann meir ein eitt treff for den staden. Vi viser opp til ti treff, s #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3455,7 +3385,7 @@ msgstr "" 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:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon pÃ¥ dine vegner" @@ -3493,10 +3423,6 @@ msgstr "NÃ¥r sendt" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3516,7 +3442,7 @@ msgstr "NÃ¥r du søkjer etter førespurnader, sÃ¥ er det òg mogleg Ã¥ søkja et 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tenkja deg Ã¥ motta ein ny førespurnad om 4 veker, som minner deg om Ã¥ sjekka status?" @@ -3546,8 +3472,8 @@ msgstr "Ã…r" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3661,19 +3587,19 @@ msgid "Your Reports" msgstr "Rapportane dine" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3684,17 +3610,17 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3707,20 +3633,19 @@ msgstr "Passordet ditt har vorte endra" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Oppdateringane dine" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Oppdateringane dine" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Oppdateringane dine" @@ -3746,7 +3671,7 @@ msgid "didn't use map" msgstr "brukte ikkje kart" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3852,8 +3777,7 @@ msgstr "andre omrÃ¥de:" msgid "reopened" msgstr "opna pÃ¥ nytt" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3931,7 +3855,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> rapportoppdatering" msgstr[1] "<big>%s</big> rapportoppdateringar" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3973,80 +3897,38 @@ 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 "(we never show your email)" -#~ msgstr "(vi viser aldri e-postadressa di)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ 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:" - -#~ msgid "Email me updates" -#~ msgstr "Send meg oppdateringar" - -#~ msgid "Enter a new password:" -#~ msgstr "Skriv inn eit nytt passord:" - -#~ 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" - -#~ 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 "Viss du brukar vevbasert e-post eller har filter for søppel-e-post pÃ¥ e-postkontoen din, kan du i visse tilfelle mÃ¥tta sjÃ¥ etter meldingane vÃ¥re der." - -#~ msgid "Message:" -#~ msgstr "Melding:" - -#~ msgid "More problems nearby" -#~ msgstr "Fleire problem i nærleiken" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Nesten ferdig! No mÃ¥ du sjekka e-posten din …" - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Støytande? Upassende? Sei frÃ¥" - -#~ msgid "Photo:" -#~ msgstr "Bilete:" - -#~ msgid "Please check your email" -#~ msgstr "Ver venleg og sjekk e-posten du oppgav" - -#~ 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 "" -#~ "Merk at oppdateringar ikkje vert sende til administrasjonen. Viss du\n" -#~ "legg igjen namnet ditt sÃ¥ vil det vera offentleg tilgjengeleg.\n" -#~ "Informasjonen din vil berre brukast i samsvar med <a href=\"/faq#privacy\">personvernpolicyen vÃ¥r</a>" +#~ msgid "About us" +#~ msgstr "Om oss" -#~ msgid "This problem has been closed" -#~ msgstr "Dette problemet er lukka" +#~ msgid "Email me new local problems" +#~ msgstr "Send meg e-post om lokale problem" -#~ msgid "This problem is in progress" -#~ msgstr "Dette problemet er under arbeid" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Tom leilegheit" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Dette problemet er gammalt og med ukjend status." +#~ msgid "Empty house or bungalow" +#~ msgstr "Tomt hus eller bungalow" -#~ msgid "Update:" -#~ msgstr "Oppdatering:" +#~ msgid "Empty office or other commercial" +#~ msgstr "Tomt kontor eller forretningsbygg" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Vi har sendt deg ein epost som inneheld ei lenkje for Ã¥ stadfesta kontoen din." +#~ msgid "Empty pub or bar" +#~ msgstr "Tom pub eller bar" -#~ 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>:" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Tom offentleg bygning – skule, sjukehus, osb." -#~ 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." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." -#~ 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." +#~ msgid "Problems in this area" +#~ msgstr "Problem i dette omrÃ¥det" -#~ msgid "Your email:" -#~ msgstr "E-posten din" +#~ msgid "Property type:" +#~ msgstr "Type eigenskap:" -#~ msgid "Your name:" -#~ msgstr "Namnet ditt:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS-straum for problem i denne %s-en" -#~ msgid "Your email:" -#~ msgstr "E-posten din:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Heil blokk med tomme leilegheiter" diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po index f4bac2de7..690899603 100644 --- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,17 +4,17 @@ # Matthew Somerville <matthew@mysociety.org>, 2011-06-03. # # Translators: +# daey <netrapida@live.com.pt>, 2016 # francisco oliveira martins <francisco.martins@recortes.cv>, 2013 # mySociety <transifex@mysociety.org>, 2013 -# daey <netrapida@live.com.pt>, 2016 # simaor <simaor@hotmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2016-02-15 16:12+0000\n" -"Last-Translator: daey <netrapida@live.com.pt>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Portuguese (http://www.transifex.com/mysociety/fixmystreet/language/pt/)\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "e" @@ -55,9 +55,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Corpos" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -92,7 +91,7 @@ msgstr "%s atualizações directas" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s questionários enviados - %s respondeu (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -111,10 +110,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s ala, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, reportou em %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, %s dentro da ala" @@ -169,7 +164,7 @@ msgstr "(Como ruas e pavimentos esburacados, grafits, arvores caidas, lajes par msgid "(not sent to council)" msgstr "(Não reportar ao conselho)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(opcional)" @@ -181,12 +176,11 @@ msgstr "(público)" msgid "(sent to both)" msgstr "(remeter para ambos)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Escolha uma categoria --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Escolha um tipo de categoria --" @@ -218,26 +212,21 @@ msgstr "<strong> Não </strong> Deixe-me confirmar o meu relatório por e-mail" 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/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong> Não </strong>, deixe-me entrar por e-mail" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong> Sim </strong> Eu tenho password" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Acerca de nós" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Ação Programada" @@ -268,7 +257,7 @@ msgstr "Adicionar nova categoria" msgid "Add user" msgstr "Adicionar user" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Adicionado %s" @@ -288,7 +277,7 @@ msgstr "Alerta %d criado por %s, tipo %s, os parâmetros %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Alerta %d desativada (criado %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Avise-me de atualizações futuras" @@ -301,7 +290,7 @@ msgstr "Todos os Relatórios" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -400,7 +389,7 @@ msgstr "Voltar" msgid "Ban email address" msgstr "Ban endereço de e-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -431,7 +420,7 @@ msgstr "Não pode ver a localizaçao no mapa <em> Salte esta etapa </em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -446,7 +435,7 @@ msgstr "Categoria" msgid "Category fix rate for problems > 4 weeks old" msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -466,19 +455,19 @@ msgstr "Categoria: %s" msgid "Change password" msgstr "Mudar password" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -489,7 +478,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -530,8 +519,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -540,7 +529,7 @@ msgstr "" msgid "Closed" msgstr "Fechado" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Fechado pelo Conselho" @@ -566,7 +555,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -585,9 +574,8 @@ msgstr "Confirmar conta" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Confirme por e-mail abaixo, proporcionando uma nova senha nesse ponto. Quando você confirmar, sua senha será atualizada." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -597,7 +585,7 @@ msgstr "Confirme por e-mail abaixo, proporcionando uma nova senha nesse ponto. Q msgid "Confirmation" msgstr "Confirmação" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -616,7 +604,7 @@ msgid "Confirmed:" msgstr "Confirmado:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -635,8 +623,8 @@ msgstr "Fale com a equipe" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Não foi possÃvel encontrar usuário" @@ -654,7 +642,7 @@ msgstr "Conselho" msgid "Council contacts for %s" msgstr "Contatos do Conselho para %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -673,7 +661,7 @@ msgstr "Conta" msgid "Create a report" msgstr "Criar um report" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Criar uma categoria" @@ -717,20 +705,20 @@ msgstr "Painel de instrumentos" msgid "Dealt with by subdivision within 5 working days" msgstr "Tratadas pelas subdivisões dentro de 5 dias úteis" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Excluidos" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -738,7 +726,7 @@ msgid "Description" msgstr "Descripçaoi" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "DEtalhes" @@ -763,11 +751,11 @@ msgid "Diligency prize league table" msgstr "Diligency prêmio tabela classificativa" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -785,8 +773,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplicar" @@ -806,7 +794,7 @@ msgstr "" msgid "Edit" msgstr "Editar" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Editar os detalhes do corpo" @@ -836,7 +824,7 @@ msgstr "Editar" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -844,11 +832,11 @@ msgstr "Editar" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Email adicionado a lista de abusos" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -860,19 +848,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-mail já está na lista abusos" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Enviar novos problemas locais" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -881,26 +864,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Apartamento vazio ou duplex" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Casa vazia ou bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Escritório vazio ou outro comercial" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Pub ou bar vazio" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "EdifÃcio público vazio - escola, hospital, etc" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -944,18 +907,14 @@ msgstr "Inserir um código postal perto, ou nome da rua, zona ou local" msgid "Enter a nearby street name and area" msgstr "Digite um nome de rua nas proximidades e área" -#: 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Digite uma nova password" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Digite os detalhes do problema" @@ -981,7 +940,7 @@ msgstr "Exemplo PostCode %s" msgid "Examples:" msgstr "Exemplos:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1018,19 +977,15 @@ msgstr "Primeiro Nome" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreetMindelo" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Corrigido" @@ -1057,7 +1012,7 @@ msgstr "" msgid "Flag user" msgstr "Bandeira - Usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Marcado" @@ -1079,8 +1034,7 @@ msgstr "" msgid "Flagged:" msgstr "Marcado:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Siga um link ala para ver apenas os relatórios dentro do ala." @@ -1111,18 +1065,18 @@ msgstr "Perguntas mais frequentes" msgid "GeoRSS on Google Maps" msgstr "GeoRSS no Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Receba as atualizações" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Receba as atualizações de problemas fix de %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Receba as atualizações de problemas neste %s" @@ -1135,7 +1089,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1161,7 +1115,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1172,8 +1126,7 @@ 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/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Oi %s" @@ -1189,11 +1142,11 @@ msgstr "Oi %s" msgid "Hidden" msgstr "Esconder" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Ocultar" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Ocultar pins" @@ -1213,10 +1166,6 @@ msgstr "Como reportar um problema" msgid "How to send successful reports" msgstr "Como enviar relatorios com sucesso" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Tenho receio de nao puder confirmar os seus relatorios" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1227,7 +1176,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1249,7 +1198,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1273,7 +1222,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1308,10 +1257,10 @@ msgstr "ID ilegal" msgid "Illegal feed selection" msgstr "Seleção de feed ilegal" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Em andamento" @@ -1362,7 +1311,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Agencia_responsavel valor %s inválido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Invalido data final" @@ -1370,16 +1319,16 @@ msgstr "Invalido data final" msgid "Invalid format %s specified." msgstr "Formato inválido%s especificado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Data de inicio invalida" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Investigando" @@ -1401,7 +1350,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1439,7 +1388,6 @@ msgstr "Carregando ..." #: 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 "RSS feeds e alertas de e-mail locais" @@ -1448,11 +1396,11 @@ msgstr "RSS feeds e alertas de e-mail locais" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS feeds e alertas de e-mail locais para '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Alertas locais" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Localize o problema em um mapa da área ou zona" @@ -1512,14 +1460,14 @@ msgstr "Mês" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Nome" @@ -1543,8 +1491,8 @@ msgstr "Nomeado rodoviário mais próximo ao pino colocado no mapa (gerado autom msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Código postal mais próximo do pino colocado no mapa (gerado automaticamente): %s (%sm distância)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1569,7 +1517,7 @@ msgstr "Novos <br>problemas" msgid "New body added" msgstr "Novo corpo adicionado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Novo contato de categoria adicionado" @@ -1634,7 +1582,7 @@ msgstr "Proximo" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nao" @@ -1699,8 +1647,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Nao responsavel" @@ -1733,7 +1681,7 @@ 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 "Note que quando incluimos relatos não confirmados usamos a data em que o relatório foi criado, que pode não estar no mesmo mês em que o relatório foi confirmado de modo que os números podem estar alterados." -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1747,15 +1695,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Agora, para apresentar o seu relatório ..." #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Agora, para apresentar a sua atualização ..." @@ -1789,8 +1737,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1825,13 +1773,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1856,7 +1804,7 @@ msgstr "Parente" msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1865,7 +1813,7 @@ msgid "Password (optional)" msgstr "Password (opcional)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Password:" @@ -1873,7 +1821,7 @@ msgstr "Password:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1889,13 +1837,21 @@ msgid "Phone:" msgstr "Telefone:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1919,8 +1875,8 @@ msgstr "Coloque a fix pin no mapa" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1936,16 +1892,16 @@ msgstr "Por favor, seja educado, objectivo, conciso e direto ao ponto." msgid "Please check the passwords and try again" msgstr "Por favor verifique as senhas e tente novamente" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Favor verificar se seu email esta correcto" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1955,7 +1911,7 @@ msgstr "Escolher uma categoria" msgid "Please choose a property type" msgstr "Por favor, escolha um tipo de imóvel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1979,11 +1935,10 @@ msgstr "" msgid "Please enter a message" msgstr "Por favor insira uma mensagem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Digite seu nome" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1997,10 +1952,10 @@ msgstr "Por favor insira uma password" msgid "Please enter a subject" msgstr "Por favor insira um assunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2017,9 +1972,9 @@ msgid "Please enter some details" msgstr "Por favor, insira alguns detalhes" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2028,7 +1983,7 @@ msgid "Please enter your email" msgstr "Digite seu e-mail" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Por favor, insira o seu endereço de email" @@ -2044,7 +1999,7 @@ msgstr "Por favor, insira o seu nome completo, os conselhos precisam desta infor #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Digite seu nome" @@ -2071,7 +2026,7 @@ msgstr "Por favor, sinta-se livre para <a href=\\\"%s\\\"> se inscrever de novo msgid "Please fill in details of the problem below." msgstr "Por favor, preencha os detalhes do problema abaixo." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Por favor, preencha os detalhes do problema." @@ -2080,7 +2035,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique se você gostaria de receber um outro questionário" @@ -2089,9 +2044,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Por favor, note que as atualizações não são enviadas para o conselho." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Por favor, note o relatório ainda não foi enviado <strong> </strong>. Escolha uma categoria e acrescentar mais informações abaixo, em seguida, enviar." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2107,16 +2061,16 @@ msgstr "" msgid "Please note:" msgstr "Favor notar:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Favor fornecer uma explicação de por que você está reabrindo este relatório" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 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:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Por favor, diga se você já relatou um problema para o seu conselho antes" @@ -2132,22 +2086,23 @@ msgstr "Por favor, selecione o feed que deseja" msgid "Please select the type of alert you want" msgstr "Selecione o tipo de alerta que deseja" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Por favor, indique se o problema foi corrigido" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Faça upload somente de uma imagem em JPEG " #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Por favor, escreva uma mensagem" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Por favor, escreva a sua atualização aqui" @@ -2178,7 +2133,7 @@ msgstr "" msgid "Previous" msgstr "Anterior" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2188,7 +2143,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2217,7 +2172,7 @@ msgstr "Problema %s enviado ao conselho %s" msgid "Problem breakdown by state" msgstr "Colapso problema por estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problema marcado como aberto." @@ -2229,10 +2184,6 @@ msgstr "Mudança de estado do problema com base nos resultados da pesquisa" msgid "Problems" msgstr "Problemas" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemas nesta área" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemas nas proximidades" @@ -2250,13 +2201,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemas dentro de %.1fkm deste local" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemas dentro de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemas dentro de %s ala" @@ -2275,15 +2224,11 @@ msgstr "Problemas dentro do limite de:" msgid "Property address:" msgstr "Endereço do imóvel:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Tipo de propriedade:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Fornecer uma atualização" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2317,16 +2262,15 @@ 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:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Questionário preenchido por problema repórter" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS feed" @@ -2354,18 +2298,12 @@ msgstr "RSS feed de %s, %s problemas pendentes" msgid "RSS feed of nearby problems" msgstr "RSS feed dos problemas próximos" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS feed dos problemas nesta %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed dos Problemas Nesta %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed dos problemas dentro de %s ala" @@ -2375,14 +2313,13 @@ msgstr "RSS feed dos problemas dentro de %s ala" msgid "RSS feed of recent local problems" msgstr "RSS feed dos problemas locais recentes" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS feed de atualizações para este problema" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "RSS feed dos problemas locais recentes" @@ -2418,12 +2355,11 @@ msgstr "Remover foto (não pode ser desfeita!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2433,7 +2369,7 @@ msgstr "Comunicar um problema" msgid "Report abuse" msgstr "Denunciar um abuso" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Relatório sobre %s" @@ -2448,7 +2384,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Relatório, vista, ou discutir os problemas locais" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Relatado anonimamente em %s" @@ -2458,7 +2394,7 @@ msgstr "Relatado anonimamente em %s" msgid "Reported before" msgstr "Relatado antes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Relatado por %s em %s" @@ -2472,27 +2408,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Relatado na categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Relatado na categoria %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Relatado por %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Relatado por %s por%s em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Relatado por %s na categoria %s por %s em %s" @@ -2513,7 +2449,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Relatando um problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2556,15 +2492,15 @@ msgstr "Operador de estrada por esta estrada chamada (derivado do número de ref msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador de estrada por esta estrada chamada (a partir de OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Girar para a esquerda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2579,7 +2515,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2635,7 +2571,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Enviado para %s %s mais tarde" @@ -2654,21 +2590,21 @@ msgstr "Acçao" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Mostrar meu nome publicamente" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Mostrar antigo" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Mostrar pins" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2727,9 +2663,8 @@ msgstr "Desculpe, não conseguimos encontrar esse local." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Desculpe, mas não foi possÃvel analisar esse local. Por favor, tente novamente." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2737,15 +2672,10 @@ msgstr "Desculpe, mas não foi possÃvel analisar esse local. Por favor, tente n msgid "Sorry, we could not parse that location. Please try again." msgstr "Desculpe, mas não foi possÃvel analisar esse local. Por favor, tente novamente." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mais tarde." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2754,7 +2684,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Estado" @@ -2767,7 +2697,7 @@ msgstr "Estado" msgid "State:" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2807,10 +2737,10 @@ msgid "Subject:" msgstr "Assunto:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Submeter" @@ -2838,9 +2768,8 @@ msgstr "Submeter questionario" msgid "Submitted" msgstr "Submitido" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Subscrever" @@ -2848,7 +2777,7 @@ msgstr "Subscrever" msgid "Subscribe me to an email alert" msgstr "Subcrever um alerta de e-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2867,7 +2796,7 @@ msgstr "Resumo" msgid "Summary reports" msgstr "Resumo reports" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Teste" @@ -2924,7 +2853,7 @@ msgstr "Obrigado por upload de sua foto. Precisamos agora de localizar o seu pro msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Obrigado, gratos em ouvir que o problema foi corrigido! Podemos apenas perguntar se você já relatou um problema para um conselho antes?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 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." @@ -2932,7 +2861,7 @@ msgstr "Essa imagem não parece ter sido carregada corretamente (%s), por favor msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Esse local não parece ser coberto por um conselho, talvez seja no mar ou fora do paÃs. Por favor, tente novamente." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2942,11 +2871,11 @@ msgstr "Esse local não parece estar em Mindelo, por favor tente novamente." 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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Esse problema agora será reenviado e reportado ao conselho." @@ -2958,7 +2887,7 @@ msgstr "Esse relatório não pode ser visualizado em %s." msgid "That report has been removed from FixMyStreet." msgstr "Esse relatório foi removido FixMyStreetMIndelo" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3098,9 +3027,9 @@ msgstr "Houve um problema ao mostrar a página de todos os relatórios. Por favo msgid "There was a problem showing this page. Please try again later." msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mais tarde." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Houve um problema com o email / combinação de senha. Se você não lembra da sua senha, ou não tiver um, por favor preencha o \"sinal de colocar e-mail 'seção do formulário." @@ -3161,9 +3090,9 @@ msgstr "Este e-mail foi enviado para ambos os conselhos que cobrem o local do pr msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Este e-mail foi enviado para vários conselhos que cobrem o local do problema, como a categoria selecionada é fornecida para todos eles, por favor, ignorar se você não é o conselho correto para lidar com o problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Esta informação é necessária" @@ -3176,11 +3105,11 @@ msgstr "Este é um site do desenvolvedor, as coisas podem quebrar a qualquer mom msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Este problema foi resolvido" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Este problema não foi corrigido" @@ -3217,7 +3146,7 @@ msgstr "Esta página também contém uma foto do problema, fornecido pelo usuár msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Timeline" @@ -3262,8 +3191,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Incapaz de ser resolvido" @@ -3280,7 +3209,7 @@ msgstr "Não confirmado" msgid "Unknown" msgstr "Desconhecido" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Tipo de alerta desconhecido" @@ -3295,7 +3224,7 @@ msgstr "Erro desconhecido" msgid "Unknown problem ID" msgstr "Desconhecido problema com ID" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Actualizar" @@ -3347,10 +3276,10 @@ msgstr "Atualizar status" msgid "Updated" msgstr "Atualizado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3377,7 +3306,7 @@ msgstr "Atualizações sobre {{tÃtulo}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3386,11 +3315,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Bandeira usuário removida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Usuário sinalizado" @@ -3398,16 +3327,16 @@ msgstr "Usuário sinalizado" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Usuários" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Valores atualizados" @@ -3444,16 +3373,15 @@ msgstr "Encontramos mais de uma correspondência para essa localização. Mostra #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Nós nunca divulgaremos o seu endereço de e-mail ou número de telefone." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nós nunca divulgaremos o seu e-mail" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 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." @@ -3462,7 +3390,7 @@ msgstr "Nós nunca divulgaremos o seu endereço de e-mail ou número de telefone 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." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Nós enviá-lo para o conselho em seu nome" @@ -3500,10 +3428,6 @@ msgstr "Quando enviar" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3523,7 +3447,7 @@ msgstr "Com o pedido de pesquisa, também é possÃvel pesquisar agency_responsa 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Gostaria de receber um questionário em 4 semanas, lembrando que você verifique o status?" @@ -3553,8 +3477,8 @@ msgstr "Ano" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Sim" @@ -3668,19 +3592,19 @@ msgid "Your Reports" msgstr "Seus relatorios" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Seu e-mail" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3691,17 +3615,17 @@ msgstr "O seu endereço de email" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Suas informações só serão utilizadas de acordo com nossa <a href=\"/privacy\"> polÃtica de privacidade </a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Nome" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3714,20 +3638,19 @@ msgstr "Sua password foi alterada" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Telefone " #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Seus relatórios" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Seus relatórios" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Suas atualizações" @@ -3753,7 +3676,7 @@ msgid "didn't use map" msgstr "não usar o mapa" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "por exemplo '%s' ou '%s'" @@ -3859,8 +3782,7 @@ msgstr "outras áreas:" msgid "reopened" msgstr "reaberto" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "sair" @@ -3938,7 +3860,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> atualização em relatório" msgstr[1] "<big>%s</big> atualização los Relatorios" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3980,89 +3902,44 @@ 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 "(we never show your email address or phone number)" -#~ msgstr "(é confidencial seu email e seu numero de telefone)" - -#~ msgid "(we never show your email)" -#~ msgstr "(seu email não será divulgado)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ 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:" - -#~ msgid "Email me updates" -#~ msgstr "Envie-me atualizações" - -#~ msgid "Enter a new password:" -#~ msgstr "Digite uma nova senha:" - -#~ 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" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "" -#~ "Se você usar o e-mail baseado na web ou filtros têm\" junk mail \", você pode querer\"\n" -#~ "\"Verifique suas pastas de correio em massa / spam: à s vezes, nossas mensagens são marcadas que\"\n" -#~ "\"Caminho\"" - -#~ msgid "Message:" -#~ msgstr "Menssagem" - -#~ msgid "More problems nearby" -#~ msgstr "Mais problemas próximos" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Quase pronto! Agora, verifique seu e-mail ..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Ofensivo? Inadequado? Informem-nos" - -#~ msgid "Photo:" -#~ msgstr "Foto" - -#~ msgid "Please check your email" -#~ msgstr "Favor verificar seu email" - -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Por favor, note que as atualizações Localidade: Não São enviadas par o Conselho. Se Você. deixar Seu Nome Será, Público. SUAS Informations Só Serao utilizadas according to Nossa <a href=\"/faq#privacy\"> Politica de Privacidade </a>" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, reportou em %s" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Isso pode ser porque o link é velho demais ou já foi utilizado, ou o endereço não foi copiado corretamente." +#~ msgid "About us" +#~ msgstr "Acerca de nós" -#~ msgid "This problem has been closed" -#~ msgstr "Este problema esta solucionado." +#~ msgid "Email me new local problems" +#~ msgstr "Enviar novos problemas locais" -#~ msgid "This problem is in progress" -#~ msgstr "Este problema está em progresso" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Apartamento vazio ou duplex" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Este problema é antigo e de status desconhecido." +#~ msgid "Empty house or bungalow" +#~ msgstr "Casa vazia ou bungalow" -#~ msgid "Update:" -#~ msgstr "Actualizar:" +#~ msgid "Empty office or other commercial" +#~ msgstr "Escritório vazio ou outro comercial" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Nós não temos sido capazes de confirmar a sua conta - desculpe." +#~ msgid "Empty pub or bar" +#~ msgstr "Pub ou bar vazio" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Nós enviamos um e-mail contendo um link para confirmar sua conta." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "EdifÃcio público vazio - escola, hospital, etc" -#~ 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>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreetMindelo" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Você já anexou uma foto com este relatório, anexando outro irá substituÃ-lo." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Tenho receio de nao puder confirmar os seus relatorios" -#~ 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." +#~ msgid "Problems in this area" +#~ msgstr "Problemas nesta área" -#~ msgid "Your email:" -#~ msgstr "Seu e-mail:" +#~ msgid "Property type:" +#~ msgstr "Tipo de propriedade:" -#~ msgid "Your name:" -#~ msgstr "Nome" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS feed dos problemas nesta %s" -#~ msgid "Your email:" -#~ msgstr "Seu e-mail:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Bloco inteiro de apartamentos vazios" diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po index 3af22b4c1..7b6c75452 100644 --- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:33+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Romanian (Romania) (http://www.transifex.com/mysociety/fixmystreet/language/ro_RO/)\n" "Language: ro_RO\n" @@ -23,7 +23,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "ÅŸi" @@ -92,7 +92,7 @@ msgstr "%s actualizări" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s chestionare trimise – %s completate (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -111,10 +111,6 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, raportat la %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -169,7 +165,7 @@ msgstr "(cum ar fi graffiti, gunoaie depozitate ilegal, pavaj spart sau iluminat msgid "(not sent to council)" msgstr "(netrimis)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(opÈ›ional)" @@ -181,12 +177,11 @@ msgstr "(public)" msgid "(sent to both)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Alege o categorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Alege un tip de proprietate --" @@ -218,26 +213,21 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Despre noi" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -268,7 +258,7 @@ msgstr "Adaugă o categorie nouă" msgid "Add user" msgstr "Adaugă utilizator" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "" @@ -288,7 +278,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "" @@ -301,7 +291,7 @@ msgstr "" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -400,7 +390,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -431,7 +421,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -446,7 +436,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -466,19 +456,19 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -489,7 +479,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -530,8 +520,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -540,7 +530,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -566,7 +556,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -596,7 +586,7 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -615,7 +605,7 @@ msgid "Confirmed:" msgstr "" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -634,8 +624,8 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "" @@ -653,7 +643,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -672,7 +662,7 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "" @@ -716,20 +706,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -737,7 +727,7 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "" @@ -762,11 +752,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -784,8 +774,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -805,7 +795,7 @@ msgstr "" msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -835,7 +825,7 @@ msgstr "" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -843,11 +833,11 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -859,19 +849,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "" @@ -880,26 +865,6 @@ msgstr "" msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -943,18 +908,14 @@ msgstr "" 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "" @@ -980,7 +941,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1017,19 +978,15 @@ msgstr "" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "" @@ -1056,7 +1013,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1078,8 +1035,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1110,18 +1066,18 @@ msgstr "" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1134,7 +1090,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1160,7 +1116,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1171,8 +1127,7 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "" @@ -1188,11 +1143,11 @@ msgstr "" msgid "Hidden" msgstr "" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "" @@ -1212,10 +1167,6 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1226,7 +1177,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1248,7 +1199,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1269,7 +1220,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1304,10 +1255,10 @@ msgstr "" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "" @@ -1358,7 +1309,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "" @@ -1366,16 +1317,16 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "" @@ -1397,7 +1348,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1435,7 +1386,6 @@ msgstr "" #: 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 "" @@ -1444,11 +1394,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "" @@ -1508,14 +1458,14 @@ msgstr "" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "" @@ -1539,8 +1489,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1562,7 +1512,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1627,7 +1577,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "" @@ -1692,8 +1642,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1726,7 +1676,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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1740,15 +1690,15 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1782,8 +1732,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1818,13 +1768,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1849,7 +1799,7 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1858,7 +1808,7 @@ msgid "Password (optional)" msgstr "" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "" @@ -1866,7 +1816,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1882,13 +1832,21 @@ msgid "Phone:" msgstr "" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "" @@ -1912,8 +1870,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1929,16 +1887,16 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1948,7 +1906,7 @@ msgstr "" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1969,8 +1927,8 @@ msgstr "" msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" msgstr "" @@ -1986,10 +1944,10 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2006,9 +1964,9 @@ msgid "Please enter some details" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2017,7 +1975,7 @@ msgid "Please enter your email" msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "" @@ -2033,7 +1991,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -2060,7 +2018,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2069,7 +2027,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2095,16 +2053,16 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2120,22 +2078,22 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +msgid "Please upload an image only" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "" @@ -2166,7 +2124,7 @@ msgstr "" msgid "Previous" msgstr "" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2176,7 +2134,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2205,7 +2163,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "" @@ -2217,10 +2175,6 @@ msgstr "" msgid "Problems" msgstr "" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" @@ -2238,13 +2192,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2263,15 +2215,11 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2305,16 +2253,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "" @@ -2342,18 +2289,12 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2363,14 +2304,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2406,12 +2346,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2421,7 +2360,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2436,7 +2375,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2446,7 +2385,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2460,27 +2399,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2501,7 +2440,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2544,15 +2483,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2567,7 +2506,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2623,7 +2562,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2642,21 +2581,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2724,14 +2663,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2740,7 +2675,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2753,7 +2688,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2793,10 +2728,10 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "" @@ -2824,9 +2759,8 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2834,7 +2768,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2853,7 +2787,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2910,7 +2844,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2918,7 +2852,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2928,11 +2862,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2944,7 +2878,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3084,9 +3018,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3147,9 +3081,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3162,11 +3096,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "" @@ -3203,7 +3137,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3248,8 +3182,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3266,7 +3200,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3281,7 +3215,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3333,10 +3267,10 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3363,7 +3297,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3372,11 +3306,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3384,16 +3318,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3430,16 +3364,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "(nu afișăm niciodată adresa ta de email sau numărul de telefon)" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3448,7 +3381,7 @@ msgstr "" 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3486,10 +3419,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3509,7 +3438,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3539,8 +3468,8 @@ msgstr "" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -3654,19 +3583,19 @@ msgid "Your Reports" msgstr "Rapoartele dvs." #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3677,17 +3606,17 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3700,20 +3629,19 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Rapoartele dvs." +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" @@ -3739,7 +3667,7 @@ msgid "didn't use map" msgstr "" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3845,8 +3773,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3929,7 +3856,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3977,5 +3904,8 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "(we never show your email)" -#~ msgstr "(nu afișăm niciodată adresa ta de email)" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, raportat la %s" + +#~ msgid "About us" +#~ msgstr "Despre noi" diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po index 9c4844f21..c6c848247 100644 --- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-11-25 13:39+0000\n" -"Last-Translator: RU C2 <e2f54y54hgf@outlook.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Russian (http://www.transifex.com/mysociety/fixmystreet/language/ru/)\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "и" @@ -54,9 +54,8 @@ msgid "%s admin:" msgstr "ÐдминиÑтратор Ñайта %s:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "УчреждениÑ" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -97,7 +96,7 @@ msgstr "%s обновлений" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "Отправлено опроÑов: %s – получено ответов: %s (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -122,10 +121,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s район, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, отправлен в %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, в пределах района: %s" @@ -180,7 +175,7 @@ msgstr "(например: граффити, муÑор в Ð½ÐµÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ msgid "(not sent to council)" msgstr "(не отправлено в органы ÑамоуправлениÑ)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(необÑзательно)" @@ -192,12 +187,11 @@ msgstr "(общедоÑтупно)" msgid "(sent to both)" msgstr "(отправлено в обе инÑтанции)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Выберите категорию --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Выберите тип имущеÑтва --" @@ -232,26 +226,21 @@ msgstr "<strong>Ðет</strong> Я хочу подтвердить Ñвое об msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Ðет</strong> Я хочу подтвердить обновление Ñлектронным пиÑьмом" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: 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:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Да</strong> У Ð¼ÐµÐ½Ñ ÐµÑÑ‚ÑŒ пароль" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "О наÑ" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "ДейÑтвие запланировано" @@ -285,7 +274,7 @@ msgstr "Добавить категорию" msgid "Add user" msgstr "Добавить пользователÑ" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Добавлено: %s" @@ -305,7 +294,7 @@ msgstr "Создано уведомление «%d» длÑ: %s. Тип: %s, пРmsgid "Alert %d disabled (created %s)" msgstr "Уведомление «%d» отключено (Ñоздано: %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Оповещать Ð¼ÐµÐ½Ñ Ð¾Ð± обновлениÑÑ… в будущем" @@ -318,7 +307,7 @@ msgstr "Ð’Ñе Отчеты" msgid "All Reports as CSV" msgstr "Ð’Ñе Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð² виде CSV-файлов" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -417,7 +406,7 @@ msgstr "Ðазад" msgid "Ban email address" msgstr "Добавить Ð°Ð´Ñ€ÐµÑ Ñл. почты в черный ÑпиÑок" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -448,7 +437,7 @@ msgstr "Карта не отображаетÑÑ? <em>ПропуÑтите ÑÑ‚Ð #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -463,7 +452,7 @@ msgstr "КатегориÑ" msgid "Category fix rate for problems > 4 weeks old" msgstr "Процент уÑÑ‚Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÐ¿Ð¾Ð»Ð°Ð´Ð¾Ðº в Ñтой категории, которым больше 4 недель" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -483,7 +472,7 @@ msgstr "КатегориÑ: %s" msgid "Change password" msgstr "Сменить пароль" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -491,7 +480,7 @@ msgstr "" "Чтобы подтвердить доÑтоверноÑÑ‚ÑŒ контактных данных, поÑтавьте галочку в поле <strong>подтверждено</strong>.\n" " ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ ÑÐ¾Ð¼Ð½ÐµÐ½Ð¸Ñ Ð² доÑтоверноÑти Ñведений о контакте, оÑтавьте поле пуÑтым." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 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." @@ -499,7 +488,7 @@ msgstr "" "Чтобы удалить Ñту категорию, поÑтавьте галочку в поле<strong>удалено</strong> . \n" " ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ не будет отображатьÑÑ ÐºÐ°Ðº доÑÑ‚ÑƒÐ¿Ð½Ð°Ñ Ð² раÑкрывающемÑÑ Ð¼ÐµÐ½ÑŽ на Ñтранице подачи обращений." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -517,7 +506,7 @@ msgstr "" " имеют публичной ценноÑти. Ðапример: проÑьба обеÑпечить жителей определенного дома \n" " дополнительным муÑорным баком." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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,8 +549,8 @@ msgstr "Чтобы войти, пройдите по ÑÑылке, указанР#: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -570,7 +559,7 @@ msgstr "Чтобы войти, пройдите по ÑÑылке, указанРmsgid "Closed" msgstr "Закрыто" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Закрыто органом ÑамоуправлениÑ" @@ -596,7 +585,7 @@ msgstr "Данные о кобренде:" msgid "Cobrand:" msgstr "Кобренд:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "КонфигурациÑ" @@ -615,9 +604,8 @@ msgstr "Подтвердить аккаунт" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Подтвердите дейÑтвие, Ð²Ð²ÐµÐ´Ñ Ð°Ð´Ñ€ÐµÑ Ñвоей Ñлектронной почты ниже. ЗдеÑÑŒ же вам необходимо будет выбрать новый пароль. Он вÑтупит в Ñилу Ñразу поÑле подтверждениÑ." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -627,7 +615,7 @@ msgstr "Подтвердите дейÑтвие, Ð²Ð²ÐµÐ´Ñ Ð°Ð´Ñ€ÐµÑ ÑвоеРmsgid "Confirmation" msgstr "Подтверждение" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -646,7 +634,7 @@ msgid "Confirmed:" msgstr "Подтверждено:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "СвÑжитеÑÑŒ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ñайта %s" @@ -665,8 +653,8 @@ msgstr "СвÑжитеÑÑŒ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹" msgid "Coordinates:" msgstr "Координаты:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Ðе удалоÑÑŒ найти пользователÑ" @@ -684,7 +672,7 @@ msgstr "Орган ÑамоуправлениÑ" msgid "Council contacts for %s" msgstr "Контакты органа ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "СÑылка на орган ÑамоуправлениÑ: %s" @@ -703,7 +691,7 @@ msgstr "ПодÑчет" msgid "Create a report" msgstr "Создать обращение" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Создать категорию" @@ -747,20 +735,20 @@ msgstr "Панель управлениÑ" msgid "Dealt with by subdivision within 5 working days" msgstr "Ð’Ð¾Ð¿Ñ€Ð¾Ñ Ñ€ÐµÑˆÐµÐ½ подразделением в течение 5 рабочих дней" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Удалить шаблон" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Удалено" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -768,7 +756,7 @@ msgid "Description" msgstr "ОпиÑание" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ" @@ -793,11 +781,11 @@ msgid "Diligency prize league table" msgstr "Таблица Ñамых активных пользователей" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ пароль на Ñайте %s?" @@ -815,8 +803,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Создать копию" @@ -840,7 +828,7 @@ msgstr "" msgid "Edit" msgstr "Редактировать" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Редактировать информацию об учреждении" @@ -870,7 +858,7 @@ msgstr "Редактор" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -878,11 +866,11 @@ msgstr "Редактор" msgid "Email" msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты добавлен в черный ÑпиÑок" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты:" @@ -894,19 +882,14 @@ msgstr "Создано уведомление по Ñл. почте" msgid "Email alert deleted" msgstr "Уведомление по Ñл. почте удалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Ðтот Ð°Ð´Ñ€ÐµÑ Ñл. почты уже находитÑÑ Ð² черном ÑпиÑке" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "ПриÑылайте мне Ñлектронные пиÑьма Ñ Ð¾Ð¿Ð¸Ñанием неполадок поблизоÑти" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты:" @@ -915,26 +898,6 @@ msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты:" msgid "Email: %s" msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "ПуÑÑ‚Ð°Ñ ÐºÐ²Ð°Ñ€Ñ‚Ð¸Ñ€Ð° или коттедж" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "ПуÑтой дом или бунгало" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "ПуÑтой Ð¾Ñ„Ð¸Ñ Ð¸Ð»Ð¸ коммерчеÑкое помещение" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "ПуÑтой паб или бар" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -985,18 +948,14 @@ msgstr "Введите Ð¸Ð½Ð´ÐµÐºÑ Ð±Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐµÐ³Ð¾ Ð¾Ñ‚Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ñв 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Введите пароль" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Подробно опишите проблему" @@ -1022,7 +981,7 @@ msgstr "Пример почтового индекÑа: %s" msgid "Examples:" msgstr "Примеры:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Опишите, что пошло не так, где Ñто произошло и как давно..." @@ -1059,19 +1018,15 @@ msgstr "Впервые" 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:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "ИÑправлено" @@ -1098,7 +1053,7 @@ msgstr "Пометить как удаленное" msgid "Flag user" msgstr "Пометить пользователÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Помечено" @@ -1120,8 +1075,7 @@ msgstr "Ðа помеченные аккаунты пользователей н msgid "Flagged:" msgstr "Помечено:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Чтобы поÑмотреть только обращениÑ, отноÑÑщиеÑÑ Ðº определенному району, перейдите по ÑÑылке на Ñтот район." @@ -1152,18 +1106,18 @@ msgstr "ЧаÑто задаваемые вопроÑÑ‹" msgid "GeoRSS on Google Maps" msgstr "GeoRSS в Google Картах" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Получать обновлениÑ" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Получать новоÑти о неполадках в:" @@ -1176,7 +1130,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Здорово, что проблема решена!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1202,7 +1156,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1213,8 +1167,7 @@ msgstr "Помощь" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "ЗдеÑÑŒ предÑтавлены типы уведомлений о неполадках поблизоÑти. Они указаны длÑ: ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Привет, %s!" @@ -1230,11 +1183,11 @@ msgstr "Привет, %s!" msgid "Hidden" msgstr "Скрыто" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Скрыть Ñтарые" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Скрыть метки" @@ -1254,10 +1207,6 @@ msgstr "Как Ñообщить о проблеме" msgid "How to send successful reports" msgstr "Как уÑпешно Ñоздавать и отправлÑÑ‚ÑŒ обращениÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1268,7 +1217,7 @@ msgstr "Я Ñообщаю о проблеме на @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Я обновлÑÑŽ информацию о проблеме на @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Ðам не удалоÑÑŒ найти ваше обращение в базе данных.\n" @@ -1292,7 +1241,7 @@ msgstr "" "Введите название <strong>ответÑтвенной организации</strong> еÑли Ñто учреждение работает под началом другой организации.\n" " Ð’ Ñлучае Ñ Ð±Ð°Ð·Ð¾Ð²Ñ‹Ð¼Ð¸ уÑтановками вам не нужно объединÑÑ‚ÑŒ учреждениÑ." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1317,7 +1266,7 @@ msgstr "" "ЕÑли вы хотите внеÑти новую публичную информацию о неполадке,\n" "введите ее здеÑÑŒ (важно: новые данные не будут отправлены в орган ÑамоуправлениÑ)." -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 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) или его Ñквивалент." @@ -1360,10 +1309,10 @@ msgstr "Ðеверный идентификатор" msgid "Illegal feed selection" msgstr "Ðеверно выбран фид" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Ð’ процеÑÑе" @@ -1414,7 +1363,7 @@ msgstr "Внутренний реферал" msgid "Invalid agency_responsible value %s" msgstr "Ðеверно задано значение agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ðеверно указана дата окончаниÑ" @@ -1422,16 +1371,16 @@ msgstr "Ðеверно указана дата окончаниÑ" msgid "Invalid format %s specified." msgstr "Ðеверно задан формат: %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ðеверно указана дата начала" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "РаÑÑледование" @@ -1453,7 +1402,7 @@ msgstr "ЮриÑÐ´Ð¸ÐºÑ†Ð¸Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтна" msgid "Jurisdiction unknown" msgstr "ЮриÑÐ´Ð¸ÐºÑ†Ð¸Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтна" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1491,7 +1440,6 @@ msgstr "Загрузка..." #: 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 "МеÑтные RSS-фиды и ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте" @@ -1500,11 +1448,11 @@ msgstr "МеÑтные RSS-фиды и ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. Ð¿Ð¾Ñ‡Ñ msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "МеÑтные RSS-фиды и ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте (‘%s’)" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "МеÑтные уведомлениÑ" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Укажите на карте меÑтоположение проблемы" @@ -1564,14 +1512,14 @@ msgstr "МеÑÑц" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "ИмÑ" @@ -1595,8 +1543,8 @@ msgstr "Ð‘Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐ°Ñ Ðº метке дорога (генерируетÑÑ msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ближайший к метке почтовый Ð¸Ð½Ð´ÐµÐºÑ (генерируетÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки): %s (%sm мил.)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Ð‘Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐ°Ñ Ðº метке дорога (генерируетÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки Ñ Ð¸Ñпользованием ÑервиÑа Bing Maps): %s" @@ -1620,7 +1568,7 @@ msgstr "Ðовые <br>неполадки" msgid "New body added" msgstr "Добавлено новое учреждение" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Добавлен новый контакт в категории" @@ -1685,7 +1633,7 @@ msgstr "Далее" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Ðет" @@ -1756,8 +1704,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "ОтветÑтвенноÑти не неÑет" @@ -1790,7 +1738,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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1804,15 +1752,15 @@ msgstr "Примечание: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "Заметки SDM Ð´Ð»Ñ DM" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Теперь обращение можно отправить…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Теперь обновление можно отправить…" @@ -1846,8 +1794,8 @@ msgstr "Краткое резюме" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1882,13 +1830,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1913,7 +1861,7 @@ msgstr "РодительÑкаÑ" msgid "Partial" msgstr "ЧаÑтичнаÑ" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1922,7 +1870,7 @@ msgid "Password (optional)" msgstr "Пароль (необÑзательно)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Пароль:" @@ -1930,7 +1878,7 @@ msgstr "Пароль:" msgid "Permalink" msgstr "ПоÑтоÑÐ½Ð½Ð°Ñ ÑÑылка" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Ðомер телефона" @@ -1946,13 +1894,21 @@ msgid "Phone:" msgstr "Телефон:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Фото" @@ -1976,8 +1932,8 @@ msgstr "ПоÑтавить метку на карте" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1993,16 +1949,16 @@ msgstr "Будьте вежливы, выражайте Ñвои мыÑли кр msgid "Please check the passwords and try again" msgstr "Проверьте пароли и попробуйте еще раз" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Проверьте правильноÑÑ‚ÑŒ напиÑÐ°Ð½Ð¸Ñ Ð°Ð´Ñ€ÐµÑа Ñл. почты" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2012,7 +1968,7 @@ msgstr "Выберите категорию" msgid "Please choose a property type" msgstr "Выберите тип имущеÑтва" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "ИÑправьте ошибки ниже" @@ -2036,11 +1992,10 @@ msgstr "Будьте вежливы! Грубые, некорректные об msgid "Please enter a message" msgstr "Введите текÑÑ‚ ÑообщениÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Введите Ñвое имÑ" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2054,10 +2009,10 @@ msgstr "Введите пароль" msgid "Please enter a subject" msgstr "Введите тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2074,9 +2029,9 @@ msgid "Please enter some details" msgstr "Введите дополнительную информацию" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2085,7 +2040,7 @@ msgid "Please enter your email" msgstr "Введите Ñвой Ñл. адреÑ" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Введите Ð°Ð´Ñ€ÐµÑ Ñвоей Ñл. почты" @@ -2101,7 +2056,7 @@ msgstr "Введите Ñвое полное имÑ. Ðта Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Введите Ñвое имÑ" @@ -2128,7 +2083,7 @@ msgstr "Ð’Ñ‹ можете еще раз <a href=\"%s\">войти на Ñайт< msgid "Please fill in details of the problem below." msgstr "Подробно раÑÑкажите о неполадке в поле ниже." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Подробно опишите проблему." @@ -2137,7 +2092,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Укажите, хотите ли вы еще один опроÑник" @@ -2146,9 +2101,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Важно: новые данные не отÑылаютÑÑ Ð² органы ÑамоуправлениÑ." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Внимание! Ваше обращение <strong>не было отправлено</strong>. Чтобы завершить процеÑÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, выберите нужную категорию и добавьте информацию ниже." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2164,16 +2118,16 @@ msgstr "" msgid "Please note:" msgstr "Внимание:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "ПоÑÑните, почему вы решили заново отправить Ñто обращение" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "ПредоÑтавьте не только фото, но и пиÑьменный комментарий" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Ð’Ñ‹ впервые отправлÑете обращение в ваш орган ÑамоуправлениÑ?" @@ -2189,22 +2143,23 @@ msgstr "Выберите раÑÑылку" msgid "Please select the type of alert you want" msgstr "Выберите тип уведомлениÑ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Сообщите о ÑтатуÑе неполадки: проблема была решена?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Ð’Ñ‹ можете загружать только Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð² формате JPEG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Ðапишите Ñообщение" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Введите новые данные здеÑÑŒ" @@ -2235,7 +2190,7 @@ msgstr "Ðа базе платформы <a class=\"platform-logo\" href=\"http: msgid "Previous" msgstr "ПредыдущаÑ" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "КонфиденциальноÑÑ‚ÑŒ" @@ -2245,7 +2200,7 @@ msgstr "КонфиденциальноÑÑ‚ÑŒ" msgid "Privacy and cookies" msgstr "КонфиденциальноÑÑ‚ÑŒ и файлы cookie" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2274,7 +2229,7 @@ msgstr "Проблема (%s) отправлена в орган ÑамоупрРmsgid "Problem breakdown by state" msgstr "Сортировка проблем по ÑтатуÑу" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Проблема помечена как открытаÑ." @@ -2286,10 +2241,6 @@ msgstr "Смена ÑтатуÑа проблемы на оÑновании реРmsgid "Problems" msgstr "Проблемы" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Проблемы в Ñтой меÑтноÑти" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Проблемы поблизоÑти" @@ -2307,13 +2258,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Проблемы в пределах %.1fkm от Ñтого меÑта" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Проблемы в пределах Ñтого меÑта: %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Проблемы в пределах Ñтого района: %s" @@ -2332,15 +2281,11 @@ msgstr "Проблемы в пределах Ñтого меÑта:" msgid "Property address:" msgstr "ÐÐ´Ñ€ÐµÑ Ð¸Ð¼ÑƒÑ‰ÐµÑтва:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Тип имущеÑтва:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "ПредоÑтавить новые данные" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "Ð˜Ð¼Ñ Ð¸ пароль необÑзательны. Ðо когда вы предоÑтавите Ñти данные, вы Ñможете быÑтрее Ñообщать о проблемах, вводить новые данные о них и редактировать Ñвои обращениÑ." @@ -2374,16 +2319,15 @@ msgstr "ÐžÐ¿Ñ€Ð¾Ñ (%d) заполнен Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ «%d» (%s — msgid "Questionnaire %d sent for problem %d" msgstr "ÐžÐ¿Ñ€Ð¾Ñ (%d) отправлен Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ «%d»" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "ÐžÐ¿Ñ€Ð¾Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½ автором обращениÑ" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-фид" @@ -2411,18 +2355,12 @@ msgstr "%s: RSS-фид, в пределах района: %s" msgid "RSS feed of nearby problems" msgstr "RSS-фид о проблемах поблизоÑти" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS-фид о проблемах здеÑÑŒ: %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-фид о проблемах в пределах: %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-фид о проблемах в пределах района: %s" @@ -2432,14 +2370,13 @@ msgstr "RSS-фид о проблемах в пределах района: %s" msgid "RSS feed of recent local problems" msgstr "RSS-фид о недавних проблемах поблизоÑти" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS-фид об обновлениÑÑ… по Ñтой проблеме" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Получать Ñл. пиÑьма об обновлениÑÑ… по Ñтой проблеме." @@ -2475,12 +2412,11 @@ msgstr "Удалить фото (дейÑтвие отменить невозмРmsgid "Reply to user:" msgstr "Ответить пользователю:" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Сообщить" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2490,7 +2426,7 @@ msgstr "Сообщить о проблеме" msgid "Report abuse" msgstr "Сообщить об оÑкорбительном поведении" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Сообщить о пользователе: %s" @@ -2505,7 +2441,7 @@ msgstr "Сообщить о Ñвоей проблеме" msgid "Report, view, or discuss local problems" msgstr "ГородÑкие проблемы. Сообщайте, проÑматривайте, обÑуждайте." -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Сообщено анонимно в: %s" @@ -2515,7 +2451,7 @@ msgstr "Сообщено анонимно в: %s" msgid "Reported before" msgstr "Сообщено ранее" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Ðвтор обращениÑ: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" @@ -2529,27 +2465,27 @@ msgstr "Ðвтор обращениÑ:" msgid "Reported in the %s category" msgstr "Обращение отнеÑено к категории: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Обращение (категориÑ: %s) отправлено анонимно в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Обращение (категориÑ: %s), автор: %s, отправлено в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Ðнонимно отправлено через: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Отправлено через: %s, автор: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Ðнонимно отправлено через: %s, категориÑ: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Отправлено через: %s, категориÑ: %s, автор обращениÑ: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" @@ -2570,7 +2506,7 @@ msgstr "Обращение отправлено:" msgid "Reporting a problem" msgstr "Сообщение о проблеме" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2613,15 +2549,15 @@ msgstr "Дорога находитÑÑ Ð² ведении: %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Дорога находитÑÑ Ð² ведении (Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸Ð· реÑурÑа OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Повернуть влево" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2636,7 +2572,7 @@ msgstr "Перед поворотом фото необходимо Ñохран msgid "Satellite" msgstr "Спутник" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2692,7 +2628,7 @@ msgstr "Выберите тип уведомлениÑ, а затем либо msgid "Sent report back" msgstr "Обращение возвращено" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Отправлено позже: %s %s" @@ -2711,21 +2647,21 @@ msgstr "ПоделитьÑÑ" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Показывать мое Ð¸Ð¼Ñ Ð½Ð° Ñайте" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Показать давние" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Показать метки" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2786,9 +2722,8 @@ msgstr "Ðе удалоÑÑŒ найти Ñто меÑтоположение." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Ðе удалоÑÑŒ проанализировать Ñто меÑтоположение. Повторите попытку." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2796,15 +2731,10 @@ msgstr "Ðе удалоÑÑŒ проанализировать Ñто меÑтоп msgid "Sorry, we could not parse that location. Please try again." msgstr "Ðе удалоÑÑŒ проанализировать Ñто меÑтоположение. Повторите попытку." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Ðе удалоÑÑŒ Ñохранить фото. Повторите попытку." -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "При загрузке Ñтраницы произошла ошибка. Повторите попытку позже." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Дата начала:" @@ -2813,7 +2743,7 @@ msgstr "Дата начала:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "СтатуÑ" @@ -2826,7 +2756,7 @@ msgstr "СтатуÑ" msgid "State:" msgstr "СтатуÑ:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2866,10 +2796,10 @@ msgid "Subject:" msgstr "Тема:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Отправить" @@ -2897,9 +2827,8 @@ msgstr "Отправить опроÑ" msgid "Submitted" msgstr "Отправлено" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "ПодпиÑатьÑÑ" @@ -2907,7 +2836,7 @@ msgstr "ПодпиÑатьÑÑ" msgid "Subscribe me to an email alert" msgstr "ПриÑылать мне ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2926,7 +2855,7 @@ msgstr "Итог" msgid "Summary reports" msgstr "Отчеты об итогах" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "ОпроÑ" @@ -2983,7 +2912,7 @@ msgstr "СпаÑибо за предоÑтавленное фото. Ð¢ÐµÐ¿ÐµÑ€Ñ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Мы рады узнать, что проблема решена! Ðто было ваше первое обращение в орган ÑамоуправлениÑ?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "КажетÑÑ, возникли трудноÑти Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¾Ð¹ фото (%s).Повторите попытку." @@ -2991,7 +2920,7 @@ msgstr "КажетÑÑ, возникли трудноÑти Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¾Ð msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "КажетÑÑ, Ñто меÑтоположение не находитÑÑ Ð² ведении органа ÑамоуправлениÑ. Возможно, им заведует другое учреждение или же вы указали меÑто в другой Ñтране. Попробуйте еще раз." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "Ðто меÑтоположение находитÑÑ Ð·Ð° пределами Великобритании. Повторите попытку." @@ -3001,11 +2930,11 @@ msgstr "Ðто меÑтоположение находитÑÑ Ð·Ð° предел msgid "That postcode was not recognised, sorry." msgstr "Ðе удалоÑÑŒ раÑпознать индекÑ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Проблема помечена как отправленнаÑ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð¼Ñ‹ еще раз отправим Ñто обращение." @@ -3017,7 +2946,7 @@ msgstr "ПроÑмотр Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½ на Ñтом Ñ msgid "That report has been removed from FixMyStreet." msgstr "Ðто обращение было удалено Ñ Ñайта FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3169,9 +3098,9 @@ msgstr "При загрузке Ñтраницы «ВÑе обращениÑ» Ð msgid "There was a problem showing this page. Please try again later." msgstr "При загрузке Ñтраницы произошла ошибка. Повторите попытку позже." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ пароль указаны неверно. ЕÑли вы не помните Ñвой пароль или у Ð²Ð°Ñ ÐµÐ³Ð¾ нет, заполните форму «Вход Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ адреÑа Ñл. почты»." @@ -3242,9 +3171,9 @@ msgstr "ПоÑкольку пользователь не обозначил ка msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "ПоÑкольку пользователь обозначил категорию проблемы, находÑщейÑÑ Ð² ведении неÑкольких органов ÑамоуправлениÑ, мы отправили Ñто пиÑьмо во вÑе Ñти инÑтанции. ЕÑли Ð´Ð°Ð½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° находитÑÑ Ð²Ð½Ðµ вашей ответÑтвенноÑти, игнорируйте Ñто обращение." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Ðта Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÑвлÑетÑÑ Ð¾Ð±Ñзательной" @@ -3257,11 +3186,11 @@ msgstr "Ðто Ñайт разработчиков, поÑтому в его Ñ„Ñ msgid "This is a summary of all reports on this site." msgstr "Ðто ÐºÑ€Ð°Ñ‚ÐºÐ°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾ вÑем обращениÑм на Ñайте." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Ðта проблема была решена" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Ðта проблема не была решена" @@ -3298,7 +3227,7 @@ msgstr "Ðта веб-Ñтраница также Ñодержит фото не msgid "Time spent (in minutes):" msgstr "Времени потрачено (в минутах):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Временной отрезок" @@ -3343,8 +3272,8 @@ msgstr "Ðапишите нам:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Ðевозможно уÑтранить" @@ -3361,7 +3290,7 @@ msgstr "Ðе подтверждено" msgid "Unknown" msgstr "Ðеизв." -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "ÐеизвеÑтный тип уведомлениÑ" @@ -3376,7 +3305,7 @@ msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" msgid "Unknown problem ID" msgstr "ÐеизвеÑтный идентификатор проблемы" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Обновление" @@ -3428,10 +3357,10 @@ msgstr "Обновление ÑтатуÑов" msgid "Updated" msgstr "Обновлено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3458,7 +3387,7 @@ msgstr "Ðовые данные длÑ: {{title}}" msgid "Updates to this problem, %s" msgstr "Ðовые данные Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹: %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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>, чтобы предоÑтавить дополнительную информацию Ð´Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора. Заметки не видны другим пользователÑм и не отправлÑÑŽÑ‚ÑÑ Ð² органы ÑамоуправлениÑ." @@ -3467,11 +3396,11 @@ msgstr "ИÑпользуйте <strong>заметки</strong>, чтобы прРmsgid "Used map" msgstr "ИÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð°" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Пометка удалена" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Ðккаунт Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½" @@ -3479,16 +3408,16 @@ msgstr "Ðккаунт Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½" msgid "User search finds matches in users' names and email addresses." msgstr "При поиÑке пользователей на Ñайте ÑиÑтема находит ÑоответÑÑ‚Ð²Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ именами пользователей и адреÑами Ñл. почты." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Пользователи" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹" @@ -3525,16 +3454,15 @@ msgstr "Мы нашли более одного ÑоответÑÑ‚Ð²Ð¸Ñ ÑтоР#: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Мы никому не будем показывать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты или номер телефона" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Мы никому не будем показывать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Мы никому не будем показывать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты или номер телефона" @@ -3543,7 +3471,7 @@ msgstr "Мы никому не будем показывать ваш Ð°Ð´Ñ€ÐµÑ 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Данные будут отправлены в орган ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ вашего имени" @@ -3581,10 +3509,6 @@ msgstr "Когда были отправлены данные" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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> беÑплатно." @@ -3604,7 +3528,7 @@ msgstr "С помощью поиÑка по запроÑу можно иÑкат 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Хотите получить еще один Ð¾Ð¿Ñ€Ð¾Ñ Ñ‡ÐµÑ€ÐµÐ· 4 недели? Ð’ нем мы напомним вам проверить ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ." @@ -3634,8 +3558,8 @@ msgstr "Год" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Да" @@ -3705,9 +3629,8 @@ msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обращен #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обращении. Важно: можно прикрепить не более 3 фото (еÑли выбрать больше изображений, они заменÑÑ‚ прикрепленные ранее)." +msgstr "" #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3756,19 +3679,19 @@ msgid "Your Reports" msgstr "Ваши обращениÑ" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Ваш Ñл. адреÑ" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3779,17 +3702,17 @@ msgstr "Ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Мы обÑзуемÑÑ Ð¸Ñпользовать предоÑтавленные вами перÑональные данные в ÑоответÑтвии Ñ Ð½Ð°ÑˆÐµÐ¹ <a href=\"/privacy\">политикой конфиденциальноÑти</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ваше имÑ" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3802,20 +3725,19 @@ msgstr "Ваш пароль был изменен" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ваш номер телефона" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Ваши обращениÑ" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Ваши обращениÑ" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Ваши обновлениÑ" @@ -3841,7 +3763,7 @@ msgid "didn't use map" msgstr "карта не иÑпользовалаÑÑŒ" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "напр.: ‘%s’ или ‘%s’" @@ -3947,8 +3869,7 @@ msgstr "другие облаÑти" msgid "reopened" msgstr "заново открыто" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "выйти" @@ -4036,7 +3957,7 @@ msgstr[1] "<big>%s</big> Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ð¹" msgstr[2] "<big>%s</big> обновлений обращений" msgstr[3] "<big>%s</big> обновлений обращений" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -4090,86 +4011,47 @@ msgstr[1] "У Ð½Ð°Ñ Ð¿Ð¾ÐºÐ° <strong>нет</strong> подробной инфРmsgstr[2] "У Ð½Ð°Ñ Ð¿Ð¾ÐºÐ° <strong>нет</strong> подробной информации об органах ÑамоуправлениÑ, в ведении которых находитÑÑ Ñто меÑто." msgstr[3] "У Ð½Ð°Ñ Ð¿Ð¾ÐºÐ° <strong>нет</strong> подробной информации об органах ÑамоуправлениÑ, в ведении которых находитÑÑ Ñто меÑто." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(мы не будем отображать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты или номер телефона)" - -#~ msgid "(we never show your email)" -#~ msgstr "(мы не будем отображать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Ðет</strong>, Ñ Ñ…Ð¾Ñ‡Ñƒ подтвердить Ñвое обращение Ñлектронным пиÑьмом:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Ðет</strong>, Ñ Ñ…Ð¾Ñ‡Ñƒ подтвердить обновление Ñлектронным пиÑьмом:" - -#~ msgid "Email me updates" -#~ msgstr "ПриÑылайте мне Ñлектронные пиÑьма Ñ Ð½Ð¾Ð²Ñ‹Ð¼Ð¸ данными" - -#~ msgid "Enter a new password:" -#~ msgstr "Введите новый пароль:" - -#~ 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 "Ðам не удалоÑÑŒ подтвердить токен. Проверьте, правильно ли вы Ñкопировали Ð°Ð´Ñ€ÐµÑ URL из пиÑьма.\n" - -#~ 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 "ЕÑли вы пользуетеÑÑŒ почтовым веб-ÑервиÑом или уÑтановили Ñпам-фильтры, проверьте папку «Спам»: иногда ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚ нашей команды автоматичеÑки попадают туда." - -#~ msgid "Message:" -#~ msgstr "Сообщение:" - -#~ msgid "More problems nearby" -#~ msgstr "Больше неполадок поблизоÑти" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Почти готово! Проверьте почту..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "ОÑкорбительное поведение? ÐеумеÑтный комментарий? РаÑÑкажите нам об Ñтом." - -#~ msgid "Photo:" -#~ msgstr "Фото:" - -#~ msgid "Please check your email" -#~ msgstr "Проверьте почту" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, отправлен в %s" -#~ 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>" +#~ msgid "About us" +#~ msgstr "О наÑ" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Возможно, ÑÑылка уÑтарела или уже была иÑпользована. Кроме того, Ð°Ð´Ñ€ÐµÑ ÑÑылки мог быть Ñкопирован не полноÑтью." +#~ msgid "Email me new local problems" +#~ msgstr "ПриÑылайте мне Ñлектронные пиÑьма Ñ Ð¾Ð¿Ð¸Ñанием неполадок поблизоÑти" -#~ msgid "This problem has been closed" -#~ msgstr "Ðта проблема была закрыта" +#~ msgid "Empty flat or maisonette" +#~ msgstr "ПуÑÑ‚Ð°Ñ ÐºÐ²Ð°Ñ€Ñ‚Ð¸Ñ€Ð° или коттедж" -#~ msgid "This problem is in progress" -#~ msgstr "Ðта проблема находитÑÑ Ð² Ñтадии разрешениÑ" +#~ msgid "Empty house or bungalow" +#~ msgstr "ПуÑтой дом или бунгало" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Ðто давнÑÑ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтным ÑтатуÑом." +#~ msgid "Empty office or other commercial" +#~ msgstr "ПуÑтой Ð¾Ñ„Ð¸Ñ Ð¸Ð»Ð¸ коммерчеÑкое помещение" -#~ msgid "Update:" -#~ msgstr "Обновить:" +#~ msgid "Empty pub or bar" +#~ msgstr "ПуÑтой паб или бар" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "К Ñожалению, нам не удалоÑÑŒ подтвердить ваш аккаунт." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "ПуÑтое муниципальное здание: школа, больница и др." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Мы отправили вам пиÑьмо Ñо ÑÑылкой Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Введите название ближайшей улицы и регион, почтовый Ð¸Ð½Ð´ÐµÐºÑ Ð¸Ð»Ð¸ район в Дели" -#~ 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>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обращении. ЕÑли выбрать еще одно изображение, оно заменит первое." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "К Ñожалению, вы не можете подтверждать неподтвержденные обращениÑ." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обновлении. ЕÑли выбрать еще одно изображение, оно заменит первое." +#~ msgid "Problems in this area" +#~ msgstr "Проблемы в Ñтой меÑтноÑти" -#~ msgid "Your email:" -#~ msgstr "Ваш Ñл. адреÑ:" +#~ msgid "Property type:" +#~ msgstr "Тип имущеÑтва:" -#~ msgid "Your name:" -#~ msgstr "Ваше имÑ:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS-фид о проблемах здеÑÑŒ: %s" -#~ msgid "Your email:" -#~ msgstr "Ваш Ñл. адреÑ:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Целый квартал незаÑеленных квартир" diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po index 12506a05d..2924b6355 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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Albanian (http://www.transifex.com/mysociety/fixmystreet/language/sq/)\n" "Language: sq\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "dhe" @@ -88,7 +88,7 @@ msgstr "%s përditësime ne kohë reale" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s pyetesoret jane derguar– %s pergjigjur (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -107,10 +107,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s lagje, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, raportuar në %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, brenda lagjes %s" @@ -165,7 +161,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(opsionale)" @@ -177,12 +173,11 @@ msgstr "" msgid "(sent to both)" msgstr "(dërguar te të dy)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Zgjedh në kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Zgjedh nje lloj te karakteristikes --" @@ -217,26 +212,21 @@ msgstr "<strong>Jo</strong> Më lejo të konfirmoj raportin tim me email" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Jo</strong> Me lejoni te konfirmoj perditesimin me email" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Jo</strong> më lejo të kyqem me email" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Po</strong> Unë kam një fjalëkalim" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Rreth nesh" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Veprim i Planifikuar" @@ -267,7 +257,7 @@ msgstr "Shto një kategori të re" msgid "Add user" msgstr "Shto përdorues" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Shtoi %s" @@ -287,7 +277,7 @@ msgstr "Paralajmerimi %d u krijua per %s, lloji %s, parametrat %s / %s" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Me paralajmero per perditesime ne te ardhmen" @@ -300,7 +290,7 @@ msgstr "Te gjitha Raportimet" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -399,7 +389,7 @@ msgstr "Prapa" msgid "Ban email address" msgstr "bllokoemail adresen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -430,7 +420,7 @@ msgstr "Nuk mund te shihni harten? <em>Kaloni kete hap</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -445,7 +435,7 @@ msgstr "Kategoria" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -465,19 +455,19 @@ msgstr "Kategoria: %s" msgid "Change password" msgstr "Nderro fjalekalimin" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -488,7 +478,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -529,8 +519,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -539,7 +529,7 @@ msgstr "" msgid "Closed" msgstr "Mbyllur" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -565,7 +555,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -595,7 +585,7 @@ msgstr "" msgid "Confirmation" msgstr "Konfirmimi" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -614,7 +604,7 @@ msgid "Confirmed:" msgstr "E konfirmuar:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -633,8 +623,8 @@ msgstr "Kontakto ekipin" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Nuk mund te gjeni perdoruesin" @@ -652,7 +642,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -671,7 +661,7 @@ msgstr "" msgid "Create a report" msgstr "Krijo nje raport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Krijo kategorine" @@ -715,20 +705,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -736,7 +726,7 @@ msgid "Description" msgstr "Pershkrim" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detaje" @@ -761,11 +751,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -783,8 +773,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Dyfisho" @@ -804,7 +794,7 @@ msgstr "" msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -834,7 +824,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -842,11 +832,11 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Emaili u shtua te lista e abuzimeve" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Email adresa:" @@ -858,19 +848,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Me dergo email per problemet e reja lokale" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -879,26 +864,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -942,18 +907,14 @@ msgstr "" 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Shkruaj fjalekalimin" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Pershkruaje problemin" @@ -979,7 +940,7 @@ msgstr "Shembull i kodit postar %s" msgid "Examples:" msgstr "Shembuj:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1016,19 +977,15 @@ msgstr "Emri" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "E rregulluar" @@ -1055,7 +1012,7 @@ msgstr "" msgid "Flag user" msgstr "Flamuri i perdoruesit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1077,8 +1034,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1109,18 +1065,18 @@ msgstr "Pyetjet me te shpeshta" msgid "GeoRSS on Google Maps" msgstr "GeoRSS ne Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Merr perditesimet" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Merr perditesimet e problemeve ne kete %s" @@ -1133,7 +1089,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1159,7 +1115,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1170,8 +1126,7 @@ 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/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Pershendetje %s" @@ -1187,11 +1142,11 @@ msgstr "Pershendetje %s" msgid "Hidden" msgstr "E fshehur" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Fshih te vjetratt" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Fshih shenjen" @@ -1211,10 +1166,6 @@ 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:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Une kam frike se ju nuk mund te konfirmoni raportet e pakonfirmuara" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1225,7 +1176,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1247,7 +1198,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1268,7 +1219,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1303,10 +1254,10 @@ msgstr "ID ilegale" msgid "Illegal feed selection" msgstr "zgjedhje e gabuar e feed" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Ne Vazhdim" @@ -1357,7 +1308,7 @@ msgstr "Rekomandim i brendshem" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Data e fundit jovalide" @@ -1365,16 +1316,16 @@ msgstr "Data e fundit jovalide" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Data e fillimit jovalide" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Shqyrtuar" @@ -1396,7 +1347,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1434,7 +1385,6 @@ msgstr "Duke ngarkuar..." #: 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 "" @@ -1443,11 +1393,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokalizo problemin ne harte ne vendin e caktuar" @@ -1507,14 +1457,14 @@ msgstr "Muaji" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Emri" @@ -1538,8 +1488,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1561,7 +1511,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1626,7 +1576,7 @@ msgstr "Tjetra" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Jo" @@ -1691,8 +1641,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Jo Pergjegjes" @@ -1725,7 +1675,7 @@ 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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1739,15 +1689,15 @@ msgstr "Shenim: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Tani ju mund te paraqitni perditesimin…" @@ -1781,8 +1731,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1817,13 +1767,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1848,7 +1798,7 @@ msgstr "Burim" msgid "Partial" msgstr "I pjesshem" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1857,7 +1807,7 @@ msgid "Password (optional)" msgstr "Fjalekalimi (opsionale)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Fjalekalimi:" @@ -1865,7 +1815,7 @@ msgstr "Fjalekalimi:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Numri i telefonit" @@ -1881,13 +1831,21 @@ msgid "Phone:" msgstr "Telefoni:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Fotografia" @@ -1911,8 +1869,8 @@ msgstr "Vendose shenjen ne harte" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1928,16 +1886,16 @@ msgstr "Ju lutem te jeni te sjellshem, korrekt dhe te sakte. " msgid "Please check the passwords and try again" msgstr "Ju lutem kontrolloni fjalekalimin dhe provoni perseri" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Ju lutem kontrolloni email adresen tuaj nese eshte e sakte" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1947,7 +1905,7 @@ msgstr "Ju lutem zgjedhni kategorine" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1968,11 +1926,10 @@ msgstr "" msgid "Please enter a message" msgstr "Ju lutem shkruaj nje mesazh" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Ju lutem shkruani emrin tuaj" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1986,10 +1943,10 @@ msgstr "Ju lutem shkruaj fjalekalimin" msgid "Please enter a subject" msgstr "Ju lutem shkruaj subjektin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2006,9 +1963,9 @@ msgid "Please enter some details" msgstr "Ju lutem shkruaj disa te dhena" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2017,7 +1974,7 @@ msgid "Please enter your email" msgstr "Ju lutem shkruani email-in tuaj" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Ju lutem shkruani email adresen tuaj" @@ -2033,7 +1990,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Ju lutem shkruani emrin tuaj" @@ -2060,7 +2017,7 @@ msgstr "Ju lutem ndihuni te lire per tu <a href=\"%s\">kyqur perseri</a>, ose kt msgid "Please fill in details of the problem below." msgstr "Ju lutem pershkruani ne hollesi problemin me poshte." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2069,7 +2026,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2095,16 +2052,16 @@ msgstr "" msgid "Please note:" msgstr "Ju lutem vini re:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 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:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2120,22 +2077,23 @@ msgstr "Ju lutem zgjedhni furnizuesin qe deshironi" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Ju lutem ngarkoni vetem fotografi te formatit JPEG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Ju lutem shkruani nje mesazh" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Ju lutem shkruani perditesimin tuaj ketu" @@ -2166,7 +2124,7 @@ msgstr "" msgid "Previous" msgstr "Paraprak" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2176,7 +2134,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2205,7 +2163,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problemi eshte shenuar si i hapur." @@ -2217,10 +2175,6 @@ msgstr "Ndryshim i gjendjes se problemit bazuar ne rezultatet e anketes" msgid "Problems" msgstr "Problemet" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemet ne kete zone" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemet ne afersi" @@ -2238,13 +2192,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemet brenda %.1fkm te ketij lokacioni" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemet brenda %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemet brenda lagjes %s" @@ -2263,15 +2215,11 @@ msgstr "Problemet brenda kufijve te:" msgid "Property address:" msgstr "Adresa e prones:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Lloji i prones:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ofro nje perditesim" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2305,16 +2253,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS feed" @@ -2342,18 +2289,12 @@ msgstr "RSS feed i %s, brenda lagjes %s" msgid "RSS feed of nearby problems" msgstr "RSS feed i problemeve ne afersi" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS feed i problemeve ne kete %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed i problemeve brenda %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed i problemeve brenda lagjes %s " @@ -2363,14 +2304,13 @@ msgstr "RSS feed i problemeve brenda lagjes %s " msgid "RSS feed of recent local problems" msgstr "RSS feed nga problemet e fundit lokale" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS feed per te rejat rreth ketij problemi" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Prano email kur ka perditesime te ketij problemi" @@ -2406,12 +2346,11 @@ msgstr "Largo fotografine (nuk mund te kthehet!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2421,7 +2360,7 @@ msgstr "Raporto nje problem" msgid "Report abuse" msgstr "Raporto abuzimin" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Raporto ne %s" @@ -2436,7 +2375,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Raportuar ne menyre anonime te %s" @@ -2446,7 +2385,7 @@ msgstr "Raportuar ne menyre anonime te %s" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Raportuar nga %s ne %s" @@ -2460,27 +2399,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Raportuar ne kategorine %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 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:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Raportuar nepermjet %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Raportuar nepermjet %s nga %s ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Raportuar nepermjet %s ne kategorine %s ne %s" @@ -2501,7 +2440,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Raportimi i nje problemi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2544,15 +2483,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rrotullo Majtas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2567,7 +2506,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2623,7 +2562,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2642,21 +2581,21 @@ msgstr "Shperndaj" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Publiko emrin tim" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Shfaq te vjetrat" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Shfaq shenjat" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2715,9 +2654,8 @@ msgstr "Na vjen keq, ne nuk mund te gjejme kete lokacion." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni perseri." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2725,15 +2663,10 @@ msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni per msgid "Sorry, we could not parse that location. Please try again." msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni perseri." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni perseri." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Data e Fillimit:" @@ -2742,7 +2675,7 @@ msgstr "Data e Fillimit:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Gjendje" @@ -2755,7 +2688,7 @@ msgstr "Gjendje" msgid "State:" msgstr "Gjendje:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2795,10 +2728,10 @@ msgid "Subject:" msgstr "Tema:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Paraqit" @@ -2826,9 +2759,8 @@ msgstr "Paraqit pyetesorin" msgid "Submitted" msgstr "Paraqitur" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Abonohu" @@ -2836,7 +2768,7 @@ msgstr "Abonohu" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2855,7 +2787,7 @@ msgstr "Permbledhje" msgid "Summary reports" msgstr "Raportet përmbledhëse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Studim" @@ -2912,7 +2844,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2920,7 +2852,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2930,11 +2862,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2946,7 +2878,7 @@ msgstr "Raporti nuk mund te shihet ne %s." msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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,9 +3018,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3149,9 +3081,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3164,11 +3096,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Ky problem ka qene i rregulluar" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Ky problem nuk ka qene i rregulluar" @@ -3205,7 +3137,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Kohezgjatja" @@ -3250,8 +3182,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3268,7 +3200,7 @@ msgstr "E pakonfirmuar" msgid "Unknown" msgstr "E panjohur" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3283,7 +3215,7 @@ msgstr "Gabim i panjohur" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Perditesim" @@ -3335,10 +3267,10 @@ msgstr "" msgid "Updated" msgstr "Perditesuar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3365,7 +3297,7 @@ msgstr "Perditesimet ne {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3374,11 +3306,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3386,16 +3318,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Perdoruesit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Vlerat e perditesuara" @@ -3432,16 +3364,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "ne asnjëherë nuk do të shfaqim email-in tuaj" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 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." @@ -3450,7 +3381,7 @@ msgstr "Ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telef 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3488,10 +3419,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3511,7 +3438,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3541,8 +3468,8 @@ msgstr "Viti" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Po" @@ -3656,19 +3583,19 @@ msgid "Your Reports" msgstr "Raportet tuaja" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Email-i juaj" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3679,17 +3606,17 @@ msgstr "Email adresa juaj" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Emri juaj" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3702,20 +3629,19 @@ msgstr "Fjalekalimi juaj eshte ndryshuar" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Numri juaj i telefonit" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Raportet tuaja" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Raportet tuaja" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Perditesimet tuaja" @@ -3741,7 +3667,7 @@ msgid "didn't use map" msgstr "nuk e perdorni harten" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "p.sh. ‘%s’ ose ‘%s’" @@ -3847,8 +3773,7 @@ msgstr "zona tjera:" msgid "reopened" msgstr "rihapur" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "shkyqur" @@ -3926,7 +3851,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> perditesim ne raporte" msgstr[1] "<big>%s</big> perditesime ne raporte" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3968,53 +3893,26 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit)" - -#~ msgid "(we never show your email)" -#~ msgstr "(ne asnjëherë nuk do të shfaqim email-in tuaj)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ 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:" - -#~ msgid "Enter a new password:" -#~ msgstr "Shkruaj fjalekalimin e ri:" - -#~ msgid "Message:" -#~ msgstr "Mesazh:" - -#~ msgid "More problems nearby" -#~ msgstr "Me shume probleme ketu afer" - -#~ msgid "Photo:" -#~ msgstr "Fotografia:" - -#~ msgid "Please check your email" -#~ msgstr "Ju lutem kontrolloni email-in tuaj" - -#~ msgid "This problem has been closed" -#~ msgstr "Ky problem ka qene i mbyllur" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, raportuar në %s" -#~ msgid "This problem is in progress" -#~ msgstr "Ky problem eshte ne progres" +#~ msgid "About us" +#~ msgstr "Rreth nesh" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Ky problem eshte i vjeter dhe me status te panjohur." +#~ msgid "Email me new local problems" +#~ msgstr "Me dergo email per problemet e reja lokale" -#~ msgid "Update:" -#~ msgstr "Perditesim:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Ne nuk jemi ne gjendje te konfirmojme llogarine tuaj - na vjen keq." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Une kam frike se ju nuk mund te konfirmoni raportet e pakonfirmuara" -#~ msgid "Your email:" -#~ msgstr "Email-i juaj:" +#~ msgid "Problems in this area" +#~ msgstr "Problemet ne kete zone" -#~ msgid "Your name:" -#~ msgstr "Emri juaj:" +#~ msgid "Property type:" +#~ msgstr "Lloji i prones:" -#~ msgid "Your email:" -#~ msgstr "Email-i juaj;" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS feed i problemeve ne kete %s" diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index 5a1fdf08d..b68ef7cdf 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2016-01-31 19:36+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-04-29 13:21+0000\n" "Last-Translator: Jon Kristensen <info@jonkri.com>\n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/mysociety/fixmystreet/language/sv_SE/)\n" "Language: sv_SE\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "eller" @@ -54,9 +54,8 @@ msgid "%s admin:" msgstr "%s administratör:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Förvaltningar" +msgstr "%s förvaltningar" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -91,7 +90,7 @@ msgstr "%s uppdateringar" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s frÃ¥geformulär skickade – %s besvarade (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -110,10 +109,6 @@ msgstr "%s skickar olika kategorier av rapporter till olika enheter inom en komm msgid "%s ward, %s" msgstr "Administrativa omrÃ¥det %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, rapporterad %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s inom det administrativa omrÃ¥det %s" @@ -168,7 +163,7 @@ msgstr "(ex.v. graffiti, skräp, trasiga gatustenar eller belysning)" msgid "(not sent to council)" msgstr "(ej skickat till kommunen)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(valfritt)" @@ -180,12 +175,11 @@ msgstr "(offentlig)" msgid "(sent to both)" msgstr "(skickat till bÃ¥da)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Välj en katagori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Välj en fastighetstyp --" @@ -220,26 +214,21 @@ 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 uppdateringen via epost" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nej</strong> LÃ¥t mig logga in med min epostadress" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jag har ett lösenord" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Om oss" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Ã…tgärd är schemalagd" @@ -270,7 +259,7 @@ msgstr "Ny kategori" msgid "Add user" msgstr "Lägg till användare" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Lades till %s" @@ -290,7 +279,7 @@ msgstr "Bevakning %d skapad för %s av typen %s med parametrarna %s/%s" msgid "Alert %d disabled (created %s)" msgstr "Bevakning %d avaktiverad (skapad %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Varsko mig om framtida uppdateringar" @@ -303,7 +292,7 @@ msgstr "Alla rapporter" msgid "All Reports as CSV" msgstr "Alla rapporter som CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -347,7 +336,7 @@ msgstr "Är du en utvecklare?" #: templates/web/base/js/translation_strings.html:52 msgid "Are you sure you want to cancel this upload?" -msgstr "" +msgstr "Är du säker pÃ¥ att du vill avbryta den här uppladdningen?" #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 @@ -402,7 +391,7 @@ msgstr "Tillbaka" msgid "Ban email address" msgstr "Förbjud epostadress" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -433,7 +422,7 @@ msgstr "Kan du inte se kartan? <em>Hoppa över det här steget</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -448,7 +437,7 @@ 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:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -468,7 +457,7 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Ändra lösenord" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -476,13 +465,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:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -493,7 +482,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:130 +#: templates/web/base/admin/body.html:129 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,8 +523,8 @@ msgstr "Klicka pÃ¥ länken i vÃ¥rt bekräftelsemail för att logga in." #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -544,7 +533,7 @@ msgstr "Klicka pÃ¥ länken i vÃ¥rt bekräftelsemail för att logga in." msgid "Closed" msgstr "Stängd" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Stängd av kommunen" @@ -570,7 +559,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" @@ -589,7 +578,6 @@ msgstr "Bekräfta konto" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Bekräfta via epost nedan genom att ange ett nytt lösenord. När du bekräftar kommer ditt lösenord att uppdateras." @@ -601,7 +589,7 @@ 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:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -620,7 +608,7 @@ msgid "Confirmed:" msgstr "Bekräftat:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "Kontakta %s" @@ -639,8 +627,8 @@ msgstr "Kontakta teamet" msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kan inte hitta användaren" @@ -658,7 +646,7 @@ msgstr "Kommun" msgid "Council contacts for %s" msgstr "Kommunkontakter för %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "kommunens referens: %s" @@ -677,7 +665,7 @@ msgstr "Antal" msgid "Create a report" msgstr "Skapa en rapport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Skapa en kategori" @@ -721,20 +709,20 @@ msgstr "Skrivbord" msgid "Dealt with by subdivision within 5 working days" msgstr "Hanterat av underavdelning inom 5 arbetsdagar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Ta bort mall" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Borttagen" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -742,7 +730,7 @@ msgid "Description" msgstr "Beskrivning" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detaljer" @@ -767,11 +755,11 @@ msgid "Diligency prize league table" msgstr "Flitighetstopplistan" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "Har du ett lösenord för %s?" @@ -785,12 +773,12 @@ msgstr "Gillar du inte formulär?" #: templates/web/base/js/translation_strings.html:51 msgid "Drag and drop photos here or <u>click to upload</u>" -msgstr "" +msgstr "Släpp foton här eller <u>klicka för att ladda upp</u>" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Finns redan" @@ -810,7 +798,7 @@ msgstr "Varje förvaltningskontakt har en kategori, och denna visas för allmän msgid "Edit" msgstr "Ändra" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Ändra förvaltningsdetaljer" @@ -840,7 +828,7 @@ msgstr "Redaktör" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -848,11 +836,11 @@ msgstr "Redaktör" msgid "Email" msgstr "Epost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Epostadressen tillagd till missbrukslistan" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-postadress:" @@ -864,19 +852,14 @@ msgstr "E-postnotifikation skapad" msgid "Email alert deleted" msgstr "E-postnotifikation borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Epostadressen finns redan i missbrukslistan" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Eposta mig nya problem lokalt" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "Epost:" @@ -885,26 +868,6 @@ msgstr "Epost:" msgid "Email: %s" msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Tom lägenhet" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Tomt hus" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Tomt kontor eller annan kommersiell lokal" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Tom pub eller bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Tom publik byggnad - skola, sjukhus, etc." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -951,18 +914,14 @@ msgstr "Ange ett postnummer eller gatunamn och ort" msgid "Enter a nearby street name and area" msgstr "Ange ett närligande gatunamn och ort" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm: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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Ange ett lösenord" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Skriv in information om problemet" @@ -988,7 +947,7 @@ msgstr "Exempelpostnummer %s" msgid "Examples:" msgstr "Exempel:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 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..." @@ -1025,19 +984,15 @@ msgstr "Första gÃ¥ngen" 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." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixaMinGata" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Löst" @@ -1064,7 +1019,7 @@ msgstr "Flagga som borttagen" msgid "Flag user" msgstr "Flagga användare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flaggat" @@ -1086,8 +1041,7 @@ msgstr "Flaggade användare är inte begränsade pÃ¥ nÃ¥got sätt. Detta är bar msgid "Flagged:" msgstr "Flaggat:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 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." @@ -1118,18 +1072,18 @@ msgstr "Vanliga frÃ¥gor" msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "FÃ¥ uppdateringar" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "FÃ¥ uppdateringar om problem i denna %s" @@ -1142,7 +1096,7 @@ 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:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1168,7 +1122,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1179,8 +1133,7 @@ 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/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hej %s" @@ -1196,11 +1149,11 @@ msgstr "Hej %s" msgid "Hidden" msgstr "Gömd" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Göm äldre" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Göm pinnar" @@ -1220,10 +1173,6 @@ msgstr "Hur man rapporterar ett problem" msgid "How to send successful reports" msgstr "Hur bra rapporter skickas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Tyvärr kan du inte bekräfta obekräftade 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" @@ -1234,7 +1183,7 @@ msgstr "Jag rapporterade precis ett problem pÃ¥ @fixamingata" msgid "I just updated a problem on @fixmystreet" msgstr "Jag uppdaterade precis ett problem pÃ¥ @fixamingata" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 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" @@ -1256,7 +1205,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:133 +#: templates/web/base/admin/body.html:132 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." @@ -1277,7 +1226,7 @@ msgid "" "(please note it will not be sent to the council)." 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:149 +#: templates/web/base/admin/body.html:147 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." @@ -1312,10 +1261,10 @@ msgstr "Ogiltigt ID" msgid "Illegal feed selection" msgstr "Ogiltigt RSS-flöde" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "PÃ¥gÃ¥ende" @@ -1366,7 +1315,7 @@ msgstr "Interna refereringar" msgid "Invalid agency_responsible value %s" msgstr "Inkorrekt värde för agency_responsible, \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Inkorrekt slutdatum" @@ -1374,16 +1323,16 @@ msgstr "Inkorrekt slutdatum" msgid "Invalid format %s specified." msgstr "Inkorrekt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Inkorrekt startdatum" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Utredes" @@ -1405,7 +1354,7 @@ msgstr "Jurisdiktion Okänd" msgid "Jurisdiction unknown" msgstr "Jurisdiktion okänd" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1443,7 +1392,6 @@ msgstr "Laddar..." #: 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 "Lokala RSS-flöden och epostbevakningar" @@ -1452,11 +1400,11 @@ msgstr "Lokala RSS-flöden och epostbevakningar" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokala RSS-flöden och epostbevakningar för '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokala rapporter" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokalisera problemet pÃ¥ en karta över omrÃ¥det" @@ -1516,14 +1464,14 @@ msgstr "MÃ¥nad" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Namn" @@ -1547,8 +1495,8 @@ msgstr "Närmaste namngivna gata till placeringen pÃ¥ kartan (genereras automati msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Närmaste postnummer till placeringen pÃ¥ kartan (genereras automatiskt): %s (%s meter bort)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1572,7 +1520,7 @@ msgstr "Nya <br>problem" msgid "New body added" msgstr "Ny förvaltning tillagd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Nya kategorikontakter tillagda" @@ -1637,7 +1585,7 @@ msgstr "Nästa" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nej" @@ -1702,8 +1650,8 @@ msgstr "Normala (publika) användare skall inte associeras med nÃ¥gon <strong>fà #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Ej ansvarig" @@ -1736,7 +1684,7 @@ 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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1750,15 +1698,15 @@ msgstr "Observera: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "Anteckningar frÃ¥n SDM till DM" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "För att skicka din rapport…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "För att skicka din uppdatering…" @@ -1792,8 +1740,8 @@ msgstr "Kort sammanfattning" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1828,13 +1776,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1859,7 +1807,7 @@ msgstr "Förälder" msgid "Partial" msgstr "Partiell" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1868,7 +1816,7 @@ msgid "Password (optional)" msgstr "Lösenord (valfritt)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Lösenord:" @@ -1876,7 +1824,7 @@ msgstr "Lösenord:" msgid "Permalink" msgstr "Permanent länk" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnummer" @@ -1892,13 +1840,21 @@ msgid "Phone:" msgstr "Telefonnummer:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1922,8 +1878,8 @@ msgstr "Placera nÃ¥len pÃ¥ kartan" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1939,16 +1895,16 @@ msgstr "Var vänlig, kortfattad och rakt pÃ¥ sak." msgid "Please check the passwords and try again" msgstr "Vänligen kontrollera lösenordet och prova igen" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Vänligen kontrollera att din epostadress är korrekt" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1958,7 +1914,7 @@ msgstr "Välj en kategori" msgid "Please choose a property type" msgstr "Välj en fastighetstyp" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Vänligen korrigera felen nedan" @@ -1979,11 +1935,10 @@ msgstr "Var snäll och missbruka inte tjänsten, det förstör för alla." msgid "Please enter a message" msgstr "Skriv in ett meddelande" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Skriv in ditt namn och efternamn" +msgstr "Skriv in ett namn" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1997,10 +1952,10 @@ msgstr "Skriv in ett lösenord" msgid "Please enter a subject" msgstr "Skriv in ett ärende" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2017,9 +1972,9 @@ msgid "Please enter some details" msgstr "Skriv nÃ¥gra detaljer" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2028,7 +1983,7 @@ msgid "Please enter your email" msgstr "Skriv in din epostadress" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Skriv in din epostadress" @@ -2044,7 +1999,7 @@ msgstr "Skriv in ditt namn och efternamn om kommunen behöver den informationen. #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Skriv in ditt namn och efternamn" @@ -2071,7 +2026,7 @@ msgstr "Välkommen att <a href=\"&s\">logga in igen</a>, eller gÃ¥ tillbaka till msgid "Please fill in details of the problem below." msgstr "Fyll i information om problemet nedan." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Fyll i information om problemet nedan." @@ -2080,7 +2035,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ange ifall du vill ta emot ett annat frÃ¥geformulär" @@ -2089,9 +2044,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Observera att uppdateringar inte skickas till kommunen." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Observera att din rapport <strong>inte har skickats än</strong>. Välj en kategori och ytterligare information nedan. Tryck sedan pÃ¥ skicka." +msgstr "Observera att din rapport <strong>inte har skickats än</strong>." #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2100,23 +2054,23 @@ msgstr "Observera att din rapport <strong>inte har skickats än</strong>. Välj #: templates/web/base/report/display.html:26 msgid "Please note your update has <strong>not yet been posted</strong>." -msgstr "" +msgstr "Observera att din uppdatering <strong>inte har publicerats än</strong>." #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" msgstr "Observera:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Skriv en förklaring till varför du öppna de här rapporten igen" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 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:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Ange om du har anmält ett problem till kommunen tidigare eller ej" @@ -2132,22 +2086,23 @@ msgstr "Välj det RSS-flöde du vill ha" msgid "Please select the type of alert you want" msgstr "Välj den kategori av rapporter du vill ha" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Ange om problemet har lösts eller ej" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Ladda upp en JPEG-bild" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Skriv ett meddelande" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Skriv din uppdatering här" @@ -2178,7 +2133,7 @@ msgstr "Byggd pÃ¥ <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">Fi msgid "Previous" msgstr "FöregÃ¥ende" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Personlig integritet" @@ -2188,7 +2143,7 @@ msgstr "Personlig integritet" msgid "Privacy and cookies" msgstr "Integritetsskydd och kakor" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2217,7 +2172,7 @@ msgstr "Rapport %s skickad till %s" msgid "Problem breakdown by state" msgstr "Rapporter per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problemet markerat som öppet." @@ -2229,10 +2184,6 @@ msgstr "Problemets status ändrats baserat pÃ¥ utredningsresultat" msgid "Problems" msgstr "Problem" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problem i detta omrÃ¥de" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Närliggande problem" @@ -2250,13 +2201,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problem inom %.1f km frÃ¥n denna position" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problem inom %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problem inom omrÃ¥det %s" @@ -2275,15 +2224,11 @@ msgstr "Problem inom gränsen för:" msgid "Property address:" msgstr "Fastighetsadress:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Fastighetstyp:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ge en uppdatering" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2317,16 +2262,15 @@ 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:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "FrÃ¥geformulär ifyllt av rapportören" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-flöde" @@ -2354,18 +2298,12 @@ msgstr "RSS-flöde för %s, inom omrÃ¥de %s" msgid "RSS feed of nearby problems" msgstr "RSS-flöde av närliggande problem" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS-flöde för problem i denna %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-flöde för problem inom %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-flöde för problem inom omrÃ¥de %s" @@ -2375,14 +2313,13 @@ msgstr "RSS-flöde för problem inom omrÃ¥de %s" msgid "RSS feed of recent local problems" msgstr "RSS-flöde för senaste lokala problemen" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS-flöde för uppdateringar till denna rapport" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "ErhÃ¥ll epost när uppdateringar ges till denna rapport" @@ -2418,12 +2355,11 @@ msgstr "Ta bort foto (kan inte Ã¥ngras!)" msgid "Reply to user:" msgstr "Besvara användare:" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Rapportera" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2433,7 +2369,7 @@ msgstr "Rapportera ett problem" msgid "Report abuse" msgstr "Rapportera missbruk" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Rappoort pÃ¥ %s" @@ -2448,7 +2384,7 @@ msgstr "Rapportera ditt problem" msgid "Report, view, or discuss local problems" msgstr "Rapportera, visa, eller diskutera lokala problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapporterat anonymt %s" @@ -2458,7 +2394,7 @@ msgstr "Rapporterat anonymt %s" msgid "Reported before" msgstr "Rapporterat tidigare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Rapporterat av %s den %s" @@ -2472,27 +2408,27 @@ msgstr "Rapporterad av:" msgid "Reported in the %s category" msgstr "Rapporterat i kategori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Anonym rapport i kategori %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Rapporterat av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Rapporterat av %s av %s den %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapporterat av %s i kategorin %s av %s den %s" @@ -2513,7 +2449,7 @@ msgstr "Rapporterad:" msgid "Reporting a problem" msgstr "Rapportera ett problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2556,15 +2492,15 @@ msgstr "Vägoperatör för den här namngivna vägen (hämtat frÃ¥n vägens numm msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vägoperatör för den här namngivna vägen (frÃ¥n OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rotera Ã¥t vänster" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2579,7 +2515,7 @@ msgstr "Rotation av detta foto kommer att radera osparade rapportändringar." msgid "Satellite" msgstr "Satellit" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2635,7 +2571,7 @@ msgstr "Välj vilken kategori av rapporter du vill fÃ¥ och klicka knappen för e msgid "Sent report back" msgstr "Skicka tillbaka rapport" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Skickades till %s, %s senare" @@ -2654,21 +2590,21 @@ msgstr "Dela" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Visa mitt namn publikt" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Visa äldre" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Visa pinnar" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2729,9 +2665,8 @@ msgstr "Tyvärr kan vi inte hitta den adressen." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Tyvärr kan vi inte förstÃ¥ den adressen. Försök gärna igen." +msgstr "Inloggningen misslyckades. Fyll i formuläret nedan." #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2739,15 +2674,10 @@ msgstr "Tyvärr kan vi inte förstÃ¥ den adressen. Försök gärna igen." msgid "Sorry, we could not parse that location. Please try again." msgstr "Tyvärr kan vi inte förstÃ¥ den adressen. Försök gärna igen." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Tyvärr kan vi inte spara bilden eller bilderna. Försök gärna igen." -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen senare." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Startdatum:" @@ -2756,7 +2686,7 @@ msgstr "Startdatum:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Status" @@ -2769,7 +2699,7 @@ msgstr "Status" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2809,10 +2739,10 @@ msgid "Subject:" msgstr "Ärende:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Skicka" @@ -2840,9 +2770,8 @@ msgstr "Skicka frÃ¥geformulär" msgid "Submitted" msgstr "Skickad" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Prenumerera" @@ -2850,7 +2779,7 @@ msgstr "Prenumerera" msgid "Subscribe me to an email alert" msgstr "Prenumerera med epost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2869,7 +2798,7 @@ msgstr "Sammanfattning" msgid "Summary reports" msgstr "Sammanställningsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Enkät" @@ -2926,7 +2855,7 @@ msgstr "Tack för att du bifogade ett foto. Vi mÃ¥ste nu lokalisera ditt problem msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Tack, vi är glada över att det har blivit Ã¥tgärdat. Har du rapporterat ett problem till en kommun tidigare?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 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." @@ -2934,7 +2863,7 @@ msgstr "Bilden verkar inte ha laddats upp korrekt (%s), var vänlig försök ige msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2944,11 +2873,11 @@ msgstr "Den positionen verkar inte vara i Sverige: försök gärna igen." msgid "That postcode was not recognised, sorry." msgstr "Det postnummret finns tyvärr inte." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Problemet har markerats som skickat." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Rapportern kommer nu att skickas om." @@ -2960,7 +2889,7 @@ 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:144 +#: templates/web/base/admin/body.html:142 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." @@ -3100,9 +3029,9 @@ msgstr "Det uppstod ett problem med att visa sidan med alla rapporter. Försök msgid "There was a problem showing this page. Please try again later." msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen senare." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Felaktigt lösenord eller epostadress. Om du har glömt bort ditt lösenord, eller om du inte har ett lösenord, kan du fylla i ‘logga in via epost’." @@ -3163,9 +3092,9 @@ msgstr "Det här brevet har skickats till flera adresser eftersom rapportören i msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Det här brevet har skickats till flera adresser eftersom rapportören inte angav nÃ¥gon kategori, eller den kategori som angavs hör till flera olika enheter. Du kan ignorera det här brevet om du inte är rätt person att hantera det, men det vore ocksÃ¥ mycket hjälpsamt om du kan ta reda pÃ¥ vem som är rätt person och anmäla detta till oss sÃ¥ att vi kan ändra databasen för framtida brev." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Den här informationen krävs" @@ -3178,11 +3107,11 @@ msgstr "Det här är en utvecklingsplats: olika saker kan komma att gÃ¥ sönder msgid "This is a summary of all reports on this site." msgstr "Det här är en sammanställning av alla rapporter." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Det här problemet har lösts" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Det här problemet har inte lösts" @@ -3219,7 +3148,7 @@ msgstr "Den här sidan innehÃ¥ller ocksÃ¥ ett foto av problemet" msgid "Time spent (in minutes):" msgstr "Nedlagd tid (i minuter):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3264,8 +3193,8 @@ msgstr "Prova att skicka ett e-brev till oss direkt:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Kunde inte Ã¥tgärda" @@ -3282,7 +3211,7 @@ msgstr "Obekräftat" msgid "Unknown" msgstr "Okänt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Okänd feltyp" @@ -3297,7 +3226,7 @@ msgstr "Okänt fel" msgid "Unknown problem ID" msgstr "Okänt problemnummer" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Uppdatering" @@ -3349,10 +3278,10 @@ msgstr "Uppdaterad status" msgid "Updated" msgstr "Uppdaterad" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3379,7 +3308,7 @@ msgstr "Uppdateringar för {{title}}" msgid "Updates to this problem, %s" msgstr "Uppdateringar för det här problemet, %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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." @@ -3388,11 +3317,11 @@ msgstr "Använd <strong>anteckningen</strong> för att dokumentera information s msgid "Used map" msgstr "Använde kartan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Användarflaggan borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Användaren flaggad" @@ -3400,16 +3329,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:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Användare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Värden uppdaterade" @@ -3446,16 +3375,15 @@ msgstr "Vi hittade fler än en träff. Vi visar upp till tio träffar nedan. Om #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Vi visar aldrig din epostadress eller telefonnummer publikt." +msgstr "Skriv in din e-postadress nedan." #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Vi visar aldrig din epostadress publikt" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Vi visar aldrig din epostadress eller telefonnummer publikt." @@ -3464,7 +3392,7 @@ msgstr "Vi visar aldrig din epostadress eller telefonnummer publikt." 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:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Vi skickar rapportern till berörd kommun" @@ -3500,11 +3428,7 @@ msgstr "Vid avsändning" #: templates/web/base/js/translation_strings.html:50 msgid "Whoa there Testino! Three photos are enough." -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Hela block med tomma lägenheter" +msgstr "Du kan som mest ladda upp tre foton." #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." @@ -3525,7 +3449,7 @@ msgstr "Vid sökningar är det ocksÃ¥ möjligt att söka efter agency_responsibl 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>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Vill du bli pÃ¥mind om att kolla statusen med ett annat frÃ¥geformulär om fyra veckor?" @@ -3555,8 +3479,8 @@ msgstr "Ã…r" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3623,9 +3547,8 @@ msgstr "Du har redan bifogat bilder till den här rapporten. Notera att du kan b #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "Du har redan bifogat bilder till den här rapporten. Notera att du kan bifoga som mest tre bilder (om du försöker ladda upp fler tas de tidigaste bort)." +msgstr "Du har redan bifogat foton till din uppdatering. Notera att du kan bifoga som mest tre bilder (om du försöker ladda upp fler tas de tidigaste bort)." #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3671,19 +3594,19 @@ msgid "Your Reports" msgstr "Dina rapporter" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Din epostadress" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3694,17 +3617,17 @@ msgstr "Din epostadress" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Din information kommer endast att användas i enlighet med vÃ¥r <a href=\"/privacy\">sekretesspolicy</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ditt namn och efternamn" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3717,20 +3640,19 @@ msgstr "Ditt lösenord har ändrats" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ditt telefonnummer" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Dina rapporter" +msgstr "Din rapport" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Dina rapporter" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Dina uppdateringar" @@ -3756,7 +3678,7 @@ msgid "didn't use map" msgstr "använde inte kartan" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "ex.v. '%s' eller '%s'" @@ -3862,8 +3784,7 @@ msgstr "andra omrÃ¥den:" msgid "reopened" msgstr "öppnat pÃ¥ nytt" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "logga ut" @@ -3941,7 +3862,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> uppdatering av rapporter" msgstr[1] "<big>%s</big> uppdateringar av rapporter" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3983,86 +3904,50 @@ 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 "(we never show your email address or phone number)" -#~ msgstr "(vi visar aldrig din epostadress eller telefonnummer)" - -#~ msgid "(we never show your email)" -#~ msgstr "(vi visar aldrig din epostadress)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ 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:" - -#~ msgid "Email me updates" -#~ msgstr "Eposta mig uppdateringar" - -#~ msgid "Enter a new password:" -#~ msgstr "Ange ett nytt lösenord:" - -#~ 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" - -#~ 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 "Om du använder webbmail och har spamfilter bör du kolla din spamfolder eftersom vÃ¥ra brev ibland markeras som skräp." - -#~ msgid "Message:" -#~ msgstr "Meddelande:" - -#~ msgid "More problems nearby" -#~ msgstr "Fler närliggande problem" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Nästan klar! Kolla nu din epost." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Kränkande eller olämpligt? Kontakta oss" - -#~ msgid "Photo:" -#~ msgstr "Foto:" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, rapporterad %s" -#~ msgid "Please check your email" -#~ msgstr "Vänligen kontrollera din epost" +#~ msgid "About us" +#~ msgstr "Om oss" -#~ 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 "Observera att uppdateringar inte skickas till kommunen. Om du lämnar ditt namn kommer det att visas publikt. Din information används endast i enlighet med vÃ¥r <a href=\"/faq#privacy\">sekretesspolicy</a>" +#~ msgid "Email me new local problems" +#~ msgstr "Eposta mig nya problem lokalt" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Detta kan bero pÃ¥ att länken är för gammal, att den redan har använts, eller att adressen inte kopierades korrekt." +#~ msgid "Empty flat or maisonette" +#~ msgstr "Tom lägenhet" -#~ msgid "This problem has been closed" -#~ msgstr "Den här rapporten har stängts" +#~ msgid "Empty house or bungalow" +#~ msgstr "Tomt hus" -#~ msgid "This problem is in progress" -#~ msgstr "Arbete pÃ¥gÃ¥r med att lösa problemet" +#~ msgid "Empty office or other commercial" +#~ msgstr "Tomt kontor eller annan kommersiell lokal" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Problemet är gammalt och har okänt status" +#~ msgid "Empty pub or bar" +#~ msgstr "Tom pub eller bar" -#~ msgid "Update:" -#~ msgstr "Uppdatering:" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Tom publik byggnad - skola, sjukhus, etc." -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Vi beklagar att vi inte har kunnat bekräfta ditt konto." +#~ 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" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Vi har skickat dig epost med en länk för att bekräfta ditt konto." +#~ msgid "FixMyStreet" +#~ msgstr "FixaMinGata" -#~ 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>:" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Tyvärr kan du inte bekräfta obekräftade rapporter" -#~ 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." +#~ msgid "Problems in this area" +#~ msgstr "Problem i detta omrÃ¥de" -#~ 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." +#~ msgid "Property type:" +#~ msgstr "Fastighetstyp:" -#~ msgid "Your email:" -#~ msgstr "Din epostadress:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS-flöde för problem i denna %s" -#~ msgid "Your name:" -#~ msgstr "Ditt namn:" +#~ msgid "Sorry, you can not log in with Facebook. Please try again later." +#~ msgstr "Du kunde inte logga in med Facebook. Försök gärna igen." -#~ msgid "Your email:" -#~ msgstr "Din epostadress:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Hela block med tomma lägenheter" diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po index cf0dfd1da..dab9a154e 100644 --- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,14 +6,13 @@ # Translators: # Eda Karaman <edakaraman_92@hotmail.de>, 2015 # Muradiye <Muradiye.ates@gmail.com>, 2015 -# Seyithan Ates <seyithan.ahmet@gmail.com>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2016-03-08 10:24+0000\n" -"Last-Translator: Seyithan Ates <seyithan.ahmet@gmail.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/mysociety/fixmystreet/language/tr_TR/)\n" "Language: tr_TR\n" "MIME-Version: 1.0\n" @@ -21,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "ve" @@ -54,9 +53,8 @@ msgid "%s admin:" msgstr "%s Yönetici:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Bölümler" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -91,7 +89,7 @@ msgstr "%s güncellemeler" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s bildirim – %s cevaplandı (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -110,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bölüm, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, rapor edilmiÅŸ %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, içinde %s bölüm" @@ -168,7 +162,7 @@ msgstr "(duvar yazısı (grafiti), moloz atma, kırık kaldırım döşeme, ya d msgid "(not sent to council)" msgstr "(kurula gönderilmemiÅŸ)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(isteÄŸe baÄŸlı)" @@ -180,12 +174,11 @@ msgstr "(kamu)" msgid "(sent to both)" msgstr "(her ikisine de gönderildi)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Kategori seçiniz--" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Bir özellik seçiniz --" @@ -220,26 +213,21 @@ msgstr "<strong>Hayır</strong> E mail yoluyla raporumu onaylamama izin ver" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Hayır</strong> Güncellemelerimi e-posta yoluyla onaylamama izin ver" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Hayır</strong> e-posta yoluyla giriÅŸ yapmama izin ver" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Evet</strong> ÅŸifrem var" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Hakkımızda" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Planlı Eylem" @@ -274,7 +262,7 @@ msgstr "Yeni kategori ekle" msgid "Add user" msgstr "Kullanıcı ekle" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "EklenmiÅŸ %s" @@ -294,7 +282,7 @@ msgstr "Uyarı %d için oluÅŸturulmuÅŸ %s, tür %s, deÄŸiÅŸkenler %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Uyarı %d engellendi (oluÅŸturuldu %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Güncellemeleri bildir" @@ -307,7 +295,7 @@ msgstr "Tüm Bildirimler" msgid "All Reports as CSV" msgstr "Tüm raporlar CSV olarak" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -406,7 +394,7 @@ msgstr "Geri" msgid "Ban email address" msgstr "Email adresini engelle" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -437,7 +425,7 @@ msgstr "Haritayı göremiyor musunuz? <em>Bu adımı atlayın</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -452,7 +440,7 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Bu kategori için problemlerin onarılma süresi > 4 hafta" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -472,7 +460,7 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Åžifreyi deÄŸiÅŸtir" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -480,7 +468,7 @@ msgstr "" "Bu kiÅŸinin doÄŸru olarak teyit edildiÄŸini belirtmek için<strong>doÄŸrulandı</strong> kontrol edin.\n" "EÄŸer kiÅŸinin kaynağından veya doÄŸruluÄŸundan emin deÄŸilseniz, onu kontrol edilmemiÅŸ olarak bırakın." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 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." @@ -488,7 +476,7 @@ msgstr "" " Kullanım kategorisinden kaldırmak için <strong>silindi</strong> kontrol edin.\n" "Problem bildirim sayfasındaki açılır menüden mevcut bir kategori olarak görünmez. " -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -505,7 +493,7 @@ msgstr "" "Bu kullanıcının ilgili birime bildirimde bulunmasına izin vermek istediÄŸiniz konular için uygundur, gizli olanlar hariç. Ä°ngiltere'de, ekstra çöp kutusu talebi gibi hizmetlerde bunu daha önce kullanmıştık\n" "belirli bir adres için." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -548,8 +536,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -558,7 +546,7 @@ msgstr "" msgid "Closed" msgstr "Kapalı" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Kurul tarafından kapatıldı" @@ -584,7 +572,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Yapılandırma" @@ -603,9 +591,8 @@ msgstr "Hesabı onayla" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Bu noktada yeni bir ÅŸifre saÄŸlayarak, aÅŸağıdaki e-posta ile onaylayın. Onayladıktan sonra ÅŸifreniz güncellenecektir." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -615,7 +602,7 @@ msgstr "Bu noktada yeni bir ÅŸifre saÄŸlayarak, aÅŸağıdaki e-posta ile onaylay msgid "Confirmation" msgstr "Onay" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -634,7 +621,7 @@ msgid "Confirmed:" msgstr "Onaylanmış:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -653,8 +640,8 @@ msgstr "Grupla baÄŸlantı kur" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kullanıcı bulunamadı" @@ -672,7 +659,7 @@ msgstr "Kurul" msgid "Council contacts for %s" msgstr "Kurula ulaÅŸmak için %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "Kurul ref: %s" @@ -691,7 +678,7 @@ msgstr "Sayma" msgid "Create a report" msgstr "Bildiri oluÅŸtur" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kategori oluÅŸtur" @@ -735,20 +722,20 @@ msgstr "Kontrol Paneli " msgid "Dealt with by subdivision within 5 working days" msgstr "Alt komisyon tarafından 5 iÅŸ günü içinde üstesinden gelinilecek" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Silindi" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: 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 +743,7 @@ msgid "Description" msgstr "Tanım" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detaylar" @@ -781,11 +768,11 @@ msgid "Diligency prize league table" msgstr "Özenle hazırlanmış iÅŸbirliÄŸi tablosu" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -803,8 +790,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "ÇoÄŸaltmak" @@ -824,7 +811,7 @@ msgstr "" msgid "Edit" msgstr "Ekle" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Bölümün detaylarını düzenle" @@ -854,7 +841,7 @@ msgstr "Editör" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -862,11 +849,11 @@ msgstr "Editör" msgid "Email" msgstr "E-posta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "E-posta kara listeye eklendi" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-posta adresi:" @@ -878,19 +865,14 @@ msgstr "E-posta uyarısı oluÅŸturuldu" msgid "Email alert deleted" msgstr "E-posta uyarısı silindi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-posta kara listede" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Yeni yerel problemleri e posta olarak gönder" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "E-posta:" @@ -899,26 +881,6 @@ msgstr "E-posta:" msgid "Email: %s" msgstr "E-posta: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "BoÅŸ daire veye müstakil ev" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "BoÅŸ ev veya bungalov" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "BoÅŸ büro veya diÄŸer ticari yerler" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "BoÅŸ pub veya bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "BoÅŸ kamu binası- okul, hastane, vb." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -966,18 +928,14 @@ msgstr "Yakınlardaki bir posta kodu, cadde veya bölge ismi giriniz" msgid "Enter a nearby street name and area" msgstr "Yakınlardaki bir cadde ve bölge ismi giriniz" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Yakın çevrede bulunan cadde ismi, bölge ismi, posta kodu veya Delhi de bulunan semti girin" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Åžifre gir" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Problem hakkında detaylı bilgi giriniz" @@ -1003,7 +961,7 @@ msgstr "Örnek postakodu " msgid "Examples:" msgstr "Örnekler:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Sorunun ne olduÄŸunu, nerede ve nezamandan beri orada olduÄŸunu açıklayın..." @@ -1040,19 +998,15 @@ msgstr "Ä°lk kez" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Sorun çözüldü" @@ -1079,7 +1033,7 @@ msgstr "Silindi olarak seçildi" msgid "Flag user" msgstr "Kullanıcıyı seç" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Seçildi" @@ -1101,8 +1055,7 @@ msgstr "Seçilen kullanıcılar hiç bir ÅŸekilde kısıtlanmamıştır. Bu sade msgid "Flagged:" msgstr "Seçilenler:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Sadece o bölge içinde yer alan raporları görüntülemek için bölge linkini takip ediniz." @@ -1133,18 +1086,18 @@ msgstr "Sıkça Sorulan Sorular" msgid "GeoRSS on Google Maps" msgstr " Google Haritadaki GeoRSS " +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Güncellemeleri yap" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "%s Problemlerin güncellemelerini yap" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr " Bu %s'te problemlerin güncellemelerini yap" @@ -1157,7 +1110,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Problemin çözüldüğünü duymak güzel" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1183,7 +1136,7 @@ msgstr "Bu sorun giderildi mi? " msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Daha önce bir problemi bir kurula bildirdiniz mi, yoksa bu ilk defa mı?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1194,8 +1147,7 @@ msgstr "Yardım" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "‘%s’ için yerel sorun uyarı çeÅŸitleri buradadır." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Merhaba %s" @@ -1211,11 +1163,11 @@ msgstr "Merhaba %s" msgid "Hidden" msgstr "Gizli" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Eskileri gizle" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Ä°ÄŸneler gizle" @@ -1235,10 +1187,6 @@ msgstr "Bir problem nasıl bildirilir" msgid "How to send successful reports" msgstr "BaÅŸarılı bildirim nasıl gönderilir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Maalesef onaylanmamış bildirimleri onaylayamıyorsunuz." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1249,7 +1197,7 @@ msgstr "@fixmystreet'e bir problemi henüz bildirdim." msgid "I just updated a problem on @fixmystreet" msgstr "@fixmystreet'teki problemi yeni güncelledim" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Maalesef veri tabanında sorunun yerini bulamadık.\n" @@ -1271,7 +1219,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1292,7 +1240,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1327,10 +1275,10 @@ msgstr "Kanunsuz kimlik " msgid "Illegal feed selection" msgstr "Yasadışı bildirim seçimi" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Devam Etmekte" @@ -1381,7 +1329,7 @@ msgstr "İç yönlendirme" msgid "Invalid agency_responsible value %s" msgstr "Geçersiz ajans_sorumlu deÄŸer %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Geçersiz bitiÅŸ tarihi" @@ -1389,16 +1337,16 @@ msgstr "Geçersiz bitiÅŸ tarihi" msgid "Invalid format %s specified." msgstr "Geçersiz format %s belirlenmiÅŸ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Geçersiz baÅŸlangıç tarihi" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Ä°ncelenmekte" @@ -1420,7 +1368,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1458,7 +1406,6 @@ msgstr "Yükleniyor..." #: 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 "Yerel RSS bildirimi ve e-posta uyarısı" @@ -1467,11 +1414,11 @@ msgstr "Yerel RSS bildirimi ve e-posta uyarısı" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Yerel RSS bildirimi ve‘%s’ için e-posta uyarısı" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Yerel uyarılar" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Problemin bulunduÄŸu alandaki haritayı bul ve iÅŸaretle" @@ -1531,14 +1478,14 @@ msgstr "Ay" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Ä°sim" @@ -1562,8 +1509,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1585,7 +1532,7 @@ msgstr "Yeni <br>sorunlar" msgid "New body added" msgstr "Yeni bölüm eklendi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Yeni kategori bilgisi eklendi" @@ -1650,7 +1597,7 @@ msgstr "Sonraki" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Hayır" @@ -1715,8 +1662,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Sorumlu deÄŸildir" @@ -1749,7 +1696,7 @@ msgstr "Not" 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/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1763,15 +1710,15 @@ msgstr "Not:<strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Åžimdi bildirimini&hellip kaydet;" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1805,8 +1752,8 @@ msgstr "Tek-satırlık özet" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1841,13 +1788,13 @@ msgstr "Veya 'e bildirilen sorunlar:" 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1872,7 +1819,7 @@ msgstr "Ebeveyn" msgid "Partial" msgstr "Kısmi" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1881,7 +1828,7 @@ msgid "Password (optional)" msgstr "Åžifre (isteÄŸe baÄŸlı)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Åžifre:" @@ -1889,7 +1836,7 @@ msgstr "Åžifre:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefon numarası" @@ -1905,13 +1852,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "FotoÄŸraf" @@ -1935,8 +1890,8 @@ msgstr "Harita üzerine iÅŸaretleyin" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1952,16 +1907,16 @@ msgstr "Kibar, açık ve hedef odaklı olun." msgid "Please check the passwords and try again" msgstr "Åžifreyi kontrol ediniz ve tekrar deneyiniz" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "E-posta adresinizin doÄŸruluÄŸunu kontrol ediniz" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1971,7 +1926,7 @@ msgstr "Kategori seçiniz" msgid "Please choose a property type" msgstr "Bir özellik seçin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Lütfen aÅŸağıdaki hataları düzeltiniz" @@ -1992,11 +1947,10 @@ msgstr "" msgid "Please enter a message" msgstr "Mesaj giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Lütfen isminizi giriniz" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2010,10 +1964,10 @@ msgstr "Åžifre giriniz" msgid "Please enter a subject" msgstr "Konu giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2030,9 +1984,9 @@ msgid "Please enter some details" msgstr "Lütfen bir kaç ayrıntı giriniz" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2041,7 +1995,7 @@ msgid "Please enter your email" msgstr "E-posta giriniz" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Lütfen mail adresinizi giriniz" @@ -2057,7 +2011,7 @@ msgstr "Lütfen adınızı ve soyadınızı giriniz, kurullar için gereklidir â #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Lütfen isminizi giriniz" @@ -2084,7 +2038,7 @@ msgstr "Lütfen rahat bir ÅŸekilde <a href=\"%s\"> tekrar giriÅŸ yapın</a>, vey msgid "Please fill in details of the problem below." msgstr "Lütfen aÅŸağıdaki probleme ait ayrıntıları giriniz." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Lütfen probleme ait ayrıntıları giriniz." @@ -2093,7 +2047,7 @@ msgstr "Lütfen probleme ait ayrıntıları giriniz." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Lütfen aÅŸağıda verilen formu problemin detayları ile ilgili doldurunuz ve konumu detay kutucuÄŸu içerisine mümkün oldukça yakın bir ÅŸekilde tarif ediniz." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "BaÅŸka bir anket doldurmak istediÄŸinizi belirtiniz." @@ -2102,9 +2056,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Güncellemeler kurula gönderilmemiÅŸtir." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Bildiriminiz henüz <strong>gönderilmemiÅŸtir. Bir kategori seçiniz ve ayrıntılı bilgi ekleyiniz, sonra kaydediniz." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2120,16 +2073,16 @@ msgstr "" msgid "Please note:" msgstr "Lütfen dikkat:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Bu bildirimi neden paylaÅŸatığınza dair lütfen bir kaç açıklama yapın" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Hem metin hem de fotoÄŸraf ekleyiniz" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Bir kurula daha önce sorun bildirip bildirmediÄŸinizi belirtin" @@ -2145,22 +2098,23 @@ msgstr "Bilgilendirme seçiniz" msgid "Please select the type of alert you want" msgstr "Ä°stediÄŸiniz bir bildiri ÅŸekli secin" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Problemin giderilmiÅŸ veya giderilmemiÅŸ olması durumunu bildiriniz lütfen" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Sadece JPEG formatı yükleyin" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Mesaj gönderin" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Güncellemeleri buraya yazınız" @@ -2191,7 +2145,7 @@ msgstr "" msgid "Previous" msgstr "Önceki" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Gizlilik" @@ -2201,7 +2155,7 @@ msgstr "Gizlilik" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2230,7 +2184,7 @@ msgstr "Problem %s kurula gönderildi %s" msgid "Problem breakdown by state" msgstr "Sorun devlet tarafından meydana gelmiÅŸtir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem çözülmemiÅŸ olarak iÅŸaretlenmiÅŸtir." @@ -2242,10 +2196,6 @@ msgstr "AraÅŸtırma sonucu göz önünde bulundurularak problemin durumundaki de msgid "Problems" msgstr "Sorunlar" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Bu bölgedeki problemler" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Çevredeki problemler" @@ -2263,13 +2213,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Konumun %.1fkm içerisinde yer alan sorunlar" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "%s deki problemler" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "%s semtindeki sorunlar" @@ -2288,15 +2236,11 @@ msgstr "Ä°lgilenilen kısım içinde yer alan sorunlar:" msgid "Property address:" msgstr "Emlak adresi:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Emlak türü:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Güncellemeye izin ver" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "Ä°sim ve ÅŸifre edinmek isteÄŸe baÄŸlıdır, fakat ÅŸifre almış olmanız durumunda sorunları bildirmek, güncellemeleri yapmak ve bildirimleri yönetmek daha kolay olacaktır." @@ -2330,16 +2274,15 @@ msgstr "%s den %s 'e cevaplanan %d sorunun %d anketi" msgid "Questionnaire %d sent for problem %d" msgstr "%d sorunu için gönderilen %d anket" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Anket sorun bildirici tarafından dolduruldu" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS besleme" @@ -2367,18 +2310,12 @@ msgstr "%s içinde %s gözetimiyle RSS besleme" msgid "RSS feed of nearby problems" msgstr "Civardaki problemlerle alakalı RSS besleme" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "%s ile ilgili problemeleri RSS besleme" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "%s içerisindeki problemlerle alakalı RSS besleme" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "%s bölgesi içerisindeki problemlerle alakalı RSS besleme" @@ -2388,14 +2325,13 @@ msgstr "%s bölgesi içerisindeki problemlerle alakalı RSS besleme" msgid "RSS feed of recent local problems" msgstr "Son günlerdeki yerel problemlerle alakalı RSS besleme" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Bu problemin güncellemelerini RSS olarak besle" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Bu sorunda herhangi bir güncelleme olduÄŸunda e-posta ile bildir." @@ -2431,12 +2367,11 @@ msgstr "FotoÄŸrafı kaldır (mümkün olmayabilir)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Bildirim" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2446,7 +2381,7 @@ msgstr "Bir problem bildir" msgid "Report abuse" msgstr "Kötüye kullanım bildir" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "%s 'e bildir" @@ -2461,7 +2396,7 @@ msgstr "Probleminizi bildirin" msgid "Report, view, or discuss local problems" msgstr "Yerel problemleri bildir, göster ve tartış" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "%s 'e ananim olarak bildirilmiÅŸ" @@ -2471,7 +2406,7 @@ msgstr "%s 'e ananim olarak bildirilmiÅŸ" msgid "Reported before" msgstr "Önceden bildirilmiÅŸ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "%s tarafından %s de bildirilmiÅŸtir" @@ -2485,27 +2420,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "%s kategorisine bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "%s kategorisine anonim olarak %s de bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr " %s tarafından %s kategorisinde %s de bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "%s aracılığıyla anonim olarak %s de bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "%s yoluyla %s tarafından %s da bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "%s aracılığıyla %s kategorisine anonim olarak %s de bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr " %s tarafından %s kategorisinde %s aracılığıyla %s 'e bildirilen raporlar" @@ -2526,7 +2461,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Bir problemin bildirilmesi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2569,15 +2504,15 @@ msgstr "Bu isimli yol için yol operatörü (yol referans numarası ve türünde msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Bu isimli yol için yol operatörü (OpenStreetMap'ten): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Sola YerleÅŸtir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2592,7 +2527,7 @@ msgstr "" msgid "Satellite" msgstr "Uydu" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2648,7 +2583,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "%s %s sonra gönder" @@ -2667,21 +2602,21 @@ msgstr "PaylaÅŸ" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Ä°smimi açıkça göster " -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Eskileri göster" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Ä°ÅŸaretlemeleri göster" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2740,9 +2675,8 @@ msgstr "Ãœzgünüz, konum bulunamadı." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Ãœzgünüz, konum ayrıştırılamadı. Daha sonra tekrar deneyin." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2750,15 +2684,10 @@ msgstr "Ãœzgünüz, konum ayrıştırılamadı. Daha sonra tekrar deneyin." msgid "Sorry, we could not parse that location. Please try again." msgstr "Ãœzgünüz, konum ayrıştırılamadı. Daha sonra tekrar deneyin." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Bu sayfa görüntülenirken bir sorun oluÅŸtu. Lütfen daha sonra tekrar deneyin." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "BaÅŸlangıç Tarihi:" @@ -2767,7 +2696,7 @@ msgstr "BaÅŸlangıç Tarihi:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Devlet" @@ -2780,7 +2709,7 @@ msgstr "Devlet" msgid "State:" msgstr "Devlet:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2820,10 +2749,10 @@ msgid "Subject:" msgstr "Konu:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Kaydet" @@ -2851,9 +2780,8 @@ msgstr "Anketi kaydet" msgid "Submitted" msgstr "Kaydedildi" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Kaydet" @@ -2861,7 +2789,7 @@ msgstr "Kaydet" msgid "Subscribe me to an email alert" msgstr "E-posta uyarısını benim için onayla" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2880,7 +2808,7 @@ msgstr "Özet" msgid "Summary reports" msgstr "Özet bildirimler" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Anket" @@ -2937,7 +2865,7 @@ msgstr "Resim yüklediÄŸiniz için teÅŸekkür ederiz. Şİmsi sorunu konumlandı msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "TeÅŸekkürler, sorunun hallolduÄŸuna sevindim. Bu sorunu daha önce herhangi bir birime bildirmiÅŸ miydiniz?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bu ÅŸekilde resim doÄŸru yüklemiÅŸ gibi görünmüyor (%s), lütfen tekrar deneyin." @@ -2945,7 +2873,7 @@ msgstr "Bu ÅŸekilde resim doÄŸru yüklemiÅŸ gibi görünmüyor (%s), lütfen tek msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Bu konuma bir kurul tarafından ele alınacak gibi görünmüyor; belki de deniz ya da ülke dışındadır. Lütfen tekrar deneyin." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "Konum Ä°ngiltere'de görünmüyor; lütfen tekrar deneyin." @@ -2955,11 +2883,11 @@ msgstr "Konum Ä°ngiltere'de görünmüyor; lütfen tekrar deneyin." msgid "That postcode was not recognised, sorry." msgstr "Ãœzgünüz, bu posta kodu bulunamadı." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Problem gönderildi olarak iÅŸaretlenmiÅŸtir." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Bu problem yeniden gönderilecektir." @@ -2971,7 +2899,7 @@ msgstr "Bu bildirim %s 'te görüntülenemiyor" msgid "That report has been removed from FixMyStreet." msgstr "Bu bildirim FixMyStreet'ten kaldırılmışır." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3111,9 +3039,9 @@ msgstr "Tüm Bildirimlerin görüntülendiÄŸi sayfada bir sorun var. Lütfen dah msgid "There was a problem showing this page. Please try again later." msgstr "Bu sayfa görüntülenirken bir sorun oluÅŸtu. Lütfen daha sonra tekrar deneyin." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "E-posta ve ÅŸifre uyumu sorunu vardı. eÄŸer ÅŸifrenizi hatırlamıyorsanız veya ÅŸifreniz yoksa lütfen formun email&rsquo tarafından ‘sign bölümünü doldurunuz. " @@ -3174,9 +3102,9 @@ msgstr "Kullanıcının problemi sınıflandırmama durumunda, bu e-posta proble msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Bu e-posta problemin konumunu kapsayan çeÅŸitli kurullara gönderilmiÅŸtir. SeçilmiÅŸ kategori kurulun yetki alanı dışındaysa, bu sorunu dikkate almayın." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Bu bilgi gereklidir" @@ -3189,11 +3117,11 @@ msgstr "Burası geliÅŸen bir sitedir, her an çökebilir ve veritabanı belli ar msgid "This is a summary of all reports on this site." msgstr "Bu, bu sitedeki bütün raporların özetidir." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Bu problem çözüldü" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Bu problem giderilemedi" @@ -3230,7 +3158,7 @@ msgstr "Bu internet sitesine problemin fotoÄŸrafı da kullanıcı tarafından ek msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zaman çizelgesi" @@ -3275,8 +3203,8 @@ msgstr "Direkt olarak e-posta gönderin:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Onarımı mümkün deÄŸil" @@ -3293,7 +3221,7 @@ msgstr "Onaylanmamış" msgid "Unknown" msgstr "Bilinmeyen" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Bilinmeyen uyarı tipi" @@ -3308,7 +3236,7 @@ msgstr "Bilinmeyen hata" msgid "Unknown problem ID" msgstr "Bilinmeyen ID problemi" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Güncelleme" @@ -3360,10 +3288,10 @@ msgstr "Güncelleme durumu" msgid "Updated" msgstr "Güncellendi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3390,7 +3318,7 @@ msgstr "{{title}} daki güncellemeler" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "Detayları kaydetmek için sadece adminin ekranında görünen <strong>notu</strong> kullanın. Bilgiler kuruma gönderilmeyecek ve kimse tarafından görünmeyecektir." @@ -3399,11 +3327,11 @@ msgstr "Detayları kaydetmek için sadece adminin ekranında görünen <strong>n msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Kullanıcı etiketi kaldırıldı" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Kullanıcı etiketlendi" @@ -3411,16 +3339,16 @@ msgstr "Kullanıcı etiketlendi" msgid "User search finds matches in users' names and email addresses." msgstr "Arama sonuçları kullanıcı adı ve e-posta adresi ile uyumludur." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Kullanıcılar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "DeÄŸerler güncellendi" @@ -3457,16 +3385,15 @@ msgstr "O bölgede birden fazla iÅŸaretlenmiÅŸ yer mevcut. On tane iÅŸaretlenmiÅ #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Telefon numaranızı ve e-posta adresinizi gizli tutulacaktır" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "E-posta adresiniz gizli tutulacaktır" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Telefon numaranızı ve e-posta adresinizi gizli tutulacaktır" @@ -3475,7 +3402,7 @@ msgstr "Telefon numaranızı ve e-posta adresinizi gizli tutulacaktır" msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Bu problemin %s sorumluluÄŸunda olduÄŸunun farkındayız; ancak, ÅŸu anda irtibat bilgilerine sahip deÄŸiliz. EÄŸer uygun irtibat adresini biliyorsanız, bizimle iletiÅŸime geçin." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Sizin adınıza kurula gönderiyoruz" @@ -3513,10 +3440,6 @@ msgstr "GönderildiÄŸinde" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Bütün boÅŸ daireler" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "Neden devam etmiyorsun? <a href=\"/alert\">Ãœcretsiz olarak</a> daha fazla uyarı ekle." @@ -3536,7 +3459,7 @@ msgstr "kurum_sorumluluÄŸunun birime gelen talepleri sınırlandırması mümkü 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'e katkıda bulunmak ister misin? Åžifremiz herkese açıktır ve <a href=\"http://fixmystreet.org\"> burdan ulaşılabilir fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Durumunu kontrol etmek için 4 hafta sonra bir anket yolu ile hatırlatma ister misiniz?" @@ -3566,8 +3489,8 @@ msgstr "Yıl" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Evet" @@ -3683,19 +3606,19 @@ msgid "Your Reports" msgstr "Bildirimlerin" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "E-posta adresiniz" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3706,17 +3629,17 @@ msgstr "E-posta adresin" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Bilgileriniz sadece bizim <a href=\"/privacy\">gizlilik politikası</a> uyumluluÄŸu çerçevesinde kullanılacaktır" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Adınız" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3729,20 +3652,19 @@ msgstr "Åžifren deÄŸiÅŸtirildi" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Telefon numaran" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Bildirimlerin" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Bildirimlerin" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Güncellemelerin" @@ -3768,7 +3690,7 @@ msgid "didn't use map" msgstr "harita kullanılmamış" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "ör. ‘%s’ veya ‘%s’" @@ -3874,8 +3796,7 @@ msgstr "diÄŸer bölgeler:" msgid "reopened" msgstr "yeniden açıldı" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "çıkış yap" @@ -3948,7 +3869,7 @@ msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> bildirimlerin güncellemeleri" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -3984,80 +3905,47 @@ 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] "BahsettiÄŸiniz alanı kapsayan ilgili diÄŸer kurullar hakkında henüz detaylı bilgimiz <strong>yok</strong>" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(e-posta adresiniz veya telefon numaranız gizli tutulacaktır)" - -#~ msgid "(we never show your email)" -#~ msgstr "(e-posta adresiniz gizli tutulacaktır)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Hayır</strong>, bildirimleri e-posta yoluyla onaylamaya izin ver" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Hayır</strong>, güncellemelerimi e-posta yoluyla onaylamama izin ver" - -#~ msgid "Email me updates" -#~ msgstr "Güncellemeleri bana e-posta yolu ile bildir" - -#~ msgid "Enter a new password:" -#~ msgstr "Yeni bir ÅŸifre gir:" - -#~ msgid "Message:" -#~ msgstr "Ä°leti:" - -#~ msgid "More problems nearby" -#~ msgstr "Yakındaki diÄŸer problemler" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Yeni halledildi! Åžimdi e-postanızı kontrol edin..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Saldırgan? Uygunsuz? Lütfen bilirin" - -#~ msgid "Photo:" -#~ msgstr "FotoÄŸraf:" - -#~ msgid "Please check your email" -#~ msgstr "E-posta adresinizi kontrol ediniz" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, rapor edilmiÅŸ %s" -#~ 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 "Güncellemeler kurula gönderilmemiÅŸtir. Ä°sminizi belirttiÄŸiniz takdirde halka açık olacaktır. Bilgileriniz sadece bizim <a href=\"/faq#privacy\">gizlilik politikalarımıza uygun olarak kullanılacaktır</a>" +#~ msgid "About us" +#~ msgstr "Hakkımızda" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Muhtemelen linkin çok eski veya adresin doÄŸru kopyalanmamış olmasından kaynaklıdır." +#~ msgid "Email me new local problems" +#~ msgstr "Yeni yerel problemleri e posta olarak gönder" -#~ msgid "This problem has been closed" -#~ msgstr "Bu problem kapatıldı." +#~ msgid "Empty flat or maisonette" +#~ msgstr "BoÅŸ daire veye müstakil ev" -#~ msgid "This problem is in progress" -#~ msgstr "Bu problemin çözümüne iliÅŸkin süreç devam ediyor" +#~ msgid "Empty house or bungalow" +#~ msgstr "BoÅŸ ev veya bungalov" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Bu problem eski ve durumu bilinmemektedir." +#~ msgid "Empty office or other commercial" +#~ msgstr "BoÅŸ büro veya diÄŸer ticari yerler" -#~ msgid "Update:" -#~ msgstr "Güncelleme:" +#~ msgid "Empty pub or bar" +#~ msgstr "BoÅŸ pub veya bar" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Ãœzgünüz, hesabınızın onayı henüz mümkün olmadı ." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "BoÅŸ kamu binası- okul, hastane, vb." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Hesabınızı onaylamak için size ilgili linkin olduÄŸu bir e-posta gönderdik." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Yakın çevrede bulunan cadde ismi, bölge ismi, posta kodu veya Delhi de bulunan semti girin" -#~ 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 "Bu site hakkında neler düşündüğünü merak ediyoruz. Formu doldur, veya buraya e-posta gönder <a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Bu rapor için daha önce bir fotoÄŸraf eklediniz, eklediÄŸiniz diÄŸer fotoÄŸraf onun yerine geçecektir." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Maalesef onaylanmamış bildirimleri onaylayamıyorsunuz." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Bu güncelleme için daha önce bir fotoÄŸraf eklediniz, eklediÄŸiniz diÄŸer fotoÄŸraf onun yerine geçecektir." +#~ msgid "Problems in this area" +#~ msgstr "Bu bölgedeki problemler" -#~ msgid "Your email:" -#~ msgstr "E-posta adresiniz:" +#~ msgid "Property type:" +#~ msgstr "Emlak türü:" -#~ msgid "Your name:" -#~ msgstr "Adınız:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "%s ile ilgili problemeleri RSS besleme" -#~ msgid "Your email:" -#~ msgstr "Sizin e-posta:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Bütün boÅŸ daireler" diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po index a7e2d97c2..8699a75b8 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: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:37+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/mysociety/fixmystreet/language/uk_UA/)\n" "Language: uk_UA\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "Ñ–" @@ -53,9 +53,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Органи" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -90,7 +89,7 @@ msgstr "%s оперативних Ñповіщень" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s опитувань надіÑлано – на %s відповіли (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s поÑиланнÑ: %s" @@ -109,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s район, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, Ñповіщено о %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, в межах %s району" @@ -167,7 +162,7 @@ msgstr "(графіті, ÑміттÑ, крива бруківка, пробле msgid "(not sent to council)" msgstr "(не відправлено муніципалітету)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(вибірково)" @@ -179,12 +174,11 @@ msgstr "" msgid "(sent to both)" msgstr "(відправлено обидвом)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Оберіть категорію --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Оберіть тип майна --" @@ -219,26 +213,21 @@ msgstr "<strong>ÐÑ–</strong> Я підтверджу ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ðµ-п msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>ÐÑ–</strong> Я підтверджу Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ðµ-поштою" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: 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:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Так</strong> Ð’ мене Ñ” пароль" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Про наÑ" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Запланована діÑ" @@ -269,7 +258,7 @@ msgstr "Додати нову категорію" msgid "Add user" msgstr "Додати кориÑтувача" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Додано %s" @@ -289,7 +278,7 @@ msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ %d Ñтворено Ð´Ð»Ñ %s, type %s, парамРmsgid "Alert %d disabled (created %s)" msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ %d відключено (Ñтворено %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "ПовідомлÑти мене про оновленнÑ" @@ -302,7 +291,7 @@ msgstr "Ð’ÑÑ– звіти" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -401,7 +390,7 @@ msgstr "Ðазад" msgid "Ban email address" msgstr "Забанити адреÑу" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -432,7 +421,7 @@ msgstr "Ðе бачите мапу? <em>ПропуÑÑ‚Ñ–Ñ‚ÑŒ цей крок</em #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -447,7 +436,7 @@ msgstr "КатегоріÑ" msgid "Category fix rate for problems > 4 weeks old" msgstr "Ð’ цій категорії проблеми не вирішуютьÑÑ > 4 тижнів" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -467,7 +456,7 @@ msgstr "КатегоріÑ: %s" msgid "Change password" msgstr "Змінити пароль" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -475,13 +464,13 @@ msgstr "" "Позначте <strong>підтверджений</strong>, щоб вказати, що цей контакт був підтверджений Ñк вірний.\n" "Якщо ви не впевнені у походженні та доÑтовірніÑÑ‚ÑŒ контакта, залиште не позначеним." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 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:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -492,7 +481,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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,8 +522,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -543,7 +532,7 @@ msgstr "" msgid "Closed" msgstr "Закрито" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Закрито муніципалітетом" @@ -569,7 +558,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "КонфігураціÑ" @@ -588,9 +577,8 @@ msgstr "Підтвердити запиÑ" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Підтвердіть е-адреÑу, ввівши новий пароль на цей раз. ПіÑÐ»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ буде змінено." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -600,7 +588,7 @@ msgstr "Підтвердіть е-адреÑу, ввівши новий паро msgid "Confirmation" msgstr "ПідтвердженнÑ" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -619,7 +607,7 @@ msgid "Confirmed:" msgstr "Підтверджені:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -638,8 +626,8 @@ msgstr "ЗвернутиÑÑŒ до команди" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Ðе вдалоÑÑŒ знайти кориÑтувача" @@ -657,7 +645,7 @@ msgstr "Рада" msgid "Council contacts for %s" msgstr "Контакти ради Ð´Ð»Ñ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "рада ref: %s" @@ -676,7 +664,7 @@ msgstr "ЧиÑло" msgid "Create a report" msgstr "Створити ÑповіщеннÑ" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Створити категорію" @@ -720,20 +708,20 @@ msgstr "Дашборд" msgid "Dealt with by subdivision within 5 working days" msgstr "Dealt with by subdivision within 5 working days" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Видалено" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -741,7 +729,7 @@ msgid "Description" msgstr "ОпиÑ" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Подробиці" @@ -766,11 +754,11 @@ msgid "Diligency prize league table" msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð½Ð°Ð¹Ñтаранніших призерів" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -788,8 +776,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Дубль" @@ -809,7 +797,7 @@ msgstr "" msgid "Edit" msgstr "Редагувати" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Редагувати дані про орган" @@ -839,7 +827,7 @@ msgstr "Редактор" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -847,11 +835,11 @@ msgstr "Редактор" msgid "Email" msgstr "Е-пошта" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Пошта занеÑена в чорний ÑпиÑок" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "ÐдреÑа е-пошти:" @@ -863,19 +851,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "ÐдреÑа вже в чорному ÑпиÑку" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "ПовідомлÑйте мене про локальні проблеми лиÑтом" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "Е-пошта:" @@ -884,26 +867,6 @@ msgstr "Е-пошта:" msgid "Email: %s" msgstr "Е-пошта: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "ÐŸÐ¾Ñ€Ð¾Ð¶Ð½Ñ ÐºÐ²Ð°Ñ€Ñ‚Ð¸Ñ€Ð° або дворівнева" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Порожній будинок або бунгало" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Порожній Ð¾Ñ„Ñ–Ñ Ð°Ð±Ð¾ інше комерційне приміщеннÑ" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Порожній паб або бар" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -947,18 +910,14 @@ msgstr "Введіть найближчу поштову адреÑу, або н 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Введіть пароль" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Введіть подробиці проблеми" @@ -984,7 +943,7 @@ msgstr "Зразок поштового коду %s" msgid "Examples:" msgstr "Приклади:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1021,19 +980,15 @@ msgstr "Ім’Ñ" 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:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Вирішено" @@ -1060,7 +1015,7 @@ msgstr "Відмітьте Ñк видалене" msgid "Flag user" msgstr "Відмітьте кориÑтувача" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Відмічено" @@ -1082,8 +1037,7 @@ msgstr "Відмічені кориÑтувачі не заборонені. ЦРmsgid "Flagged:" msgstr "Відмічено:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "ПроÑлійте за поÑиланнÑм на район щоб бачити звіти лише по цьому району" @@ -1114,18 +1068,18 @@ msgstr "ЧаÑто задавані питаннÑ" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Отримувати оновленнÑ" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Отримувати Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ проблеми в %s" @@ -1138,7 +1092,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1164,7 +1118,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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1175,8 +1129,7 @@ msgstr "Допомога" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "От типи локальних Ñповіщень про проблеми Ð´Ð»Ñ ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Вітаємо, %s" @@ -1192,11 +1145,11 @@ msgstr "Вітаємо, %s" msgid "Hidden" msgstr "Прихований" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Приховати заÑтарілі" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Приховати привÑзки" @@ -1216,10 +1169,6 @@ msgstr "Як ÑповіÑтити про проблему" msgid "How to send successful reports" msgstr "Як надіÑлати ÑкіÑне ÑповіщеннÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1230,7 +1179,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Ðажаль ми не можем знайти вашу проблему в базі даних.\n" @@ -1254,7 +1203,7 @@ msgstr "" "Визначіть <strong>предка</strong> Ñкщо цей орган Ñ” чаÑтиною іншого органу.\n" " Ð”Ð»Ñ Ð±Ð°Ð·Ð¾Ð²Ð¸Ñ… налаштувань вам не потрібно поєднувати органи таким чином." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1277,7 +1226,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 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." @@ -1312,10 +1261,10 @@ msgstr "Ðевірний ідентифікатор" msgid "Illegal feed selection" msgstr "Ðевірний вибір завантаженнÑ" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Ð’ процеÑÑ–" @@ -1366,7 +1315,7 @@ msgstr "Внутрішнє поÑиланнÑ" msgid "Invalid agency_responsible value %s" msgstr "Ðевірне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ðевірна кінцева дата" @@ -1374,16 +1323,16 @@ msgstr "Ðевірна кінцева дата" msgid "Invalid format %s specified." msgstr "Ðевірний формат %s ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ðевірна початкова дата" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "ДоÑлідженнÑ" @@ -1405,7 +1354,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1443,7 +1392,6 @@ msgstr "ЗавантаженнÑ..." #: 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 "Локальний RSS потік та поштові ÑповіщеннÑ" @@ -1452,11 +1400,11 @@ msgstr "Локальний RSS потік та поштові Ñповіщенн msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Локальний RSS потік та поштові ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð´Ð»Ñ â€˜%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Локальні ÑповіщеннÑ" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Позначте проблему на карті району" @@ -1516,14 +1464,14 @@ msgstr "МіÑÑць" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Ім'Ñ" @@ -1547,8 +1495,8 @@ msgstr "Ðайближча дорога до шпильки на карті (аРmsgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ðайближчий поштовий Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð¾ шпильки на карті (автоматично згенеровано): %s (відÑтань: %sм)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Ðайближча дорога до шпильки на карті (автоматично згенеровано через Bing карти): %s%s" @@ -1572,7 +1520,7 @@ msgstr "Ðові <br>проблеми" msgid "New body added" msgstr "Ðовий орган додано" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Ðовий контакт категорії додано" @@ -1637,7 +1585,7 @@ msgstr "Далі" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "ÐÑ–" @@ -1702,8 +1650,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Ðе відповідальний" @@ -1736,7 +1684,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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1750,15 +1698,15 @@ msgstr "Ðотатка: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Тепер відправити ваше ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ …" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Тепер щоб відправити ваше поновленнх" @@ -1792,8 +1740,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1828,13 +1776,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1859,7 +1807,7 @@ msgstr "Предок" msgid "Partial" msgstr "ЧаÑтково" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1868,7 +1816,7 @@ msgid "Password (optional)" msgstr "Пароль (опціонально)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Пароль:" @@ -1876,7 +1824,7 @@ msgstr "Пароль:" msgid "Permalink" msgstr "ПоÑтійне поÑиланнÑ" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Ðомер телефону" @@ -1892,13 +1840,21 @@ msgid "Phone:" msgstr "Телефон:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Фото" @@ -1922,8 +1878,8 @@ msgstr "РозміÑÑ‚Ñ–Ñ‚ÑŒ шпильку на карті" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1939,16 +1895,16 @@ msgstr "Будь лаÑка будьте ввічливим, виразним Ñ– msgid "Please check the passwords and try again" msgstr "Будь лаÑка перевірте пароль Ñ– Ñпробуйте ще раз" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Будь лаÑка перевірте чи ваша адреÑа е-пошти вірна" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1958,7 +1914,7 @@ msgstr "Будь лаÑка оберіть категорію" msgid "Please choose a property type" msgstr "Будь лаÑка оберіть тип майна" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1979,11 +1935,10 @@ msgstr "Будь лаÑка не викориÑтовуйте образи msgid "Please enter a message" msgstr "Будь лаÑка введіть повідомленнÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Будь лаÑка введіть ім'Ñ" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1997,10 +1952,10 @@ msgstr "Будь лаÑка введіть пароль" msgid "Please enter a subject" msgstr "Будь лаÑка вкажіть тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2017,9 +1972,9 @@ msgid "Please enter some details" msgstr "Будь лаÑка додайте трохи подробиць" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2028,7 +1983,7 @@ msgid "Please enter your email" msgstr "Будь лаÑка вкажіть е-пошту" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Будь лаÑка вкажіть адреÑу е-пошти" @@ -2044,7 +1999,7 @@ msgstr "Будь лаÑка введіть ім'Ñ Ñ‚Ð° прізвище - деР#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Будь лаÑка введіть ім'Ñ" @@ -2071,7 +2026,7 @@ msgstr "Ви можете <a href=\"%s\">увійти знов</a>, або поРmsgid "Please fill in details of the problem below." msgstr "Будь лаÑка додайте подробиці про проблему нижче." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Будь лаÑка опишіть проблему детально" @@ -2080,7 +2035,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Будь лаÑка вкажіть чи ви хочете отримати інші опитуваннÑ." @@ -2089,9 +2044,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Будь лаÑка зауважте що Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ надÑилаютьÑÑ Ð´ÐµÐ¿Ð°Ñ€Ñ‚Ð°Ð¼ÐµÐ½Ñ‚Ñƒ." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Будь лаÑка заауважте, що ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ <strong>ще не було надіÑлано</strong>. Оберіть категорію та іншу інформацію нижче, Ñ– надішліть." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2107,16 +2061,16 @@ msgstr "" msgid "Please note:" msgstr "Будь лаÑка зауважте:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Будь лаÑка додайте трохи поÑÑнень ÑтоÑовно Ð¿ÐµÑ€ÐµÐ²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ ÑповіщеннÑ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Будь лаÑка додайте текÑÑ‚ Ñ– фото" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Будь лаÑка розкажіть чи ви відправлÑли ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð´ÐµÐ¿Ð°Ñ€Ñ‚Ð°Ð¼ÐµÐ½Ñ‚Ñƒ раніше" @@ -2132,22 +2086,23 @@ msgstr "Оберіть бажаний потік інформації" msgid "Please select the type of alert you want" msgstr "Будь лаÑка оберіть тип бажаних алÑрмів" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Будь лаÑка вкажіть чи була вирішена проблема" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Будь лаÑка завантажуйте тільки JPEG зображеннÑ" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Будь лаÑка напишіть повідомленнÑ" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Будь лаÑка напишіть поновленнÑ" @@ -2178,7 +2133,7 @@ msgstr "" msgid "Previous" msgstr "Попередній" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2188,7 +2143,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2217,7 +2172,7 @@ msgstr "Проблему %s надіÑлано департаменту %s" msgid "Problem breakdown by state" msgstr "Розбивка проблем по Ñтану" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Проблема маркована відкритою." @@ -2229,10 +2184,6 @@ msgstr "Стан проблеми змінено базуючиÑÑŒ на Ñ€ÐµÐ·Ñ msgid "Problems" msgstr "Проблеми" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Проблеми в цьому районі" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Проблеми поблизу" @@ -2250,13 +2201,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Проблеми в радіуÑÑ– %.1fkm від цієї точки" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Проблеми в межах %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Проблеми в межах %s району" @@ -2275,15 +2224,11 @@ msgstr "Проблеми в межах:" msgid "Property address:" msgstr "ÐдреÑа майна:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Тип майна:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ðадішліть оновленнÑ" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "Ð’ÐºÐ°Ð·Ð°Ð½Ð½Ñ Ñ–Ð¼ÐµÐ½Ñ– Ñ– паролю не обов'Ñзкове, проте це дозволить вам більш легко Ñповіщати про проблеми, залишати Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‚Ð° керувати вашими ÑповіщеннÑми" @@ -2317,16 +2262,15 @@ msgstr "ÐžÐ¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ %d проведено ÑтоÑовно пробле msgid "Questionnaire %d sent for problem %d" msgstr "Ðнкета %d відправлена по проблемі %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Ðнкета заповнена автором ÑповіщеннÑ" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS потік" @@ -2354,18 +2298,12 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2375,14 +2313,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "RSS Ñтрічка недавніх локальних проблем" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS Ñтрічка з оновленнÑми по цій проблемі" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Отримувати лиÑта коли Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ð¾ проблемі буде оновлена" @@ -2418,12 +2355,11 @@ msgstr "Видалити фото (це Ð½ÐµÐ·Ð²Ð¾Ñ€Ð¾Ñ‚Ð½Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2433,7 +2369,7 @@ msgstr "СповіÑтити про проблему" msgid "Report abuse" msgstr "ПоÑкаржитиÑÑŒ" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Звіт по %s" @@ -2448,7 +2384,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Сповіщайте, переглÑдайте, або обговорюйте міÑцеві проблеми" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Сповіщено анонімно по %s" @@ -2458,7 +2394,7 @@ msgstr "Сповіщено анонімно по %s" msgid "Reported before" msgstr "Сповіщено раніше" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Перевідкрито %s о %s" @@ -2472,27 +2408,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Сповіщено в категорії %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Сповіщено в категорії %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Сповіщено в категорію %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Сповіщено %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Сповіщено через %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сповіщено через %s в категорію %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сповіщено через %s в категорію %s %s о %s" @@ -2513,7 +2449,7 @@ msgstr "" msgid "Reporting a problem" msgstr "СповіÑтити про проблему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2556,15 +2492,15 @@ msgstr "ОбÑлуговувач цієї дороги (отримано з до msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "ОбÑлуговувач цієї дороги (з OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Повернули вліво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2579,7 +2515,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2635,7 +2571,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Відправити %s %s пізніше" @@ -2654,21 +2590,21 @@ msgstr "Поширити" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Показувати моє ім'Ñ Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¾" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Показувати Ñтарі" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Показувати шпильки" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2727,9 +2663,8 @@ msgstr "Вибачте, ми не знайшли це міÑце" #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Вибачте, ми не можем розпізнати це міÑце. Спробуйте пізніше." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2737,15 +2672,10 @@ msgstr "Вибачте, ми не можем розпізнати це міÑцРmsgid "Sorry, we could not parse that location. Please try again." msgstr "Вибачте, ми не можем розпізнати це міÑце. Спробуйте пізніше." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "СталаÑÑŒ помилка при Ñпробі показати Ñторінку. Будь лаÑка Ñпробуйте пізніше." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Початкова дата:" @@ -2754,7 +2684,7 @@ msgstr "Початкова дата:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Стан" @@ -2767,7 +2697,7 @@ msgstr "Стан" msgid "State:" msgstr "Стан:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2807,10 +2737,10 @@ msgid "Subject:" msgstr "Тема:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Підтвердити" @@ -2838,9 +2768,8 @@ msgstr "Підтвердити анкету" msgid "Submitted" msgstr "Підтверджено" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "ПідпиÑатиÑÑŒ" @@ -2848,7 +2777,7 @@ msgstr "ПідпиÑатиÑÑŒ" msgid "Subscribe me to an email alert" msgstr "Підпишіть мене на поштові алÑрми" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2867,7 +2796,7 @@ msgstr "Резюме" msgid "Summary reports" msgstr "Сумарні ÑповіщеннÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "ОпитуваннÑ" @@ -2924,7 +2853,7 @@ msgstr "ДÑкуємо за надіÑлане фото. Тепер нам Ð¿Ð¾Ñ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "ДÑкуєм, раді чути, що проблему вирішено! Можемо ми поцікавитиÑÑŒ чи Ñповіщали ви органи про будь-Ñку проблему раніше?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Під Ñ‡Ð°Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð¾Ñ‚Ð¾ трапилаÑÑŒ помилка(%s), будь лаÑка повторіть" @@ -2932,7 +2861,7 @@ msgstr "Під Ñ‡Ð°Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð¾Ñ‚Ð¾ трапилаÑÑŒ поРmsgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Це міÑце не підпорÑдковане ЧернівцÑм; можливо воно знаходитьÑÑ Ð·Ð° його межами? Спробуйте ще раз." -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2942,11 +2871,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Поштовий код не розпізнано, вибачте." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Цю проблему зараз перезвітують." @@ -2958,7 +2887,7 @@ msgstr "Цей ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ показати на %s. msgid "That report has been removed from FixMyStreet." msgstr "Це ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ видалено." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3104,9 +3033,9 @@ msgstr "СталаÑÑŒ проблема з відображеннÑм Ñторі msgid "There was a problem showing this page. Please try again later." msgstr "СталаÑÑŒ помилка при Ñпробі показати Ñторінку. Будь лаÑка Ñпробуйте пізніше." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "З комбінацією поштової адреÑи Ñ– паролю щоÑÑŒ не так. Якщо ви не в змозі пригадати пароль або у Ð²Ð°Ñ Ð¹Ð¾Ð³Ð¾ немає, заповніть Ñекцію ‘увійти поштою’" @@ -3167,9 +3096,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Ð¦Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¾Ð±Ð¾Ð²'Ñзкова" @@ -3182,11 +3111,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Цю проблему вирішено" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Цю проблему не вирішено" @@ -3223,7 +3152,7 @@ msgstr "Ð¦Ñ Ð²ÐµÐ±-Ñторінка також міÑтить фото проб msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "ХронологіÑ" @@ -3268,8 +3197,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Ðеможливо виправити" @@ -3286,7 +3215,7 @@ msgstr "Ðе підтверджено" msgid "Unknown" msgstr "Ðевідомо" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Ðевідомий тип алÑрму" @@ -3301,7 +3230,7 @@ msgstr "Ðевідома помилка" msgid "Unknown problem ID" msgstr "Ðевідомий ідентифікатор проблеми" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "ПоновленнÑ" @@ -3353,10 +3282,10 @@ msgstr "Поновити ÑтатуÑи" msgid "Updated" msgstr "Поновлено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3383,7 +3312,7 @@ msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑтоÑовно {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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 "" @@ -3392,11 +3321,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "КориÑтувацький прапорець видалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "КориÑтувач відмічений" @@ -3404,16 +3333,16 @@ msgstr "КориÑтувач відмічений" msgid "User search finds matches in users' names and email addresses." msgstr "Пошук кориÑтувачів знайшов ÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ñ–Ð½Ð½Ñ Ð² іменах та поштових адреÑах" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "КориÑтувачі" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾" @@ -3450,16 +3379,15 @@ msgstr "Ми знайшли більше одного ÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ñ–Ð½Ð½Ñ Ð´Ð #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Ми ніколи не публікуємо вашу поштову адреÑу чи номер телефону." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ми ніколи не публікуєм вашу поштову адреÑу" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ми ніколи не публікуємо вашу поштову адреÑу чи номер телефону." @@ -3468,7 +3396,7 @@ msgstr "Ми ніколи не публікуємо вашу поштову ад 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Ми надіÑлали це відповідному департаменту від вашого імені" @@ -3506,10 +3434,6 @@ msgstr "Коли відправлено" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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 "" @@ -3529,7 +3453,7 @@ msgstr "" 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Хочете отримати ще іншу анкету за 4 тижні, нагадуючу вам про перевірку ÑтатуÑу?" @@ -3559,8 +3483,8 @@ msgstr "Рік" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Так" @@ -3677,19 +3601,19 @@ msgid "Your Reports" msgstr "Ваші ÑповіщеннÑ" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Ваша пошта" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3700,17 +3624,17 @@ msgstr "Ваша адреÑа е-пошти" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Ваша Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð±ÑƒÐ´Ðµ викориÑтана згідно <a href=\"/privacy\">політики конфіденційноÑÑ‚Ñ–</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ваше ім'Ñ" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3723,20 +3647,19 @@ msgstr "Ваш пароль було змінено" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ваш телефон" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Ваші ÑповіщеннÑ" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Ваші ÑповіщеннÑ" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Ваші поновленнÑ" @@ -3762,7 +3685,7 @@ msgid "didn't use map" msgstr "не викориÑтовував карту" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "наприклад ‘%s’ чи ‘%s’" @@ -3868,8 +3791,7 @@ msgstr "інші зони:" msgid "reopened" msgstr "перевідкрито" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "вийти" @@ -3952,7 +3874,7 @@ msgstr[0] "<big>%s</big> Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð° звіті" msgstr[1] "<big>%s</big> оновлень на звіті" msgstr[2] "<big>%s</big> оновлень на звіті" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/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." @@ -4000,80 +3922,41 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(ми не публікуєм вашу електронну адреÑу Ñ– номер телефону)" - -#~ msgid "(we never show your email)" -#~ msgstr "(ми не публікуєм вашу поштову адреÑу)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>ÐÑ–</strong>, Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶Ñƒ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ðµ-поштою" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>ÐÑ–</strong>, Я підтверджу Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ðµ-поштою:" - -#~ msgid "Email me updates" -#~ msgstr "ÐадÑилайте мені новини" - -#~ msgid "Enter a new password:" -#~ msgstr "Введіть новий пароль:" - -#~ 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" - -#~ 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 "Якщо ви кориÑтуєтеÑÑŒ онлайн-поштовиком або маєте Ñпам-фільтр, перевірте папку Ñпам: інколи наші Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ñ€Ð°Ð¿Ð»ÑÑŽÑ‚ÑŒ в цю категорію." - -#~ msgid "Message:" -#~ msgstr "ПовідомленнÑ:" - -#~ msgid "More problems nearby" -#~ msgstr "Ще проблеми поблизу" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Майже закінчили! Тепер перевірте вашу е-пошту..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Образливо? ÐедопуÑтимо? Розкажіть нам" - -#~ msgid "Photo:" -#~ msgstr "Фото:" - -#~ msgid "Please check your email" -#~ msgstr "Будь лаÑка перевірте вашу пошту" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, Ñповіщено о %s" -#~ 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>" +#~ msgid "About us" +#~ msgstr "Про наÑ" -#~ msgid "This problem has been closed" -#~ msgstr "Цю проблему закрито" +#~ msgid "Email me new local problems" +#~ msgstr "ПовідомлÑйте мене про локальні проблеми лиÑтом" -#~ msgid "This problem is in progress" -#~ msgstr "Ð¦Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° в процеÑÑ–" +#~ msgid "Empty flat or maisonette" +#~ msgstr "ÐŸÐ¾Ñ€Ð¾Ð¶Ð½Ñ ÐºÐ²Ð°Ñ€Ñ‚Ð¸Ñ€Ð° або дворівнева" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Ð¦Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° заÑтаріла Ñ– Ñ—Ñ— ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹." +#~ msgid "Empty house or bungalow" +#~ msgstr "Порожній будинок або бунгало" -#~ msgid "Update:" -#~ msgstr "ПоновленнÑ:" +#~ msgid "Empty office or other commercial" +#~ msgstr "Порожній Ð¾Ñ„Ñ–Ñ Ð°Ð±Ð¾ інше комерційне приміщеннÑ" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Ðам не вдалоÑÑŒ підтвердити ваш обліковий запиÑ. Вибачте." +#~ msgid "Empty pub or bar" +#~ msgstr "Порожній паб або бар" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Ми відправили вам лиÑта з поÑиланнÑм на Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "ÐŸÐ¾Ñ€Ð¾Ð¶Ð½Ñ Ð³Ñ€Ð¾Ð¼Ð°Ð´Ñька Ð±ÑƒÐ´Ñ–Ð²Ð»Ñ - школа, Ð»Ñ–ÐºÐ°Ñ€Ð½Ñ Ñ‚Ð° ін." -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Ви вже додали фото до цього ÑповіщеннÑ, Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ фото видалить попереднє." +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Ви вже додали фото до цього поновленнÑ, Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ фото видалить попереднє." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Ðажаль ви не можете підтвердити непідтверджені ÑповіщеннÑ" -#~ msgid "Your email:" -#~ msgstr "Ваша е-пошта:" +#~ msgid "Problems in this area" +#~ msgstr "Проблеми в цьому районі" -#~ msgid "Your name:" -#~ msgstr "Ваше ім'Ñ:" +#~ msgid "Property type:" +#~ msgstr "Тип майна:" -#~ msgid "Your email:" -#~ msgstr "Ваша е-пошта:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Whole block of empty flats" diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po index 7e07ae9ec..05fdc9c6f 100644 --- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,14 +4,13 @@ # Matthew Somerville <matthew@mysociety.org>, 2011-06-03. # # Translators: -# Chi-Hsun Tsai <chihsun.tsai@gmail.com>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2016-01-29 02:52+0000\n" -"Last-Translator: Chi-Hsun Tsai <chihsun.tsai@gmail.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Chinese (http://www.transifex.com/mysociety/fixmystreet/language/zh/)\n" "Language: zh\n" "MIME-Version: 1.0\n" @@ -19,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "與" @@ -52,9 +51,8 @@ msgid "%s admin:" msgstr "%s 管ç†:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "有關單ä½" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -95,7 +93,7 @@ msgstr "%s ç¾å ´æ›´æ–°" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s å•å·é€å‡º – % 回覆(%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s æµæ°´è™Ÿ: %s " @@ -119,10 +117,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s 里/å€, %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s 在 %s è™•ä¹‹ç”³å ± " - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, 在%s 里/å€" @@ -177,7 +171,7 @@ msgstr "(例如塗鴉, 文宣張貼, 人行é“鋪æ¿æˆ–街燈æ壤, )" msgid "(not sent to council)" msgstr "ä¸è¦å‘地方政府é€å‡º" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(ä»»é¸)" @@ -189,12 +183,11 @@ msgstr "(公開)" msgid "(sent to both)" msgstr "兩個都é€å‡º" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "é¸æ“‡åˆ†é¡ž" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "é¸æ“‡å…¬ç‰©ç¨®é¡ž" @@ -231,26 +224,21 @@ msgstr "<strong>ä¸</strong> 我è¦åˆ©ç”¨é›»å郵件確èªæˆ‘çš„ç”³å ± " msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>ä¸</strong> 我è¦ç”¨é›»å郵件收到更新通知" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: 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:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>是</strong> 我有密碼" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "關於我們" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "行動排程 " @@ -285,7 +273,7 @@ msgstr "新增種類" msgid "Add user" msgstr "新增使用者" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "新增 %s" @@ -305,7 +293,7 @@ msgstr "%s創建之 %d通知,　種類 %s, åƒæ•¸ %s / %s" msgid "Alert %d disabled (created %s)" msgstr "%d 關閉通知 " -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "通知我æ¤äº‹å¾ŒçºŒ" @@ -318,7 +306,7 @@ msgstr "æ‰€æœ‰äº‹ä»¶ç”³å ±" msgid "All Reports as CSV" msgstr "æ‰€æœ‰äº‹ä»¶ç”³å ±å˜æˆCSVæ ¼å¼" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -417,7 +405,7 @@ msgstr "回上層" msgid "Ban email address" msgstr "ç¦æ¢ä¹‹é›»å郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -448,7 +436,7 @@ msgstr "無法顯示地圖？ <em>ç•¥éŽæœ¬æ¥é©Ÿ</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -463,7 +451,7 @@ msgstr "類別" msgid "Category fix rate for problems > 4 weeks old" msgstr "4週å‰å·±ä¿®å¾©å•é¡Œä¹‹é¡žåˆ¥" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -483,7 +471,7 @@ msgstr "類別: %s" msgid "Change password" msgstr "æ›´æ›å¯†ç¢¼" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 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." @@ -491,7 +479,7 @@ msgstr "" "看看<strong>已確èªç”³å ±</strong> æ¤é¡¯ç¤ºæ‰¿è¾¦äººå“¡å·²ç¢ºèªç”³è¨´ç„¡èª¤ã€‚\n" "å¦‚æžœä½ ç„¡æ³•ç¢ºå®šæ‰¿è¾¯äººå“¡ä¾†æºèˆ‡æœ‰æ•ˆèˆ‡å¦, è«‹ä¿ç•™ç©ºç™½ã€‚" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 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." @@ -499,7 +487,7 @@ msgstr "" "看看<strong>已刪除</strong> 以移除該類別。\n" "æ¤é刪除類別將ä¸æœƒé¡¯ç¤ºåœ¨ç”³å ±å•é¡Œé 的下拉å¼é¸é …上。" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -516,7 +504,7 @@ msgstr "" "這類å•é¡Œé©åˆæ–¼ç”¨æˆ¶ç”³å ±çµ¦æœ‰é—œæ©Ÿé—œï¼Œä½†å…¬é–‹ç”³å ±è³‡æ–™ä¸¦ç„¡å…¬ç›Šæ€§\n" "例如在英國想在æŸç‰¹å®šåœ°é»žè¦æ±‚多安置垃圾ç’" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 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." @@ -557,8 +545,8 @@ msgstr "é¸æ“‡ç¢ºèªé›»å郵件上的連çµä»¥ä½œç™»å…¥" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -567,7 +555,7 @@ msgstr "é¸æ“‡ç¢ºèªé›»å郵件上的連çµä»¥ä½œç™»å…¥" msgid "Closed" msgstr "關閉" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "由地方政府關閉" @@ -593,7 +581,7 @@ msgstr "è¯åˆå“牌資料:" msgid "Cobrand:" msgstr "è¯åˆå“牌:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "è¨å®š" @@ -612,9 +600,8 @@ msgstr "確èªå¸³æˆ¶" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "確èªä¸‹æ–¹é›»å郵件，輸入新密碼，按確èªéµå¾Œï¼Œæ‚¨çš„密碼å³åˆ»æ›´æ–°ã€‚" +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -624,7 +611,7 @@ msgstr "確èªä¸‹æ–¹é›»å郵件，輸入新密碼，按確èªéµå¾Œï¼Œæ‚¨çš„密 msgid "Confirmation" msgstr "確èª" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -643,7 +630,7 @@ msgid "Confirmed:" msgstr "已確èªï¼š" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "è¯çµ¡ %s" @@ -662,8 +649,8 @@ msgstr "連çµæœ¬åœ˜éšŠ" msgid "Coordinates:" msgstr "å”åŒå–®ä½:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "找ä¸åˆ°è©²æˆ¶ç”¨" @@ -681,7 +668,7 @@ msgstr "地方政府" msgid "Council contacts for %s" msgstr "è¯ç¹‹åœ°æ–¹æ”¿åºœ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "地方政府æµæ°´è™Ÿã€€ref: %s" @@ -700,7 +687,7 @@ msgstr "數é‡" msgid "Create a report" msgstr "å‰µå»ºç”³å ±" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "創建類別" @@ -744,20 +731,20 @@ msgstr "控制å°" msgid "Dealt with by subdivision within 5 working days" msgstr "下屬單ä½5個工作天內處ç†ã€‚" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "刪除模版" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "刪除" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -765,7 +752,7 @@ msgid "Description" msgstr "æè¿°" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "細節" @@ -790,11 +777,11 @@ msgid "Diligency prize league table" msgstr "勤奮表ç¾åå–®" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "您是å¦æœ‰ %s密碼？ " @@ -812,8 +799,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "複製 " @@ -836,7 +823,7 @@ msgstr "" msgid "Edit" msgstr "編輯" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "編輯有關單ä½ç´°ç¯€" @@ -866,7 +853,7 @@ msgstr "編輯器" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -874,11 +861,11 @@ msgstr "編輯器" msgid "Email" msgstr "é›»å郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "é›»å郵件列入濫發åå–®" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "é›»å郵件:" @@ -890,19 +877,14 @@ msgstr "建立電郵通知" msgid "Email alert deleted" msgstr "å–消電郵通知" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "é›»å郵件己在濫發åå–®" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "以電郵通知其它å•é¡Œ" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: 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/zurich/admin/body.html:47 msgid "Email:" msgstr "é›»å郵件:" @@ -911,26 +893,6 @@ msgstr "é›»å郵件:" msgid "Email: %s" msgstr "é›»å郵件: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "閒置的公寓或大樓" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "閒置的房èˆ" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "閒置的辦公室或其它商æ¥ç©ºé–“" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "閒置的酒館或咖啡廳" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -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 "" @@ -979,18 +941,14 @@ msgstr "輸入本å€çš„郵編，街å或å€åŸŸã€‚" 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:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "請輸入密碼" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "請在æ¤å¡«å¯«å•é¡Œçš„細節" @@ -1016,7 +974,7 @@ msgstr "郵éžå€è™Ÿç¯„例 %s" msgid "Examples:" msgstr "範例：" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "說明什麼壞掉故障了，確切的地點以åŠå®ƒç½®æ–¼æ¤è™•æœ‰å¤šä¹…了" @@ -1053,19 +1011,15 @@ msgstr "首次" 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:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "已處ç†" @@ -1092,7 +1046,7 @@ msgstr "標記è¦å‘Šç‚ºåˆªé™¤ã€€" msgid "Flag user" msgstr "標記è¦å‘Šç”¨æˆ¶" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "標記è¦å‘Š" @@ -1114,8 +1068,7 @@ msgstr "被標記è¦å‘Šçš„用戶其權é™ä¸å—影響，åªæ˜¯åˆ—入特別關注 msgid "Flagged:" msgstr "è¦å‘Š:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "追踪里/å€é€£çµï¼Œä»¥æª¢è¦–該å€å…§ä¹‹ç”³å ±" @@ -1146,18 +1099,18 @@ msgstr "常見å•é¡Œå›žè¦†ã€€" msgid "GeoRSS on Google Maps" msgstr "google 地圖上的地ç†RSS" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "å–å¾—æ›´æ–°" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/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 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "å–å¾— %så€åŸŸå…§çš„å•é¡Œæ›´æ–°" @@ -1170,7 +1123,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "很高興è½åˆ°å•é¡Œå·²è™•ç†äº†ã€‚" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1196,7 +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/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1207,8 +1160,7 @@ msgstr "å”助" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "æ¤ç‚ºåœ¨åœ°å•é¡Œçš„種類　‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "您好 %s" @@ -1224,11 +1176,11 @@ msgstr "您好 %s" msgid "Hidden" msgstr "éš±è—" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "éš±è—舊文" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "éš±è—地圖標示" @@ -1248,10 +1200,6 @@ msgstr "å¦‚ä½•ç”³å ±å•é¡Œ " msgid "How to send successful reports" msgstr "如何æˆåŠŸåœ°é€å‡ºç”³å ±" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -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" @@ -1262,7 +1210,7 @@ msgstr "我剛æ‰ç”³å ±äº†ä¸€å€‹å•é¡Œ " msgid "I just updated a problem on @fixmystreet" msgstr "我利用@fixmystreet ç”³å ±äº†ä¸€å€‹å•é¡Œ " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr " 我們無法在資料庫ä¸æ‰¾åˆ°æ‚¨çš„å•é¡Œã€‚\n" @@ -1286,7 +1234,7 @@ msgstr "" "辨別<strong>上級主責</strong> 如果該有關單ä½ç‚ºå…¶å®ƒå–®ä½çš„下屬\n" "基本安è£ä¸ï¼Œæ‚¨ä¸å¿…åŠ å…¥æœ‰é—œå–®ä½" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1312,7 +1260,7 @@ msgstr "" "如果您希望公開留言該å•é¡Œä¹‹æ›´æ–°ï¼Œè«‹åœ¨æ¤è¼¸å…¥\n" "(請注æ„它ä¸æœƒè‡ªå‹•é€åˆ°åœ°æ–¹æ”¿åºœ)" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 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) 或åŒç‰çš„代號。" @@ -1358,10 +1306,10 @@ msgstr "無效帳戶" msgid "Illegal feed selection" msgstr "無效的訂閱é¸é …" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "處ç†ä¸" @@ -1412,7 +1360,7 @@ msgstr "內部推薦" msgid "Invalid agency_responsible value %s" msgstr "無效的權責單ä½æ•¸å€¼ %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "無效的çµæŸæ—¥æœŸ" @@ -1420,16 +1368,16 @@ msgstr "無效的çµæŸæ—¥æœŸ" msgid "Invalid format %s specified." msgstr "無效的%s ç‰¹å®šæ ¼å¼" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "無效的開始日期" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "調查ä¸" @@ -1451,7 +1399,7 @@ msgstr "未知的管轄機關" msgid "Jurisdiction unknown" msgstr "未知的管轄機關" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1489,7 +1437,6 @@ msgstr "載入ä¸...." #: 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 "當地å•é¡Œè¨‚閱與電郵通知" @@ -1498,11 +1445,11 @@ msgstr "當地å•é¡Œè¨‚閱與電郵通知" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "當地å•é¡Œè¨‚閱與電郵通知 %s　" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "當地å•é¡Œã€€" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "在地圖上標記å•é¡Œä¹‹å€åŸŸ" @@ -1562,14 +1509,14 @@ msgstr "月份" #: 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/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "åå—" @@ -1593,8 +1540,8 @@ msgstr "找出地圖標記上最近的街é“å稱(利用 OpenStreetMap自動産 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "找出地圖標記上最近的郵éžå€è™Ÿ(自動産生): %s(%sm away)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "找出地圖標記上最近的街é“(利用 Bing Maps自動産生): %s" @@ -1618,7 +1565,7 @@ msgstr "æ–° <br>å•é¡Œã€€" msgid "New body added" msgstr "新增內文" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "新增類別承辦 人" @@ -1683,7 +1630,7 @@ msgstr "下一æ¥" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "ç„¡" @@ -1754,8 +1701,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "無責任æ¸å±¬" @@ -1788,7 +1735,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:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1802,15 +1749,15 @@ msgstr "ç†è¨˜: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "ç¾åœ¨é€å‡ºæ‚¨çš„ç”³å ± …" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "ç¾åœ¨é€å‡ºæ‚¨æ›´æ–°çš„ç”³å ± … 您是å¦æœ‰æœ¬ç«™å¸³å¯†ï¼Ÿ" @@ -1844,8 +1791,8 @@ msgstr "一å¥ç¸½çµ" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1880,13 +1827,13 @@ 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:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1911,7 +1858,7 @@ msgstr "上級 " msgid "Partial" msgstr "部份" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1920,7 +1867,7 @@ msgid "Password (optional)" msgstr "密碼(ä»»é¸):" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "密碼:" @@ -1928,7 +1875,7 @@ msgstr "密碼:" msgid "Permalink" msgstr "永久連çµ" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "電話號碼" @@ -1944,13 +1891,21 @@ msgid "Phone:" msgstr "電話" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "照片" @@ -1974,8 +1929,8 @@ msgstr "在地圖上作標記" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1991,16 +1946,16 @@ msgstr "用語請éµå®ˆç¦®ç¯€ï¼Œæ˜Žç¢ºè§£é‡‹å•é¡Œ " msgid "Please check the passwords and try again" msgstr "è«‹å†æ¬¡ç¢ºèªæ‚¨çš„密碼" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "請確èªæ‚¨é›»éƒµåœ°å€ç„¡èª¤" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2010,7 +1965,7 @@ msgstr "è«‹é¸æ“‡é¡žåˆ¥" msgid "Please choose a property type" msgstr "é¸æ“‡å…¬ç‰©ç¨®é¡ž" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "è«‹æ›´æ£ä¸‹æ–¹ä¹‹éŒ¯èª¤" @@ -2034,11 +1989,10 @@ msgstr "請勿濫用本æœå‹™ï¼Œæ¿«ç”¨å°‡é€ æˆæ‚¨çš„政府輕視其它使用者 msgid "Please enter a message" msgstr "請寫下您的留言" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "請輸入您的姓æ°" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2052,10 +2006,10 @@ msgstr "請輸入密碼" msgid "Please enter a subject" msgstr "請填下主旨" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2072,9 +2026,9 @@ msgid "Please enter some details" msgstr "請填寫進一æ¥ç´°ç¯€" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2083,7 +2037,7 @@ msgid "Please enter your email" msgstr "請輸入您的電å郵件" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "請輸入您的電å郵件" @@ -2099,7 +2053,7 @@ msgstr "請輸入您的全å，地方政府需è¦æ¤è³‡æ–™ – 如果您ä¸å¸Œæ #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "請輸入您的姓æ°" @@ -2126,7 +2080,7 @@ msgstr "æ¡è¿Ž<a href=\"%s\">å†æ¬¡ç™»å…¥</a>, 或是å†æ¬¡å…‰è‡¨ <a href=\"/\"> msgid "Please fill in details of the problem below." msgstr "請在下方輸入å•é¡Œçš„細節" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "請在æ¤å¡«å¯«å•é¡Œçš„細節" @@ -2135,7 +2089,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:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "è«‹é¸æ“‡æ‚¨æ˜¯å¦é¡˜æ„收到其它å•å·" @@ -2144,9 +2098,8 @@ msgid "Please note that updates are not sent to the council." msgstr "請注æ„這個更新ä¸æœƒé€åˆ°åœ°æ–¹æ”¿åºœ" #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "請注æ„æ‚¨çš„ç”³å ±é‚„<strong>未é€å‡º</strong>. é¸æ“‡åˆé©é¡žåˆ¥åŠé€²ä¸€æ¥è³‡è¨Šï¼Œå†äºˆé€å‡ºã€‚" +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2162,16 +2115,16 @@ msgstr "" msgid "Please note:" msgstr "è«‹åŠ è¨»è¨˜" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "如果您是å†æ¬¡ç”³å ±ï¼Œè«‹èªªæ˜ŽåŽŸå› " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "è«‹æ供一些文å—æ•è¿°èˆ‡ç…§ç‰‡" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "è«‹æ•æ˜Žæ‚¨æ˜¯å¦æ›¾å‘åœ°æ–¹æ”¿åºœç”³å ±éŽå•é¡Œï¼Ÿã€€" @@ -2187,22 +2140,23 @@ msgstr "è«‹é¸æ“‡è¨‚閱方å¼" msgid "Please select the type of alert you want" msgstr "è«‹é¸æ“‡æ›´æ–°é€šçŸ¥æ–¹å¼" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "è«‹æ•æ˜Žè©²å•é¡Œæ˜¯å¦å·²è§£æ±º" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "請上傳JPEGæ ¼å¼ç…§ç‰‡" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "諘寫下您的留言" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "請寫下您的更新" @@ -2233,7 +2187,7 @@ msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">F msgid "Previous" msgstr "之å‰" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "éš±ç§" @@ -2243,7 +2197,7 @@ msgstr "éš±ç§" msgid "Privacy and cookies" msgstr "éš±ç§èˆ‡cookies" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2272,7 +2226,7 @@ msgstr "%s　å•é¡Œå·²é€é”到地方政府　%s　" msgid "Problem breakdown by state" msgstr "本站出ç¾æ•…éšœå•é¡Œã€€" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "å•é¡Œæ¨™è¨»ç‚ºé–‹æ”¾" @@ -2284,10 +2238,6 @@ msgstr "ä¾èª¿æŸ¥çµæžœå‘ˆç¾çš„å•é¡Œæ”¹å–„" msgid "Problems" msgstr "å•é¡Œ" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "本å€åŸŸå…§çš„å•é¡Œ" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "é„°è¿‘çš„å•é¡Œ" @@ -2305,13 +2255,11 @@ msgid "Problems within %.1fkm of this location" msgstr "該地點　%.1f公里內的å•é¡Œã€€" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "在 %s 內的å•é¡Œ" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "在 %s 里/å€çš„å•é¡Œ" @@ -2330,15 +2278,11 @@ msgstr "在 範åœå…§çš„å•é¡Œ" msgid "Property address:" msgstr "公物地å€ï¼š" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "公物種類" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "æ供更新資訊" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "æä¾›å稱與密碼éžç‚ºå¿…è¦ï¼Œä½†å…¶å¯ä»¥è®“æ‚¨æ›´ä¾¿æ–¼ç”³å ±å•é¡Œï¼Œæ供更新與管ç†æ‚¨çš„ç”³å ±ã€‚ã€€ã€€" @@ -2372,16 +2316,15 @@ msgstr " %d回覆之å•é¡Œ%d, %s 到 %s å•å· " msgid "Questionnaire %d sent for problem %d" msgstr "關於 %då•é¡Œæ‰€é€å‡ºä¹‹ %då•å· " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "ç”±å•é¡Œç”³å ±è€…所填之å•å·" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS訂閱" @@ -2409,18 +2352,12 @@ msgstr "%s, 在%s 里/å€" 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:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "在 %s 內之å•é¡ŒRSS 訂閱" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "在 %s 里/å€å•é¡Œçš„RSS 訂閱" @@ -2430,14 +2367,13 @@ msgstr "在 %s 里/å€å•é¡Œçš„RSS 訂閱" msgid "RSS feed of recent local problems" msgstr "最近當地å•é¡Œçš„RSS訂閱" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "最近當地å•é¡Œæ›´æ–°çš„RSS訂閱" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "é€éŽé›»å郵件收å–該å•é¡Œä¹‹æ›´æ–°æ¶ˆæ¯" @@ -2473,12 +2409,11 @@ msgstr "移陯照片(無法回復)" msgid "Reply to user:" msgstr "給用戶的回應" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "æå ±ã€€" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2488,7 +2423,7 @@ msgstr "ç”³å ±å•é¡Œ" msgid "Report abuse" msgstr "ç”³å ±æ¿«ç”¨" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "在%sã€€ç”³å ±ã€€" @@ -2503,7 +2438,7 @@ msgstr "ç”³å ±ä½ çš„å•é¡Œ" msgid "Report, view, or discuss local problems" msgstr "ç”³å ±ï¼Œæª¢è¦–ï¼Œæˆ–è¨Žè«–åœ¨åœ°å•é¡Œ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "在%s 匿åç”³å ± " @@ -2513,7 +2448,7 @@ msgstr "在%s 匿åç”³å ± " msgid "Reported before" msgstr "之å‰çš„ç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "ç”±%s çš„ %s ç”³å ±" @@ -2527,27 +2462,27 @@ msgstr "ç”±ã€€ã€€ç”³å ±" msgid "Reported in the %s category" msgstr "%s ç¨®é¡žä¹‹ç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "%s 種類下的匿åç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "%s 在 %s　%sé¡žåˆ¥çš„ç”³å ±ã€€" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "在%s 匿åç”³å ± " -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "%s　é€éŽ %s　在　%sé¡žåˆ¥çš„ç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "é€éŽ %s　在　%s類別的匿åç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "%s 在 %s　%sé¡žåˆ¥çš„ç”³å ±ã€€" @@ -2568,7 +2503,7 @@ msgstr "å·²ç”³å ± %s" msgid "Reporting a problem" msgstr "ç”³å ±å•é¡Œ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2611,15 +2546,15 @@ msgstr "æ¤æŒ‡å®šè¡—é“之é“路營é‹è€…(å–自é“è·¯åƒç…§ç¢¼èˆ‡ç¨®é¡ž): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "æ¤æŒ‡å®šè¡—é“之é“路營é‹è€…(來自OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "左轉　" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2634,7 +2569,7 @@ msgstr "æ—‹è½‰é€™å¼µç…§ç‰‡å°‡æœƒå°Žè‡´ç”³å ±ä¸æœªå˜æª”的照片更動消失" msgid "Satellite" msgstr "衛星" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2690,7 +2625,7 @@ msgstr "é¸æ“‡æ‚¨è¦æƒ³çš„通知方å¼æˆ–點é¸RSS訂閱按鈕，或者輸入您 msgid "Sent report back" msgstr "é€å›žç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "%s ç¨å¾Œé€çµ¦%s" @@ -2709,21 +2644,21 @@ msgstr "分享" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "公開我的姓å" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "顯示舊文" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "顯示地圖標示" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2785,9 +2720,8 @@ msgstr "抱æ‰ï¼Œæˆ‘們無法找到æ¤ä½ç½®" #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "抱æ‰ï¼Œæˆ‘們無法解æžæ¤åœ°é»žï¼Œè«‹é‡è©¦ä¸€æ¬¡" +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2795,15 +2729,10 @@ msgstr "抱æ‰ï¼Œæˆ‘們無法解æžæ¤åœ°é»žï¼Œè«‹é‡è©¦ä¸€æ¬¡" msgid "Sorry, we could not parse that location. Please try again." msgstr "抱æ‰ï¼Œæˆ‘們無法解æžæ¤åœ°é»žï¼Œè«‹é‡è©¦ä¸€æ¬¡" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "抱æ‰ï¼Œæˆ‘們無法儲å˜ä½ 的照片，請é‡è©¦ä¸€æ¬¡" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "本é 出ç¾éŒ¯èª¤ï¼Œè«‹å†è©¦ä¸€æ¬¡" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "å•å§‹æ—¥ï¼š" @@ -2812,7 +2741,7 @@ msgstr "å•å§‹æ—¥ï¼š" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "陳述" @@ -2825,7 +2754,7 @@ msgstr "陳述" msgid "State:" msgstr "陳述:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2865,10 +2794,10 @@ msgid "Subject:" msgstr "主旨:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "é€å‡º" @@ -2896,9 +2825,8 @@ msgstr "é€å‡ºå•å·" msgid "Submitted" msgstr "å·²é€å‡º" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "訂閱" @@ -2906,7 +2834,7 @@ msgstr "訂閱" msgid "Subscribe me to an email alert" msgstr "åŠ å…¥é€šçŸ¥ä¿¡ä»¶" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2925,7 +2853,7 @@ msgstr "摘è¦" msgid "Summary reports" msgstr "ç”³å ±æ‘˜è¦" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "調查" @@ -2982,7 +2910,7 @@ msgstr "æ„Ÿè¬ä¸Šå‚³ç…§ç‰‡ï¼Œç¾åœ¨éœ€è¦çŸ¥é“å•é¡Œçš„地點ä½ç½®ï¼Œè«‹åœ¨ä¸Š msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "è¬è¬ï¼Œå¾ˆé«˜èˆˆçŸ¥é“æ¤å•é¡Œå·±ä¿®å¾©äº†ã€‚è«‹å•æ‚¨éŽåŽ»æ˜¯å¦æ›¾ç”³å ±éŽå•é¡Œï¼Ÿ " -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "照片上傳似乎無法æ£å¸¸ (%s), è«‹å†è©¦ä¸€æ¬¡ã€‚ " @@ -2990,7 +2918,7 @@ msgstr "照片上傳似乎無法æ£å¸¸ (%s), è«‹å†è©¦ä¸€æ¬¡ã€‚ " msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "該地å€ä¼¼ä¹Žéžè©²åœ°æ–¹æ”¿åºœç®¡è½„，它å¯èƒ½åœ¨è½„å€å¤–，請å†è©¦ 一次 " -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "這地點似乎ä¸åœ¨å°ç£; è«‹å†è©¦ 一次。" @@ -3000,11 +2928,11 @@ msgstr "這地點似乎ä¸åœ¨å°ç£; è«‹å†è©¦ 一次。" msgid "That postcode was not recognised, sorry." msgstr "抱æ‰æ¤éƒµéžå€è™Ÿç„¡æ³•è¾¨è˜" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "å•é¡Œè¢«æ¨™è¨»ç‚ºé€å‡º" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "æ¤å•é¡Œå°‡é‡æ–°é€å‡º" @@ -3016,7 +2944,7 @@ msgstr "æ¤ç”³å ±ç„¡æ³•åœ¨ %s上檢視　" msgid "That report has been removed from FixMyStreet." msgstr "è©²ç”³å ±å·²éFixMyStreet 移除　" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 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." @@ -3168,9 +3096,9 @@ msgstr "本é ç¾åœ¨ç„¡æ³•é¡˜ç¾æ‰€è¦æ±‚çš„ç”³å ±è³‡æ–™ï¼Œè«‹ç¨å€™å†è©¦ã€‚" msgid "There was a problem showing this page. Please try again later." msgstr "本é 出ç¾éŒ¯èª¤ï¼Œè«‹å†è©¦ä¸€æ¬¡" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "您的電å郵件與密碼ä¸ç›¸ç¬¦ï¼Œå¦‚果您éºå¿˜å¯†ç¢¼æˆ–尚未註冊，請在申請表單上填入電å郵件" @@ -3241,9 +3169,9 @@ msgstr "當用戶沒有é¸æ“‡é¡žåˆ¥æ™‚，電å郵件將é€åˆ°è² 責該å€åŸŸçš„ msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "é›»å郵件將é€åˆ°è² 責該å€åŸŸçš„å¤šå€‹åœ°æ–¹æ”¿åºœï¼Œå› é¸æ“‡çš„類別æ供這些å°è±¡ã€‚如果您ä¸æ˜¯è² 責å—ç†æ©Ÿé—œï¼Œè«‹ç•¥éŽã€‚" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "æœ¬é …è³‡è¨Šå¿…å¡«" @@ -3256,11 +3184,11 @@ msgstr "本站為開發試用，å¯èƒ½éš¨æ™‚故障，資料庫也會定期刪除 msgid "This is a summary of all reports on this site." msgstr "æœ¬ç«™æ‰€æœ‰ç”³å ±ç¸½çµ" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "å•é¡Œå·±è™•ç†å®Œç•¢" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "å•é¡Œå°šæœªè§£æ±º" @@ -3297,7 +3225,7 @@ msgstr "本é 包括由用戶æä¾›å應å•é¡Œçš„照片　" msgid "Time spent (in minutes):" msgstr "花費時間(以分é˜è¨ˆ):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "時間軸" @@ -3342,8 +3270,8 @@ msgstr "何ä¸ç›´æŽ¥ç™¼ä¿¡çµ¦æˆ‘們:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "無法修復" @@ -3360,7 +3288,7 @@ msgstr "未確èªçš„" msgid "Unknown" msgstr "未知的" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "未知的通知類別" @@ -3375,7 +3303,7 @@ msgstr "未知的錯誤" msgid "Unknown problem ID" msgstr "未知的å•é¡Œç·¨è™Ÿã€€ã€€" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "æ›´æ–°" @@ -3427,10 +3355,10 @@ msgstr "更新之狀態" msgid "Updated" msgstr "已更新" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3457,7 +3385,7 @@ msgstr "ç”±{{title}}æ›´æ–°" msgid "Updates to this problem, %s" msgstr "æ›´æ–°å•é¡Œ, %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 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> 來記錄給管ç†å“¡å¯çœ‹åˆ°çš„ç´°ç¯€å ±å‘Šã€‚é€™éƒ¨ä»½ä¸æœƒå…¬é–‹ï¼Œä¹Ÿä¸æœƒé€çµ¦ç›¸é—œå–®ä½ã€‚" @@ -3466,11 +3394,11 @@ msgstr "使用<strong>記事本</strong> 來記錄給管ç†å“¡å¯çœ‹åˆ°çš„細節 msgid "Used map" msgstr "已用éŽä¹‹åœ°åœ–" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "移除用戶的標記è¦å‘Š" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "給用戶標記è¦å‘Š" @@ -3478,16 +3406,16 @@ msgstr "給用戶標記è¦å‘Š" msgid "User search finds matches in users' names and email addresses." msgstr "用戶找到相符的å稱與電å郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "使用者" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "數值更新" @@ -3524,16 +3452,15 @@ msgstr "本å€åŸŸæˆ‘們找到更多符åˆçš„資料，我們最多顯示åç†è³‡ #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件或是電話號碼" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件或是電話號碼" @@ -3542,7 +3469,7 @@ msgstr "我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件或是電話號碼" 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 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "我們將代表您將æ¤å‘ˆå ±çµ¦åœ°æ–¹æ”¿åºœ" @@ -3580,10 +3507,6 @@ msgstr "何時é€å‡º" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -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> " @@ -3603,7 +3526,7 @@ msgstr "æœå°‹è¦æ±‚，也å¯èƒ½é™åˆ¶å–®ä¸€æ©Ÿæ§‹ä¸æœå°‹ç›¸é—œæ¬Šè²¬å–®ä½ã€‚ 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:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "您是å¦é¡˜æ„4週後å†æ”¶åˆ°å¦ä¸€ä»½å•å·ï¼Ÿä»¥æ醒您確èªæœ€æ–°çš„ç‹€æ³" @@ -3633,8 +3556,8 @@ msgstr "年份" #: 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:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "是" @@ -3704,9 +3627,8 @@ msgstr "在æ¤ç”³å ±ä¸ä½ å·²ç¶“é™„åŠ äº†ç…§ç‰‡(注æ„ä½ æœ€å¤šå¯é™„3張照片, #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "在æ¤ç”³å ±ä¸ä½ å·²ç¶“é™„åŠ äº†ç…§ç‰‡(注æ„ä½ æœ€å¤šå¯é™„3張照片,å¦‚æžœä½ é‚„æƒ³ä¸Šå‚³æ›´å¤šå¼µ,原先的照片會被移除)" +msgstr "" #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3755,19 +3677,19 @@ msgid "Your Reports" msgstr "æ‚¨çš„ç”³å ±ã€€" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "您的電å郵件" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3778,17 +3700,17 @@ msgstr "您的電å郵件" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "您的個人資料，將會ä¾ç…§<a href=\"/privacy\">本站隱ç§æ¬Šæ”¿ç–</a>作處ç†ä½¿ç”¨" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "姓å" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -3801,20 +3723,19 @@ msgstr "密碼已更新" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "電話號碼" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "ä½ ä½œçš„ç”³å ±" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "ä½ ä½œçš„ç”³å ±" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "æ›´æ–°" @@ -3840,7 +3761,7 @@ msgid "didn't use map" msgstr "ä¸ä½¿ç”¨åœ°åœ–" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "例如 ‘%s’ 或 ‘%s’" @@ -3946,8 +3867,7 @@ msgstr "其它地å€:" msgid "reopened" msgstr "é‡å•Ÿç”³å ±" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "登出" @@ -4020,7 +3940,7 @@ 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 +#: templates/web/base/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." @@ -4056,86 +3976,47 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "我們<strong>尚未<strong>有該å€åŸŸå…¶å®ƒå–®ä½ä¹‹ç´°ç¯€ã€€" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(我們ä¸æœƒé€éœ²æ‚¨çš„電話或電郵)" - -#~ msgid "(we never show your email)" -#~ msgstr "(我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>ä¸</strong>, 我想用電å郵件確èªæˆ‘çš„ç”³å ±l:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>ä¸</strong>, 我è¦åˆ©ç”¨é›»å郵件收å–更新通知:" - -#~ msgid "Email me updates" -#~ msgstr "以電郵通知更新" - -#~ msgid "Enter a new password:" -#~ msgstr "請輸入新密碼" - -#~ 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" - -#~ 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 "如果您使用網é é›»å郵件或開啟垃圾信件éŽæ¿¾ï¼Œæ‚¨æœ€å¥½æª¢æŸ¥ä¸€ä¸‹æ‚¨çš„垃圾信匧，本站郵件å¯èƒ½è¢«æ¸åˆ°è©²åˆ†é¡žä¸‹ã€‚" - -#~ msgid "Message:" -#~ msgstr "留言" - -#~ msgid "More problems nearby" -#~ msgstr "更多鄰近的å•é¡Œã€€" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "å·®ä¸å¤šå¿«å®Œæˆäº†ï¼Œç¾åœ¨æª¢æŸ¥æ‚¨çš„é›»åä¿¡ç®±" - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "å—到羞辱？ä¸é©ç•¶ï¼Ÿè«‹ 告訴我們" - -#~ msgid "Photo:" -#~ msgstr "照片:" - -#~ msgid "Please check your email" -#~ msgstr "請檢查您的電å郵件" +#~ msgid "%s, reported at %s" +#~ msgstr "%s 在 %s è™•ä¹‹ç”³å ± " -#~ 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 "è«‹ç•™æ„這個å•é¡Œçš„æ›´æ–°ä¸æœƒé€é”給地方政府，如果您留下姓å，它將會ä¾ç…§æœ¬ç¶²ç«™çš„éš±ç§æ¬Šæ”¿ç–作處ç†ä½¿ç”¨" +#~ msgid "About us" +#~ msgstr "關於我們" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "å¯èƒ½ç‚ºé€£çµå¤±æ•ˆæˆ–已被使用éŽï¼Œæˆ–是連çµç¶²å€æœªæ£ç¢ºè¤‡è£½ã€‚" +#~ msgid "Email me new local problems" +#~ msgstr "以電郵通知其它å•é¡Œ" -#~ msgid "This problem has been closed" -#~ msgstr "æ¤å•é¡Œå·±çµæ¡ˆ" +#~ msgid "Empty flat or maisonette" +#~ msgstr "閒置的公寓或大樓" -#~ msgid "This problem is in progress" -#~ msgstr "å•é¡Œæ£åœ¨è™•ç†ä¸" +#~ msgid "Empty house or bungalow" +#~ msgstr "閒置的房èˆ" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "æ¤å•é¡Œå·²å¤±æ™‚效，目å‰ç‹€æ³ä¸æ˜Ž" +#~ msgid "Empty office or other commercial" +#~ msgstr "閒置的辦公室或其它商æ¥ç©ºé–“" -#~ msgid "Update:" -#~ msgstr "æ›´æ–°:" +#~ msgid "Empty pub or bar" +#~ msgstr "閒置的酒館或咖啡廳" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "抱æ‰ï¼Œæˆ‘們無法確èªæ‚¨çš„帳戶。" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "閒置的公共建築物，如å¸æ ¡,醫院ç‰" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "我們剛寄給您一å°å…§æœ‰é€£çµç¢ºèªçš„é›»å郵件。" +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "輸入最近的街å，地å€æˆ–郵編號碼" -#~ 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>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "æ‚¨å·²åœ¨æœ¬ç”³å ±ä¸é™„åŠ ä¸€å¼µç…§ç‰‡ï¼Œç”¨å¦ä¸€å¼µç…§ç‰‡å°‡å–代原照片。" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "您ä¸èƒ½ç¢ºèªæ¤å°šæœªç¢ºèªä¹‹ç”³å ±ã€€" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "æ‚¨å·²åœ¨æœ¬ç”³å ±æ›´æ–°ä¸é™„åŠ ä¸€å¼µç…§ç‰‡ï¼Œç”¨å¦ä¸€å¼µç…§ç‰‡å°‡å–代原照片。" +#~ msgid "Problems in this area" +#~ msgstr "本å€åŸŸå…§çš„å•é¡Œ" -#~ msgid "Your email:" -#~ msgstr "ä½ çš„é›»å郵件:" +#~ msgid "Property type:" +#~ msgstr "公物種類" -#~ msgid "Your name:" -#~ msgstr "姓å:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "æ¤ %s å•é¡Œä¹‹RSS 訂閱" -#~ msgid "Your email:" -#~ msgstr "您的電å郵件:" +#~ msgid "Whole block of empty flats" +#~ msgstr "æ•´å€ç‚ºé–’置廢棄空間" diff --git a/perllib/Catalyst/Plugin/Session/State/Cookie.pm b/perllib/Catalyst/Plugin/Session/State/Cookie.pm index bef0c1e66..c4b61123b 100644 --- a/perllib/Catalyst/Plugin/Session/State/Cookie.pm +++ b/perllib/Catalyst/Plugin/Session/State/Cookie.pm @@ -50,13 +50,6 @@ sub update_session_cookie { sub cookie_is_rejecting { my ( $c, $cookie ) = @_; - # Prevent infinite loop in request->path. mySociety addition - return 0 if $c->request->has_uri && !$c->request->_has_path; - - # Don't output cookie for JS or JPEG files. mySociety addition - return 1 if substr($c->request->path, -3) eq '.js' - || substr($c->request->path, -5) eq '.jpeg'; - if ( $cookie->{path} ) { return 1 if index '/'.$c->request->path, $cookie->{path}; } diff --git a/perllib/CronFns.pm b/perllib/CronFns.pm index 545526c8e..888817e05 100755 --- a/perllib/CronFns.pm +++ b/perllib/CronFns.pm @@ -26,20 +26,14 @@ sub options { sub site { my $base_url = shift; my $site = 'fixmystreet'; - $site = 'emptyhomes' if $base_url =~ 'emptyhomes'; $site = 'zurich' if $base_url =~ /zurich|zueri/; return $site; } sub language { my $site = shift; - if ($site eq 'emptyhomes') { - mySociety::Locale::negotiate_language('en-gb,English,en_GB|cy,Cymraeg,cy_GB'); - mySociety::Locale::gettext_domain('FixMyStreet-EmptyHomes', 1); - } else { - mySociety::Locale::negotiate_language('en-gb,English,en_GB|nb,Norwegian,nb_NO'); # XXX Testing - mySociety::Locale::gettext_domain('FixMyStreet', 1); - } + mySociety::Locale::negotiate_language('en-gb,English,en_GB|nb,Norwegian,nb_NO'); # XXX Testing + mySociety::Locale::gettext_domain('FixMyStreet', 1); } 1; diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index b8ce2e051..79ca7f9ee 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -6,7 +6,6 @@ use Catalyst::Runtime 5.80; use FixMyStreet; use FixMyStreet::Cobrand; use Memcached; -use mySociety::Email; use mySociety::Random qw(random_bytes); use FixMyStreet::Map; use FixMyStreet::Email; @@ -247,7 +246,7 @@ sub setup_dev_overrides { delete $params{$_} for grep { !m{^_override_} } keys %params; # stop if there is nothing to add - return 1 unless scalar keys %params; + return unless scalar keys %params; # Check to see if we should clear all if ( $params{_override_clear_all} ) { @@ -271,14 +270,14 @@ sub setup_dev_overrides { Checks the overrides for the value given and returns it if found, undef if not. -Always returns undef unless on a staging site (avoids autovivifying overrides -hash in session and so creating a session for all users). +Always returns undef unless on a staging site and we already have a session +(avoids autovivifying overrides hash and so creating a session for all users). =cut sub get_override { my ( $c, $key ) = @_; - return unless $c->config->{STAGING_SITE}; + return unless $c->config->{STAGING_SITE} && $c->sessionid; return $c->session->{overrides}->{$key}; } @@ -319,37 +318,23 @@ sub send_email { return if FixMyStreet::Email::is_abuser($c->model('DB')->schema, $vars->{to}); - # render the template - my $content = $c->view('Email')->render( $c, $template, $vars ); - - # create an email - will parse headers out of content - my $email = Email::Simple->new($content); - $email->header_set( 'Subject', $vars->{subject} ) if $vars->{subject}; - $email->header_set( 'Reply-To', $vars->{'Reply-To'} ) if $vars->{'Reply-To'}; - - $email->header_set( 'Message-ID', sprintf('<fms-%s-%s@%s>', - time(), unpack('h*', random_bytes(5, 1)), $c->config->{EMAIL_DOMAIN} - ) ); - - # pass the email into mySociety::Email to construct the on the wire 7bit - # format - this should probably happen in the transport instead but hohum. - my $email_text = mySociety::Locale::in_gb_locale { mySociety::Email::construct_email( + my $email = mySociety::Locale::in_gb_locale { FixMyStreet::Email::construct_email( { - _template_ => $email->body, # will get line wrapped + _template_ => $c->view('Email')->render( $c, $template, $vars ), _parameters_ => {}, - _line_indent => '', + _attachments_ => $extra_stash_values->{attachments}, From => $vars->{from}, To => $vars->{to}, - $email->header_pairs + 'Message-ID' => sprintf('<fms-%s-%s@%s>', + time(), unpack('h*', random_bytes(5, 1)), $c->config->{EMAIL_DOMAIN} + ), + $vars->{subject} ? (Subject => $vars->{subject}) : (), + $vars->{'Reply-To'} ? ('Reply-To' => $vars->{'Reply-To'}) : (), } ) }; - if (my $attachments = $extra_stash_values->{attachments}) { - $email_text = FixMyStreet::Email::munge_attachments($email_text, $attachments); - } - # send the email - $c->model('EmailSend')->send($email_text); + $c->model('EmailSend')->send($email); return $email; } diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 2bf215c56..f54a862ab 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -345,8 +345,6 @@ sub update_contacts : Private { $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'; - my $contact = $c->model('DB::Contact')->find_or_new( { body_id => $c->stash->{body_id}, @@ -743,16 +741,6 @@ sub report_edit : Path('report_edit') : Args(1) { my $new_state = $c->get_param('state'); my $old_state = $problem->state; - if ( $new_state eq 'confirmed' - && $problem->state eq 'unconfirmed' - && $c->cobrand->moniker eq 'emptyhomes' ) - { - $c->stash->{status_message} = - '<p><em>' - . _('I am afraid you cannot confirm unconfirmed reports.') - . '</em></p>'; - $done = 1; - } my $flagged = $c->get_param('flagged') ? 1 : 0; my $non_public = $c->get_param('non_public') ? 1 : 0; diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm index 1e6d9ec9e..b0340204a 100644 --- a/perllib/FixMyStreet/App/Controller/Around.pm +++ b/perllib/FixMyStreet/App/Controller/Around.pm @@ -47,7 +47,7 @@ sub index : Path : Args(0) { } # 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'); + return unless $c->forward('check_location_is_acceptable'); # If we have a partial - redirect to /report/new so that it can be # completed. @@ -182,7 +182,7 @@ sub display_location : Private { # create a list of all the pins my @pins; - unless ($c->get_param('no_pins') || $c->cobrand->moniker eq 'emptyhomes') { + unless ($c->get_param('no_pins')) { @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 : $_; diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm index 9e8fb29aa..c5a6cf9bf 100644 --- a/perllib/FixMyStreet/App/Controller/Auth.pm +++ b/perllib/FixMyStreet/App/Controller/Auth.pm @@ -9,6 +9,7 @@ use Net::Domain::TLD; use mySociety::AuthToken; use JSON::MaybeXS; use Net::Facebook::Oauth2; +use Net::Twitter::Lite::WithAPIv1_1; =head1 NAME @@ -38,6 +39,7 @@ sub general : Path : Args(0) { # decide which action to take $c->detach('facebook_sign_in') if $c->get_param('facebook_sign_in'); + $c->detach('twitter_sign_in') if $c->get_param('twitter_sign_in'); my $clicked_password = $c->get_param('sign_in'); my $clicked_email = $c->get_param('email_sign_in'); @@ -133,6 +135,8 @@ sub email_sign_in : Private { }; $token_data->{facebook_id} = $c->session->{oauth}{facebook_id} if $c->get_param('oauth_need_email') && $c->session->{oauth}{facebook_id}; + $token_data->{twitter_id} = $c->session->{oauth}{twitter_id} + if $c->get_param('oauth_need_email') && $c->session->{oauth}{twitter_id}; my $token_obj = $c->model('DB::Token')->create({ scope => 'email_sign_in', @@ -180,6 +184,7 @@ sub token : Path('/M') : Args(1) { $user->name( $data->{name} ) if $data->{name}; $user->password( $data->{password}, 1 ) if $data->{password}; $user->facebook_id( $data->{facebook_id} ) if $data->{facebook_id}; + $user->twitter_id( $data->{twitter_id} ) if $data->{twitter_id}; $user->update; $c->authenticate( { email => $user->email }, 'no_password' ); @@ -203,7 +208,7 @@ sub fb : Private { } sub facebook_sign_in : Private { - my( $self, $c ) = @_; + my ( $self, $c ) = @_; my $fb = $c->forward('/auth/fb'); my $url = $fb->get_authorization_url(scope => ['email']); @@ -223,17 +228,9 @@ Handles the Facebook callback request and completes the authentication sequence. =cut sub facebook_callback: Path('/auth/Facebook') : Args(0) { - my( $self, $c ) = @_; + my ( $self, $c ) = @_; - if ( $c->get_param('error_code') ) { - $c->stash->{oauth_failure} = 1; - if ($c->session->{oauth}{detach_to}) { - $c->detach($c->session->{oauth}{detach_to}, $c->session->{oauth}{detach_args}); - } else { - $c->stash->{template} = 'auth/general.html'; - $c->detach; - } - } + $c->detach('oauth_failure') if $c->get_param('error_code'); my $fb = $c->forward('/auth/fb'); my $access_token; @@ -250,12 +247,92 @@ sub facebook_callback: Path('/auth/Facebook') : Args(0) { $c->session->{oauth}{token} = $access_token; my $info = $fb->get('https://graph.facebook.com/me?fields=name,email')->as_hash(); - my $name = $info->{name}; my $email = lc ($info->{email} || ""); - my $uid = $info->{id}; + $c->forward('oauth_success', [ 'facebook', $info->{id}, $info->{name}, $email ]); +} + +=head2 twitter_sign_in + +Starts the Twitter authentication sequence. + +=cut + +sub tw : Private { + my ($self, $c) = @_; + Net::Twitter::Lite::WithAPIv1_1->new( + ssl => 1, + consumer_key => $c->config->{TWITTER_KEY}, + consumer_secret => $c->config->{TWITTER_SECRET}, + ); +} + +sub twitter_sign_in : Private { + my ( $self, $c ) = @_; + + my $twitter = $c->forward('/auth/tw'); + my $url = $twitter->get_authentication_url(callback => $c->uri_for('/auth/Twitter')); + + my %oauth; + $oauth{return_url} = $c->get_param('r'); + $oauth{detach_to} = $c->stash->{detach_to}; + $oauth{detach_args} = $c->stash->{detach_args}; + $oauth{token} = $twitter->request_token; + $oauth{token_secret} = $twitter->request_token_secret; + $c->session->{oauth} = \%oauth; + $c->res->redirect($url); +} + +=head2 twitter_callback + +Handles the Twitter callback request and completes the authentication sequence. + +=cut + +sub twitter_callback: Path('/auth/Twitter') : Args(0) { + my ( $self, $c ) = @_; + + my $request_token = $c->req->param('oauth_token'); + my $verifier = $c->req->param('oauth_verifier'); + my $oauth = $c->session->{oauth}; + + $c->detach('oauth_failure') if $c->get_param('denied') || $request_token ne $oauth->{token}; + + my $twitter = $c->forward('/auth/tw'); + $twitter->request_token($oauth->{token}); + $twitter->request_token_secret($oauth->{token_secret}); + + eval { + # request_access_token no longer returns UID or name + $twitter->request_access_token(verifier => $verifier); + }; + if ($@) { + ($c->stash->{message} = $@) =~ s/at [^ ]*Auth.pm.*//; + $c->stash->{template} = 'errors/generic.html'; + $c->detach; + } + + my $info = $twitter->verify_credentials(); + $c->forward('oauth_success', [ 'twitter', $info->{id}, $info->{name} ]); +} + +sub oauth_failure : Private { + my ( $self, $c ) = @_; + + $c->stash->{oauth_failure} = 1; + if ($c->session->{oauth}{detach_to}) { + $c->detach($c->session->{oauth}{detach_to}, $c->session->{oauth}{detach_args}); + } else { + $c->stash->{template} = 'auth/general.html'; + $c->detach; + } +} + +sub oauth_success : Private { + my ($self, $c, $type, $uid, $name, $email) = @_; my $user; if ($email) { + # Only Facebook gets here # We've got an ID and an email address # Remove any existing mention of this ID my $existing = $c->model('DB::User')->find( { facebook_id => $uid } ); @@ -267,14 +344,14 @@ sub facebook_callback: Path('/auth/Facebook') : Args(0) { $user->in_storage() ? $user->update : $user->insert; } else { # We've got an ID, but no email - $user = $c->model('DB::User')->find( { facebook_id => $uid } ); + $user = $c->model('DB::User')->find( { $type . '_id' => $uid } ); if ($user) { - # Matching Facebook ID in our database + # Matching ID in our database $user->name($name); $user->update; } else { # No matching ID, store ID for use later - $c->session->{oauth}{facebook_id} = $uid; + $c->session->{oauth}{$type . '_id'} = $uid; $c->stash->{oauth_need_email} = 1; } } diff --git a/perllib/FixMyStreet/App/Controller/Contact.pm b/perllib/FixMyStreet/App/Controller/Contact.pm index 115f4e3d2..e20011471 100644 --- a/perllib/FixMyStreet/App/Controller/Contact.pm +++ b/perllib/FixMyStreet/App/Controller/Contact.pm @@ -242,8 +242,7 @@ sub send_email : Private { my $from = [ $c->stash->{em}, $c->stash->{form_name} ]; my $params = { - to => [ [ $recipient, _($recipient_name) ] ], - subject => 'FMS message: ' . $c->stash->{subject}, + to => [ [ $recipient, _($recipient_name) ] ], }; if (FixMyStreet::Email::test_dmarc($c->stash->{em})) { $params->{'Reply-To'} = [ $from ]; diff --git a/perllib/FixMyStreet/App/Controller/Location.pm b/perllib/FixMyStreet/App/Controller/Location.pm index 6def423ce..c457c8fce 100644 --- a/perllib/FixMyStreet/App/Controller/Location.pm +++ b/perllib/FixMyStreet/App/Controller/Location.pm @@ -134,22 +134,6 @@ sub check_location : Private { return 1; } -=head2 country_message - -Displays the country_message template, used for displaying a message to -people using the site from outside the host country. - -=cut - -sub country_message : Path('/country_message') : Args(0) { - my ( $self, $c ) = @_; - - # we do not want to cache this as we always want to check if displaying this - # is the right thing to do. - $c->res->header( 'Cache_Control' => 'max-age=0' ); - $c->stash->{template} = 'front/international_banner.html'; -} - # Utility function for if someone (rarely) enters a grid reference sub gridref_to_latlon { my ( $a, $b, $num ) = @_; diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm index f35dc64a5..4f1727b1a 100644 --- a/perllib/FixMyStreet/App/Controller/Open311.pm +++ b/perllib/FixMyStreet/App/Controller/Open311.pm @@ -284,7 +284,7 @@ sub output_requests : Private { my $display_photos = $c->cobrand->allow_photo_display($problem); if ($display_photos && $problem->photo) { my $url = $c->cobrand->base_url(); - my $imgurl = $url . "/photo/$id.full.jpeg"; + my $imgurl = $url . $problem->photos->[0]->{url_full}; $request->{'media_url'} = [ $imgurl ]; } push(@problemlist, $request); diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index bfb1c5535..d24d3ff71 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -29,12 +29,12 @@ Display a photo =cut -sub during :LocalRegex('^([0-9a-f]{40})\.(temp|fulltemp)\.jpeg$') { +sub during :LocalRegex('^(temp|fulltemp)\.([0-9a-f]{40}\.(?:jpeg|png|gif|tiff))$') { my ( $self, $c ) = @_; - my ( $hash, $size ) = @{ $c->req->captures }; + my ( $size, $filename ) = @{ $c->req->captures }; my $photoset = FixMyStreet::App::Model::PhotoSet->new({ - data_items => [ $hash ] + data_items => [ $filename ] }); $size = $size eq 'temp' ? 'default' : 'full'; @@ -43,7 +43,7 @@ sub during :LocalRegex('^([0-9a-f]{40})\.(temp|fulltemp)\.jpeg$') { $c->forward( 'output', [ $photo ] ); } -sub index :LocalRegex('^(c/)?(\d+)(?:\.(\d+))?(?:\.(full|tn|fp))?\.jpeg$') { +sub index :LocalRegex('^(c/)?(\d+)(?:\.(\d+))?(?:\.(full|tn|fp))?\.(?:jpeg|png|gif|tiff)$') { my ( $self, $c ) = @_; my ( $is_update, $id, $photo_number, $size ) = @{ $c->req->captures }; @@ -79,10 +79,10 @@ sub output : Private { # Save to file File::Path::make_path( FixMyStreet->path_to( 'web', 'photo', 'c' )->stringify ); - File::Slurp::write_file( FixMyStreet->path_to( 'web', $c->req->path )->stringify, \$photo ); + File::Slurp::write_file( FixMyStreet->path_to( 'web', $c->req->path )->stringify, \$photo->{data} ); - $c->res->content_type( 'image/jpeg' ); - $c->res->body( $photo ); + $c->res->content_type( $photo->{content_type} ); + $c->res->body( $photo->{data} ); } sub no_photo : Private { @@ -140,7 +140,7 @@ sub process_photo_upload_or_cache : Private { /^photo/ ? # photo, photo1, photo2 etc. ($c->req->upload($_)) : () } sort $c->req->upload), - split /,/, ($c->get_param('upload_fileid') || '') + grep { $_ } split /,/, ($c->get_param('upload_fileid') || '') ); my $photoset = FixMyStreet::App::Model::PhotoSet->new({ diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm index 8fe2514c0..017a552db 100755 --- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm +++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm @@ -47,14 +47,6 @@ sub check_questionnaire : Private { $c->stash->{problem} = $problem; $c->stash->{answered_ever_reported} = $problem->user->answered_ever_reported; - - # EHA needs to know how many to alter display, and whether to send another or not - if ($c->cobrand->moniker eq 'emptyhomes') { - $c->stash->{num_questionnaire} = $c->model('DB::Questionnaire')->count( - { problem_id => $problem->id } - ); - } - } =head2 submit @@ -236,11 +228,6 @@ sub process_questionnaire : Private { $c->stash->{update} = Utils::cleanup_text($c->stash->{update}, { allow_multiline => 1 }); - # EHA questionnaires done for you - if ($c->cobrand->moniker eq 'emptyhomes') { - $c->stash->{another} = $c->stash->{num_questionnaire}==1 ? 'Yes' : 'No'; - } - my @errors; push @errors, _('Please state whether or not the problem has been fixed') unless $c->stash->{been_fixed}; diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 5cc44bb8f..475a29fb5 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -230,7 +230,7 @@ to moderation, however we'd need to inform all the other users too about this change, at which point we can delete: - this method - - the call to it in templates/web/fixmystreet/report/display.html + - the call to it in templates/web/base/report/display_tools.html - the users_can_hide cobrand method, in favour of user->has_permission_to =cut diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 66dc20a3a..5df182506 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -221,7 +221,7 @@ sub category_extras_ajax : Path('category_extras') : Args(0) { $c->forward('setup_categories_and_bodies'); $c->forward('check_for_category'); - my $category = $c->stash->{category}; + my $category = $c->stash->{category} || ""; my $category_extra = ''; my $generate; if ( $c->stash->{category_extras}->{$category} && @{ $c->stash->{category_extras}->{$category} } >= 1 ) { @@ -616,58 +616,47 @@ sub setup_categories_and_bodies : Private { $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' ) { - - # add all bodies found to the list - foreach (@contacts) { - $bodies_to_list{ $_->body_id } = 1; + # If there's only one body, and it's set to refused, we can show the + # message immediately, before they select a category. + if ($c->action->name eq 'category_extras_ajax' && $c->req->method eq 'POST') { + # The mobile app doesn't currently use this, in which case make + # sure the message is output, either below with a category, or when + # a blank category call is made. + $c->stash->{unresponsive}{""} = $first_body->id; + } else { + $c->stash->{unresponsive}{ALL} = $first_body->id; } + } - # set our own categories - @category_options = ( - _('-- Pick a property type --'), - _('Empty house or bungalow'), - _('Empty flat or maisonette'), - _('Whole block of empty flats'), - _('Empty office or other commercial'), - _('Empty pub or bar'), - _('Empty public building - school, hospital, etc.') - ); - - } else { - - # keysort does not appear to obey locale so use strcoll (see i18n.t) - @contacts = sort { strcoll( $a->category, $b->category ) } @contacts; + # keysort does not appear to obey locale so use strcoll (see i18n.t) + @contacts = sort { strcoll( $a->category, $b->category ) } @contacts; - my %seen; - foreach my $contact (@contacts) { + my %seen; + foreach my $contact (@contacts) { - $bodies_to_list{ $contact->body_id } = 1; + $bodies_to_list{ $contact->body_id } = 1; - unless ( $seen{$contact->category} ) { - push @category_options, $contact->category; + unless ( $seen{$contact->category} ) { + push @category_options, $contact->category; - my $metas = $contact->get_extra_fields; - $category_extras{ $contact->category } = $metas - if scalar @$metas; + 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; + my $body_send_method = $bodies{$contact->body_id}->send_method || ''; + $c->stash->{unresponsive}{$contact->category} = $contact->body_id + if !$c->stash->{unresponsive}{ALL} && + ($contact->email =~ /^REFUSED$/i || $body_send_method eq 'Refused'); - $non_public_categories{ $contact->category } = 1 if $contact->non_public; - } - $seen{$contact->category} = 1; + $non_public_categories{ $contact->category } = 1 if $contact->non_public; } + $seen{$contact->category} = 1; + } - if (@category_options) { - # If there's an Other category present, put it at the bottom - @category_options = ( _('-- Pick a category --'), grep { $_ ne _('Other') } @category_options ); - push @category_options, _('Other') if $seen{_('Other')}; - } + if (@category_options) { + # If there's an Other category present, put it at the bottom + @category_options = ( _('-- Pick a category --'), grep { $_ ne _('Other') } @category_options ); + push @category_options, _('Other') if $seen{_('Other')}; } $c->cobrand->munge_category_list(\@category_options, \@contacts, \%category_extras) @@ -849,12 +838,7 @@ sub process_report : Private { my $first_area = ( values %$areas )[0]; my $first_body = ( values %$bodies )[0]; - if ( $c->cobrand->moniker eq 'emptyhomes' ) { - - $bodies = join( ',', @{ $c->stash->{bodies_to_list} } ) || -1; - $report->bodies_str( $bodies ); - - } elsif ( $report->category ) { + if ( $report->category ) { # FIXME All contacts were fetched in setup_categories_and_bodies, # so can this DB call also be avoided? @@ -1034,6 +1018,8 @@ sub tokenize_user : Private { }; $c->stash->{token_data}{facebook_id} = $c->session->{oauth}{facebook_id} if $c->get_param('oauth_need_email') && $c->session->{oauth}{facebook_id}; + $c->stash->{token_data}{twitter_id} = $c->session->{oauth}{twitter_id} + if $c->get_param('oauth_need_email') && $c->session->{oauth}{twitter_id}; } =head2 save_user_and_report @@ -1061,7 +1047,7 @@ 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->get_param('external_source_id') =~ /^\d+$/) { + if (($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} ) ; diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm index 8d6bc2019..af4ccff03 100644 --- a/perllib/FixMyStreet/App/Controller/Report/Update.pm +++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm @@ -382,6 +382,8 @@ sub tokenize_user : Private { }; $c->stash->{token_data}{facebook_id} = $c->session->{oauth}{facebook_id} if $c->get_param('oauth_need_email') && $c->session->{oauth}{facebook_id}; + $c->stash->{token_data}{twitter_id} = $c->session->{oauth}{twitter_id} + if $c->get_param('oauth_need_email') && $c->session->{oauth}{twitter_id}; } =head2 save_update diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index 027b0d5a4..5bcbb3dc4 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -141,15 +141,9 @@ sub ward : Path : Args(2) { area => $c->stash->{ward} ? $c->stash->{ward}->{id} : [ keys %{$c->stash->{body}->areas} ], any_zoom => 1, ); - if ( $c->cobrand->moniker eq 'emptyhomes' ) { - FixMyStreet::Map::display_map( - $c, %map_params, latitude => 0, longitude => 0, - ); - } else { - FixMyStreet::Map::display_map( - $c, %map_params, pins => $pins, - ); - } + FixMyStreet::Map::display_map( + $c, %map_params, pins => $pins, + ); $c->cobrand->tweak_all_reports_map( $c ); @@ -188,15 +182,6 @@ sub rss_area_ward : Path('/rss/area') : Args(2) { # We're checking an area here, but this function is currently doing that. return if $c->cobrand->reports_body_check( $c, $area ); - # If we're passed an ID number (don't think this is used anywhere, it - # certainly shouldn't be), just look that up on mapit and redirect - if ($area =~ /^\d+$/) { - my $council = mySociety::MaPit::call('area', $area); - $c->detach( 'redirect_index') if $council->{error}; - $c->stash->{body} = $council; - $c->detach( 'redirect_body' ); - } - # We must now have a string to check on mapit my $areas = mySociety::MaPit::call( 'areas', $area, type => $c->cobrand->area_types, @@ -296,15 +281,6 @@ sub body_check : Private { # Oslo/ kommunes sharing a name in Norway return if $c->cobrand->reports_body_check( $c, $q_body ); - # If we're passed an ID number (don't think this is used anywhere, it - # certainly shouldn't be), just look that up on MaPit and redirect - if ($q_body =~ /^\d+$/) { - my $area = mySociety::MaPit::call('area', $q_body); - $c->detach( 'redirect_index') if $area->{error}; - $c->stash->{body} = $area; - $c->detach( 'redirect_body' ); - } - # We must now have a string to check my @bodies = $c->model('DB::Body')->search( { name => { -like => "$q_body%" } } )->all; diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index 6047f063b..8d4f8313c 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -6,6 +6,8 @@ use POSIX qw(strftime); use URI::Escape; use XML::RSS; +use FixMyStreet::App::Model::PhotoSet; + use mySociety::Gaze; use mySociety::Locale; use mySociety::MaPit; @@ -160,7 +162,6 @@ sub local_problems_ll : Private { sub output : Private { my ( $self, $c ) = @_; - $c->detach( '/page_error_404_not_found', [ 'Feed not found' ] ) if $c->cobrand->moniker eq 'emptyhomes'; $c->forward( 'lookup_type' ); $c->forward( 'query_main' ); $c->forward( 'generate' ); @@ -277,8 +278,13 @@ sub add_row : Private { $item{category} = ent($row->{category}) if $row->{category}; if ($c->cobrand->allow_photo_display($row) && $row->{photo}) { + # Bit yucky as we don't have full objects here + my $photoset = FixMyStreet::App::Model::PhotoSet->new({ db_data => $row->{photo} }); + my $first_fn = $photoset->get_id(0); + my ($hash, $format) = split /\./, $first_fn; + my $cachebust = substr($hash, 0, 8); my $key = $alert_type->item_table eq 'comment' ? 'c/' : ''; - $item{description} .= ent("\n<br><img src=\"". $base_url . "/photo/$key$row->{id}.jpeg\">"); + $item{description} .= ent("\n<br><img src=\"". $base_url . "/photo/$key$row->{id}.0.$format?$cachebust\">"); } if ( $row->{used_map} ) { diff --git a/perllib/FixMyStreet/App/Controller/Tokens.pm b/perllib/FixMyStreet/App/Controller/Tokens.pm index eb35fd152..38f344250 100644 --- a/perllib/FixMyStreet/App/Controller/Tokens.pm +++ b/perllib/FixMyStreet/App/Controller/Tokens.pm @@ -106,6 +106,7 @@ sub confirm_problem : Path('/P') { $problem->user->password( $data->{password}, 1 ) if $data->{password}; $problem->user->title( $data->{title} ) if $data->{title}; $problem->user->facebook_id( $data->{facebook_id} ) if $data->{facebook_id}; + $problem->user->twitter_id( $data->{twitter_id} ) if $data->{twitter_id}; $problem->user->update; } $c->authenticate( { email => $problem->user->email }, 'no_password' ); @@ -232,6 +233,7 @@ sub confirm_update : Path('/C') { $comment->user->name( $data->{name} ) if $data->{name}; $comment->user->password( $data->{password}, 1 ) if $data->{password}; $comment->user->facebook_id( $data->{facebook_id} ) if $data->{facebook_id}; + $comment->user->twitter_id( $data->{twitter_id} ) if $data->{twitter_id}; $comment->user->update; } diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm index 54457bae9..b44bf4b38 100644 --- a/perllib/FixMyStreet/App/Model/PhotoSet.pm +++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm @@ -8,6 +8,8 @@ use if !$ENV{TRAVIS}, 'Image::Magick'; use Scalar::Util 'openhandle', 'blessed'; use Digest::SHA qw(sha1_hex); use Image::Size; +use IPC::Cmd qw(can_run); +use IPC::Open3; use MIME::Base64; has c => ( @@ -49,7 +51,7 @@ has data_items => ( # either a) split from db_data or b) provided by photo uploa my $self = shift; my $data = $self->db_data or return []; - return [$data] if (_jpeg_magic($data)); + return [$data] if (detect_type($data)); return [ split ',' => $data ]; }, @@ -70,10 +72,12 @@ has upload_dir => ( }, ); -sub _jpeg_magic { - $_[0] =~ /^\x{ff}\x{d8}/; # JPEG - # NB: should we also handle \x{89}\x{50} (PNG, 15 results in live DB) ? - # and \x{49}\x{49} (Tiff, 3 results in live DB) ? +sub detect_type { + return 'jpeg' if $_[0] =~ /^\x{ff}\x{d8}/; + return 'png' if $_[0] =~ /^\x{89}\x{50}/; + return 'tiff' if $_[0] =~ /^II/; + return 'gif' if $_[0] =~ /^GIF/; + return ''; } =head2 C<ids>, C<num_images>, C<get_id>, C<all_ids> @@ -106,15 +110,17 @@ has ids => ( # Arrayref of $fileid tuples (always, so post upload/raw data proc my $part = $_; if (blessed $part and $part->isa('Catalyst::Request::Upload')) { - # check that the photo is a jpeg my $upload = $part; my $ct = $upload->type; $ct =~ s/x-citrix-//; # Thanks, Citrix + my ($type) = $ct =~ m{image/(jpeg|pjpeg|gif|tiff|png)}; + $type = 'jpeg' if $type && $type eq 'pjpeg'; # Had a report of a JPEG from an Android 2.1 coming through as a byte stream - unless ( $ct eq 'image/jpeg' || $ct eq 'image/pjpeg' || $ct eq 'application/octet-stream' ) { + $type = 'jpeg' if !$type && $ct eq 'application/octet-stream'; + unless ( $type ) { my $c = $self->c; $c->log->info('Bad photo tried to upload, type=' . $ct); - $c->stash->{photo_error} = _('Please upload a JPEG image only'); + $c->stash->{photo_error} = _('Please upload an image only'); return (); } @@ -139,12 +145,18 @@ has ids => ( # Arrayref of $fileid tuples (always, so post upload/raw data proc # get the photo into a variable my $photo_blob = eval { my $filename = $upload->tempname; - my $out = `jhead -se -autorot $filename 2>&1`; + my $out; + if ($type eq 'jpeg' && can_run('jhead')) { + my $pid = open3(undef, my $stdout, undef, 'jhead', '-se', '-autorot', $filename); + $out = join('', <$stdout>); + waitpid($pid, 0); + close $stdout; + } 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 an image only") . "\n" if !defined $w || $err !~ /JPG|GIF|PNG|TIF/; } - die _("Please upload a JPEG image only") . "\n" if $out && $out =~ /Not JPEG:/; + die _("Please upload an image only") . "\n" if $out && $out =~ /Not JPEG:/; my $photo = $upload->slurp; }; if ( my $error = $@ ) { @@ -157,29 +169,30 @@ has ids => ( # Arrayref of $fileid tuples (always, so post upload/raw data proc # we have an image we can use - save it to the upload dir for storage my $fileid = $self->get_fileid($photo_blob); - my $file = $self->get_file($fileid); + my $file = $self->get_file($fileid, $type); $upload->copy_to( $file ); - return $fileid; + return $file->basename; } - if (_jpeg_magic($part)) { + if (my $type = detect_type($part)) { my $photo_blob = $part; my $fileid = $self->get_fileid($photo_blob); - my $file = $self->get_file($fileid); + my $file = $self->get_file($fileid, $type); $file->spew_raw($photo_blob); - return $fileid; + return $file->basename; } - if (length($part) == 40) { - my $fileid = $part; - my $file = $self->get_file($fileid); + my ($fileid, $type) = split /\./, $part; + $type ||= 'jpeg'; + if ($fileid && length($fileid) == 40) { + my $file = $self->get_file($fileid, $type); if ($file->exists) { - $fileid; + $file->basename; } else { - warn "File $fileid doesn't exist"; + warn "File $part doesn't exist"; (); } } else { - warn sprintf "Received bad photo hash of length %d", length($part); + # A bad hash, probably a bot spamming with bad data. (); } }); @@ -193,18 +206,23 @@ sub get_fileid { } sub get_file { - my ($self, $fileid) = @_; + my ($self, $fileid, $type) = @_; my $cache_dir = $self->upload_dir; - return path( $cache_dir, "$fileid.jpeg" ); + return path( $cache_dir, "$fileid.$type" ); } -sub get_raw_image_data { +sub get_raw_image { my ($self, $index) = @_; - my $fileid = $self->get_id($index); - my $file = $self->get_file($fileid); + my $filename = $self->get_id($index); + my ($fileid, $type) = split /\./, $filename; + my $file = $self->get_file($fileid, $type); if ($file->exists) { my $photo = $file->slurp_raw; - return $photo; + return { + data => $photo, + content_type => "image/$type", + extension => $type, + }; } } @@ -212,8 +230,9 @@ sub get_image_data { my ($self, %args) = @_; my $num = $args{num} || 0; - my $photo = $self->get_raw_image_data( $num ) + my $image = $self->get_raw_image( $num ) or return; + my $photo = $image->{data}; my $size = $args{size}; if ( $size eq 'tn' ) { @@ -226,7 +245,10 @@ sub get_image_data { $photo = _shrink( $photo, $args{default} || '250x250' ); } - return $photo; + return { + data => $photo, + content_type => $image->{content_type}, + }; } sub delete_cached { @@ -250,13 +272,15 @@ sub remove_images { --$dec; } + $self->delete_cached(); + + return undef if !@images; + my $new_set = (ref $self)->new({ data_items => \@images, object => $self->object, }); - $self->delete_cached(); - return $new_set->data; # e.g. new comma-separated fileid } @@ -266,8 +290,8 @@ sub rotate_image { my @images = $self->all_ids; return if $index > $#images; - my $image_data = $self->get_raw_image_data($index); - $images[$index] = _rotate_image( $image_data, $direction ); + my $image = $self->get_raw_image($index); + $images[$index] = _rotate_image( $image->{data}, $direction ); my $new_set = (ref $self)->new({ data_items => \@images, diff --git a/perllib/FixMyStreet/Cobrand/Angus.pm b/perllib/FixMyStreet/Cobrand/Angus.pm new file mode 100644 index 000000000..23d0d2c58 --- /dev/null +++ b/perllib/FixMyStreet/Cobrand/Angus.pm @@ -0,0 +1,127 @@ +package FixMyStreet::Cobrand::Angus; +use parent 'FixMyStreet::Cobrand::UKCouncils'; + +use strict; +use warnings; + +sub council_id { return 2550; } +sub council_area { return 'Angus'; } +sub council_name { return 'Angus Council'; } +sub council_url { return 'angus'; } + +sub base_url { + return FixMyStreet->config('BASE_URL') if FixMyStreet->config('STAGING_SITE'); + return 'https://fix.angus.gov.uk'; +} + +sub enter_postcode_text { + my ($self) = @_; + return 'Enter an Angus postcode, or street name and area'; +} + +sub example_places { + return ( 'DD8 3AP', "Canmore Street" ); +} + +sub default_show_name { 0 } + +sub disambiguate_location { + my $self = shift; + my $string = shift; + + return { + %{ $self->SUPER::disambiguate_location() }, + town => 'Angus', + centre => '56.7240845983561,-2.91774391131183', + span => '0.525195055746977,0.985870680170788', + bounds => [ 56.4616875530489, -3.40703662677109, 56.9868826087959, -2.4211659466003 ], + }; +} + +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 contact_email { + my $self = shift; + return join( '@', 'accessline', 'angus.gov.uk' ); +} + +=head2 temp_email_to_update, temp_update_contacts + +Temporary helper routines to update the extra for potholes (temporary setup +hack, cargo-culted from Harrogate, may in future be superseded either by +Open311/integration or a better mechanism for manually creating rich contacts). + +Can run with a script or command line like: + + bin/cron-wrapper perl -MFixMyStreet::App -MFixMyStreet::Cobrand::Angus -e \ + 'FixMyStreet::Cobrand::Angus->new({c => FixMyStreet::App->new})->temp_update_contacts' + +=cut + +sub temp_update_contacts { + my $self = shift; + + my $contact_rs = $self->{c}->model('DB::Contact'); + + my $_update = sub { + my ($category, $field, $category_details) = @_; + # NB: we're accepting just 1 field, but supply as array [ $field ] + + my $contact = $contact_rs->find_or_create( + { + body_id => $self->council_id, + category => $category, + %{ $category_details || {} }, + }, + { + key => 'contacts_body_id_category_idx' + } + ); + + my %default = ( + variable => 'true', + order => '1', + required => 'no', + datatype => 'string', + datatype_description => 'a string', + ); + + if ($field->{datatype} || '' eq 'boolean') { + my $description = $field->{description}; + %default = ( + %default, + datatype => 'singlevaluelist', + datatype_description => 'Yes or No', + values => { value => [ + { key => ['No'], name => ['No'] }, + { key => ['Yes'], name => ['Yes'] }, + ] }, + ); + } + + $contact->update({ + # XXX: we're just setting extra with the expected layout, + # this could be encapsulated more nicely + extra => { _fields => [ { %default, %$field } ] }, + confirmed => 1, + deleted => 0, + editor => 'automated script', + whenedited => \'NOW()', + note => 'Edited by script as per requirements Jan 2016', + }); + }; + + $_update->( 'Street lighting', { + code => 'column_id', + description => 'Lamp post number', + }); + +} + +1; diff --git a/perllib/FixMyStreet/Cobrand/Barnet.pm b/perllib/FixMyStreet/Cobrand/Barnet.pm deleted file mode 100644 index df8757009..000000000 --- a/perllib/FixMyStreet/Cobrand/Barnet.pm +++ /dev/null @@ -1,28 +0,0 @@ -package FixMyStreet::Cobrand::Barnet; -use parent 'FixMyStreet::Cobrand::UKCouncils'; - -use strict; -use warnings; - -sub council_id { return 2489; } -sub council_area { return 'Barnet'; } -sub council_name { return 'Barnet Council'; } -sub council_url { return 'barnet'; } - -sub disambiguate_location { - my $self = shift; - return { - %{ $self->SUPER::disambiguate_location() }, - town => 'Barnet', - centre => '51.612832,-0.218169', - span => '0.0563,0.09', - bounds => [ 51.584682, -0.263169, 51.640982, -0.173169 ], - }; -} - -sub example_places { - return [ 'N11 1NP', 'Wood St' ]; -} - -1; - diff --git a/perllib/FixMyStreet/Cobrand/BellaVistaEnAccion.pm b/perllib/FixMyStreet/Cobrand/BellaVistaEnAccion.pm deleted file mode 100644 index 58bc6973d..000000000 --- a/perllib/FixMyStreet/Cobrand/BellaVistaEnAccion.pm +++ /dev/null @@ -1,25 +0,0 @@ -package FixMyStreet::Cobrand::BellaVistaEnAccion; -use base 'FixMyStreet::Cobrand::Default'; - -use strict; -use warnings; - -sub country { - return 'CL'; -} - -sub example_places { - return ( 'Dominica, Recoleta', 'Pio Nono' ); -} - -sub languages { [ 'es-cl,Castellano,es_CL' ] } - -sub disambiguate_location { - return { - country => 'cl', - town => 'Santiago', - }; -} - -1; - diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index b3b830f06..4dc024d48 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -20,7 +20,7 @@ use mySociety::PostcodeUtil; $path = $cobrand->path_to_web_templates( ); Returns the path to the templates for this cobrand - by default -"templates/web/$moniker" and "templates/web/fixmystreet" +"templates/web/$moniker" (and then base in Web.pm). =cut @@ -28,7 +28,6 @@ sub path_to_web_templates { my $self = shift; my $paths = [ FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify, - FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify, ]; return $paths; } @@ -625,6 +624,7 @@ sub short_name { my ($area) = @_; my $name = $area->{name} || $area->name; + $name =~ tr{/}{_}; $name = URI::Escape::uri_escape_utf8($name); $name =~ s/%20/+/g; return $name; @@ -936,10 +936,6 @@ sub updates_as_hashref { return {}; } -sub get_country_for_ip_address { - return 0; -} - sub jurisdiction_id_example { my $self = shift; return $self->moniker; diff --git a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm deleted file mode 100644 index 995c39c85..000000000 --- a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm +++ /dev/null @@ -1,549 +0,0 @@ -package FixMyStreet::Cobrand::EmptyHomes; -use base 'FixMyStreet::Cobrand::UK'; - -use strict; -use warnings; - -use FixMyStreet; -use mySociety::Locale; -use Carp; - -sub path_to_web_templates { - my $self = shift; - 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 - -=cut - -sub base_url { - my $base_url = FixMyStreet->config('BASE_URL'); - if ( $base_url !~ /emptyhomes/ ) { - $base_url =~ s/http:\/\//http:\/\/emptyhomes\./g; - } - return $base_url; -} - -sub area_types { - [ 'DIS', 'LBO', 'MTD', 'UTA', 'LGD', 'COI' ]; # No CTY -} - -sub base_url_with_lang { - my $self = shift; - - my $base = $self->base_url; - - my $lang = $mySociety::Locale::lang; - if ($lang eq 'cy') { - $base =~ s{http://}{$&cy.}; - } else { - $base =~ s{http://}{$&en.}; - } - return $base; -} - -sub languages { [ 'en-gb,English,en_GB', 'cy,Cymraeg,cy_GB' ] } -sub language_domain { 'FixMyStreet-EmptyHomes' } - -=item shorten_recency_if_new_greater_than_fixed - -For empty homes we don't want to shorten the recency - -=cut - -sub shorten_recency_if_new_greater_than_fixed { - return 0; -} - -=head2 default_photo_resize - -Size that photos are to be resized to for display. If photos aren't -to be resized then return 0; - -=cut - -sub default_photo_resize { return '195x'; } - -sub short_name { - my $self = shift; - my ($area) = @_; - - my $name = $area->{name} || $area->name; - $name =~ s/ (Borough|City|District|County) Council$//; - $name =~ s/ Council$//; - $name =~ s/ & / and /; - $name =~ s{/}{_}g; - $name = URI::Escape::uri_escape_utf8($name); - $name =~ s/%20/-/g; - return $name; -} - -=item council_rss_alert_options - -Generate a set of options for council rss alerts. - -=cut - -sub council_rss_alert_options { - my $self = shift; - my $all_councils = shift; - my $c = shift; - - my %councils = map { $_ => 1 } @{$self->area_types}; - - my $num_councils = scalar keys %$all_councils; - - my ( @options, @reported_to_options ); - my ($council, $ward); - foreach (values %$all_councils) { - $_->{short_name} = $self->short_name( $_ ); - ( $_->{id_name} = $_->{short_name} ) =~ tr/+/_/; - if ($councils{$_->{type}}) { - $council = $_; - } else { - $ward = $_; - } - } - - push @options, { - type => 'council', - id => sprintf( 'council:%s:%s', $council->{id}, $council->{id_name} ), - text => sprintf( _('Problems within %s'), $council->{name}), - rss_text => sprintf( _('RSS feed of problems within %s'), $council->{name}), - uri => $c->uri_for( '/rss/reports/' . $council->{short_name} ), - }; - push @options, { - type => 'ward', - id => sprintf( 'ward:%s:%s:%s:%s', $council->{id}, $ward->{id}, $council->{id_name}, $ward->{id_name} ), - rss_text => sprintf( _('RSS feed of problems within %s ward'), $ward->{name}), - text => sprintf( _('Problems within %s ward'), $ward->{name}), - uri => $c->uri_for( '/rss/reports/' . $council->{short_name} . '/' . $ward->{short_name} ), - }; - - return ( \@options, @reported_to_options ? \@reported_to_options : undef ); -} - -sub report_form_extras { - ( { name => 'address', required => 1 } ) -} - -sub front_stats_data { - my ( $self ) = @_; - my $key = "recent_new"; - my $result = Memcached::get($key); - unless ($result) { - $result = $self->problems->search( - { state => [ FixMyStreet::DB::Result::Problem->visible_states() ] } - )->count; - foreach my $v (values %{$self->old_site_stats}) { - $result += $v; - } - Memcached::set($key, $result, 3600); - } - return $result; -} - -# A record of the number of reports from the Channel 4 site and other old data -sub old_site_stats { - return { - 2223 => 95, - 2238 => 82, - 2245 => 54, - 2248 => 31, - 2250 => 132, - 2253 => 15, - 2255 => 25, - 2256 => 8, - 2257 => 3, - 2258 => 14, - 2259 => 5, - 2260 => 22, - 2261 => 12, - 2262 => 21, - 2263 => 14, - 2264 => 1, - 2267 => 1, - 2271 => 13, - 2272 => 7, - 2273 => 13, - 2274 => 7, - 2275 => 15, - 2276 => 14, - 2277 => 10, - 2278 => 7, - 2279 => 23, - 2280 => 16, - 2281 => 25, - 2282 => 14, - 2283 => 10, - 2284 => 22, - 2285 => 25, - 2286 => 32, - 2287 => 13, - 2288 => 13, - 2289 => 16, - 2290 => 18, - 2291 => 1, - 2292 => 9, - 2293 => 15, - 2294 => 16, - 2295 => 12, - 2296 => 4, - 2299 => 2, - 2300 => 1, - 2304 => 10, - 2305 => 17, - 2306 => 6, - 2307 => 11, - 2308 => 17, - 2309 => 9, - 2310 => 6, - 2311 => 9, - 2312 => 26, - 2313 => 2, - 2314 => 34, - 2315 => 18, - 2316 => 13, - 2317 => 17, - 2318 => 7, - 2319 => 14, - 2320 => 4, - 2321 => 20, - 2322 => 7, - 2323 => 10, - 2324 => 7, - 2325 => 15, - 2326 => 12, - 2327 => 25, - 2328 => 23, - 2329 => 11, - 2330 => 4, - 2331 => 29, - 2332 => 12, - 2333 => 7, - 2334 => 5, - 2335 => 16, - 2336 => 7, - 2337 => 7, - 2338 => 2, - 2339 => 12, - 2340 => 2, - 2341 => 7, - 2342 => 14, - 2343 => 20, - 2344 => 13, - 2345 => 17, - 2346 => 6, - 2347 => 4, - 2348 => 6, - 2349 => 18, - 2350 => 13, - 2351 => 11, - 2352 => 24, - 2353 => 10, - 2354 => 20, - 2355 => 14, - 2356 => 13, - 2357 => 14, - 2358 => 8, - 2359 => 6, - 2360 => 10, - 2361 => 36, - 2362 => 17, - 2363 => 8, - 2364 => 7, - 2365 => 8, - 2366 => 26, - 2367 => 19, - 2368 => 20, - 2369 => 8, - 2370 => 14, - 2371 => 79, - 2372 => 10, - 2373 => 5, - 2374 => 4, - 2375 => 12, - 2376 => 10, - 2377 => 24, - 2378 => 9, - 2379 => 8, - 2380 => 25, - 2381 => 13, - 2382 => 11, - 2383 => 16, - 2384 => 18, - 2385 => 12, - 2386 => 18, - 2387 => 5, - 2388 => 8, - 2389 => 12, - 2390 => 11, - 2391 => 23, - 2392 => 11, - 2393 => 16, - 2394 => 9, - 2395 => 27, - 2396 => 8, - 2397 => 27, - 2398 => 14, - 2402 => 1, - 2403 => 18, - 2404 => 14, - 2405 => 7, - 2406 => 9, - 2407 => 12, - 2408 => 3, - 2409 => 8, - 2410 => 23, - 2411 => 27, - 2412 => 9, - 2413 => 20, - 2414 => 96, - 2415 => 11, - 2416 => 20, - 2417 => 18, - 2418 => 24, - 2419 => 18, - 2420 => 7, - 2421 => 29, - 2427 => 7, - 2428 => 15, - 2429 => 18, - 2430 => 32, - 2431 => 9, - 2432 => 17, - 2433 => 8, - 2434 => 10, - 2435 => 14, - 2436 => 13, - 2437 => 11, - 2438 => 5, - 2439 => 4, - 2440 => 23, - 2441 => 8, - 2442 => 18, - 2443 => 12, - 2444 => 3, - 2445 => 8, - 2446 => 31, - 2447 => 15, - 2448 => 3, - 2449 => 12, - 2450 => 11, - 2451 => 8, - 2452 => 20, - 2453 => 25, - 2454 => 8, - 2455 => 6, - 2456 => 24, - 2457 => 6, - 2458 => 10, - 2459 => 15, - 2460 => 17, - 2461 => 20, - 2462 => 12, - 2463 => 16, - 2464 => 5, - 2465 => 14, - 2466 => 20, - 2467 => 14, - 2468 => 12, - 2469 => 4, - 2470 => 1, - 2471 => 1, - 2474 => 9, - 2475 => 12, - 2476 => 11, - 2477 => 9, - 2478 => 10, - 2479 => 21, - 2480 => 26, - 2481 => 30, - 2482 => 38, - 2483 => 46, - 2484 => 63, - 2485 => 7, - 2486 => 14, - 2487 => 16, - 2488 => 14, - 2489 => 39, - 2490 => 112, - 2491 => 79, - 2492 => 137, - 2493 => 55, - 2494 => 18, - 2495 => 41, - 2496 => 41, - 2497 => 22, - 2498 => 26, - 2499 => 46, - 2500 => 62, - 2501 => 90, - 2502 => 47, - 2503 => 32, - 2504 => 33, - 2505 => 47, - 2506 => 56, - 2507 => 26, - 2508 => 48, - 2509 => 47, - 2510 => 16, - 2511 => 6, - 2512 => 4, - 2513 => 41, - 2514 => 138, - 2515 => 48, - 2516 => 65, - 2517 => 35, - 2518 => 40, - 2519 => 31, - 2520 => 27, - 2521 => 25, - 2522 => 34, - 2523 => 27, - 2524 => 47, - 2525 => 22, - 2526 => 125, - 2527 => 126, - 2528 => 93, - 2529 => 23, - 2530 => 28, - 2531 => 24, - 2532 => 46, - 2533 => 22, - 2534 => 24, - 2535 => 27, - 2536 => 44, - 2537 => 54, - 2538 => 17, - 2539 => 13, - 2540 => 29, - 2541 => 15, - 2542 => 19, - 2543 => 14, - 2544 => 34, - 2545 => 30, - 2546 => 38, - 2547 => 32, - 2548 => 22, - 2549 => 37, - 2550 => 9, - 2551 => 41, - 2552 => 17, - 2553 => 36, - 2554 => 10, - 2555 => 20, - 2556 => 13, - 2557 => 19, - 2558 => 13, - 2559 => 23, - 2560 => 13, - 2561 => 62, - 2562 => 29, - 2563 => 31, - 2564 => 34, - 2565 => 57, - 2566 => 16, - 2567 => 22, - 2568 => 40, - 2569 => 5, - 2570 => 38, - 2571 => 17, - 2572 => 9, - 2573 => 12, - 2574 => 10, - 2575 => 16, - 2576 => 2, - 2577 => 28, - 2578 => 37, - 2579 => 79, - 2580 => 17, - 2581 => 734, - 2582 => 11, - 2583 => 23, - 2584 => 16, - 2585 => 4, - 2586 => 33, - 2587 => 3, - 2588 => 22, - 2589 => 19, - 2590 => 14, - 2591 => 9, - 2592 => 19, - 2593 => 11, - 2594 => 14, - 2595 => 13, - 2596 => 21, - 2597 => 10, - 2598 => 16, - 2599 => 26, - 2600 => 1, - 2601 => 19, - 2602 => 23, - 2603 => 12, - 2604 => 31, - 2605 => 30, - 2606 => 5, - 2607 => 32, - 2608 => 14, - 2609 => 27, - 2610 => 15, - 2611 => 20, - 2612 => 22, - 2613 => 20, - 2614 => 97, - 2615 => 29, - 2616 => 6, - 2617 => 34, - 2618 => 16, - 2619 => 25, - 2620 => 12, - 2621 => 29, - 2622 => 18, - 2623 => 12, - 2624 => 58, - 2625 => 54, - 2626 => 15, - 2627 => 1, - 2629 => 17, - 2630 => 22, - 2636 => 13, - 2637 => 13, - 2638 => 25, - 2639 => 57, - 2640 => 15, - 2641 => 11, - 2642 => 14, - 2643 => 38, - 2644 => 19, - 2645 => 6, - 2646 => 1, - 2647 => 16, - 2648 => 25, - 2649 => 38, - 2650 => 12, - 2651 => 78, - 2652 => 12, - 2654 => 16, - 2655 => 13, - 2656 => 15, - 2657 => 44, - 2658 => 53, - 16869 => 73, - 21068 => 44, - 21069 => 57, - 21070 => 20, - }; -} - -1; - diff --git a/perllib/FixMyStreet/Cobrand/FixMyBarangay.pm b/perllib/FixMyStreet/Cobrand/FixMyBarangay.pm deleted file mode 100644 index 194556e72..000000000 --- a/perllib/FixMyStreet/Cobrand/FixMyBarangay.pm +++ /dev/null @@ -1,55 +0,0 @@ -package FixMyStreet::Cobrand::FixMyBarangay; -use base 'FixMyStreet::Cobrand::Default'; - -use strict; -use warnings; - -sub country { - return 'PH'; -} - -sub language_domain { 'FixMyBarangay' } - -sub area_types { - return [ 'BGY' ]; -} - -sub disambiguate_location { - return { - country => 'ph', - bing_country => 'Philippines', - }; -} - -sub only_authed_can_create { - return 1; -} - -# effectively allows barangay staff to hide reports -sub council_id { return '1,2' ; } - -sub areas_on_around { - return [ 1, 2 ]; -} - -sub can_support_problems { - return 1; -} - -sub default_show_name { - my $self = shift; - - return 0 if $self->{c}->user->from_council; - return 1; -} - -# makes no sense to send questionnaires since FMB's reporters are mostly staff -sub send_questionnaires { - return 0; -} - -# let staff hide reports in their own barangay -sub users_can_hide { 1 } - -1; - diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm index 159f2f5db..c8c1eef66 100644 --- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm +++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm @@ -1,6 +1,5 @@ package FixMyStreet::Cobrand::FixMyStreet; use base 'FixMyStreet::Cobrand::UK'; -use mySociety::Gaze; use constant COUNCIL_ID_BROMLEY => 2482; @@ -9,7 +8,6 @@ sub path_to_web_templates { my $self = shift; return [ FixMyStreet->path_to( 'templates/web/fixmystreet.com' )->stringify, - FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify ]; } @@ -52,13 +50,6 @@ sub extra_contact_validation { return %errors; } -sub get_country_for_ip_address { - my $self = shift; - my $ip = shift; - - return mySociety::Gaze::get_country_from_ip($ip); -} - sub report_form_extras { ( { name => 'gender', required => 0 }, { name => 'variant', required => 0 } ) } diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm index 7535a34bf..d23e62138 100644 --- a/perllib/FixMyStreet/Cobrand/Greenwich.pm +++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm @@ -9,6 +9,11 @@ sub council_area { return 'Greenwich'; } sub council_name { return 'Royal Borough of Greenwich'; } sub council_url { return 'greenwich'; } +sub base_url { + return FixMyStreet->config('BASE_URL') if FixMyStreet->config('STAGING_SITE'); + return 'https://fix.royalgreenwich.gov.uk'; +} + sub example_places { return ( 'SE18 6HQ', "Woolwich Road" ); } diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm index c78ae5e09..543dd431a 100644 --- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm +++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm @@ -52,6 +52,8 @@ sub default_show_name { 0 } 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. +If the value 'emergency' is returned, a different template block +is triggered that has custom wording. =cut @@ -79,7 +81,7 @@ sub problem_response_days { 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 'emergency' 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'; diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm index c33b39aac..0eff48b00 100644 --- a/perllib/FixMyStreet/Cobrand/UK.pm +++ b/perllib/FixMyStreet/Cobrand/UK.pm @@ -109,7 +109,7 @@ sub short_name { $name =~ s/ (Borough|City|District|County) Council$//; $name =~ s/ Council$//; $name =~ s/ & / and /; - $name =~ s{/}{_}g; + $name =~ tr{/}{_}; $name = URI::Escape::uri_escape_utf8($name); $name =~ s/%20/+/g; return $name; diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm index b4b91b7dd..0321e0297 100644 --- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm +++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm @@ -18,7 +18,6 @@ sub path_to_web_templates { return [ FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify, FixMyStreet->path_to( 'templates/web/fixmystreet-uk-councils' )->stringify, - FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify ]; } diff --git a/perllib/FixMyStreet/Cobrand/ZeroTB.pm b/perllib/FixMyStreet/Cobrand/ZeroTB.pm deleted file mode 100644 index ef1b0b1e1..000000000 --- a/perllib/FixMyStreet/Cobrand/ZeroTB.pm +++ /dev/null @@ -1,56 +0,0 @@ -package FixMyStreet::Cobrand::ZeroTB; -use base 'FixMyStreet::Cobrand::Default'; - -use strict; -use warnings; - -sub enter_postcode_text { return _ ('Enter a nearby street name and area, postal code or district in Delhi'); } - -sub country { - return 'IN'; -} - -sub disambiguate_location { - return { - country => 'in', - town => 'Delhi', - bounds => [ 28.404625000000024, 76.838845800000072, 28.884380600000028, 77.347877500000067 ], - }; -} - -sub only_authed_can_create { return 1; } -sub allow_photo_display { return 0; } -sub allow_photo_upload{ return 0; } -sub send_questionnaires { return 0; } -sub on_map_default_max_pin_age { return 0; } -sub never_confirm_updates { 1; } -sub include_time_in_update_alerts { 1; } - -sub pin_colour { - return 'clinic'; -} - -sub path_to_pin_icons { - return '/cobrands/zerotb/images/'; -} - -sub get_clinic_list { - my $self = shift; - - return $self->problems->search({ state => 'confirmed' }, { order_by => 'title' }); -} - -sub prettify_dt { - my ( $self, $dt, $type ) = @_; - $type ||= ''; - - if ( $type eq 'alert' ) { - return $dt->strftime('%H:%M %Y-%m-%d'); - } else { - return Utils::prettify_dt( $dt, $type ); - } - -} - -1; - diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm index c7e3c4d45..d31b1c84e 100644 --- a/perllib/FixMyStreet/Cobrand/Zurich.pm +++ b/perllib/FixMyStreet/Cobrand/Zurich.pm @@ -1018,18 +1018,19 @@ sub munge_sendreport_params { or return; my $id = $row->id; my @attachments = map { + my $image = $photoset->get_raw_image($_); { - body => $photoset->get_raw_image_data($_), + body => $image->{data}, attributes => { - filename => "$id.$_.jpeg", - content_type => 'image/jpeg', + filename => "$id.$_." . $image->{extension}, + content_type => $image->{content_type}, encoding => 'base64', # quoted-printable ends up with newlines corrupting binary data - name => "$id.$_.jpeg", + name => "$id.$_." . $image->{extension}, }, } } (0..$num-1); - $params->{attachments} = \@attachments; + $params->{_attachments_} = \@attachments; } } diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm index 5734ff8d5..85cdb29f0 100644 --- a/perllib/FixMyStreet/DB/Result/Comment.pm +++ b/perllib/FixMyStreet/DB/Result/Comment.pm @@ -173,12 +173,12 @@ sub photos { my $i = 0; my $id = $self->id; my @photos = map { - my $format = 'jpeg'; my $cachebust = substr($_, 0, 8); + my ($hash, $format) = split /\./, $_; { - id => $_, - url_temp => "/photo/$_.temp.$format", - url_temp_full => "/photo/$_.fulltemp.$format", + id => $hash, + url_temp => "/photo/temp.$hash.$format", + url_temp_full => "/photo/fulltemp.$hash.$format", url => "/photo/c/$id.$i.$format?$cachebust", url_full => "/photo/c/$id.$i.full.$format?$cachebust", idx => $i++, @@ -187,14 +187,14 @@ sub photos { return \@photos; } -=head2 meta_problem_state +=head2 problem_state_display Returns a string suitable for display lookup in the update meta section. Removes the '- council/user' bit from fixed states. =cut -sub meta_problem_state { +sub problem_state_display { my $self = shift; my $state = $self->problem_state; diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 2a90d0bec..12dad073e 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -531,6 +531,19 @@ sub is_visible { return exists $self->visible_states->{ $self->state } ? 1 : 0; } +=head2 state_display + +Returns a string suitable for display lookup in the update meta section. +Removes the '- council/user' bit from fixed states. + +=cut + +sub state_display { + my $self = shift; + (my $state = $self->state) =~ s/ -.*$//; + return $state; +} + =head2 meta_line Returns a string to be used on a problem report page, describing some of the @@ -544,59 +557,48 @@ sub meta_line { my $date_time = Utils::prettify_dt( $problem->confirmed ); my $meta = ''; - # FIXME Should be in cobrand - if ($c->cobrand->moniker eq 'emptyhomes') { - - my $category = _($problem->category); - utf8::decode($category); - $meta = sprintf(_('%s, reported at %s'), $category, $date_time); - - } else { - - if ( $problem->anonymous ) { - if ( $problem->service - and $problem->category && $problem->category ne _('Other') ) - { - $meta = - sprintf( _('Reported via %s in the %s category anonymously at %s'), - $problem->service, $problem->category, $date_time ); - } - elsif ( $problem->service ) { - $meta = sprintf( _('Reported via %s anonymously at %s'), - $problem->service, $date_time ); - } - elsif ( $problem->category and $problem->category ne _('Other') ) { - $meta = sprintf( _('Reported in the %s category anonymously at %s'), - $problem->category, $date_time ); - } - else { - $meta = sprintf( _('Reported anonymously at %s'), $date_time ); - } + if ( $problem->anonymous ) { + if ( $problem->service + and $problem->category && $problem->category ne _('Other') ) + { + $meta = + sprintf( _('Reported via %s in the %s category anonymously at %s'), + $problem->service, $problem->category, $date_time ); + } + elsif ( $problem->service ) { + $meta = sprintf( _('Reported via %s anonymously at %s'), + $problem->service, $date_time ); + } + elsif ( $problem->category and $problem->category ne _('Other') ) { + $meta = sprintf( _('Reported in the %s category anonymously at %s'), + $problem->category, $date_time ); } else { - if ( $problem->service - and $problem->category && $problem->category ne _('Other') ) - { - $meta = sprintf( - _('Reported via %s in the %s category by %s at %s'), - $problem->service, $problem->category, - $problem->name, $date_time - ); - } - elsif ( $problem->service ) { - $meta = sprintf( _('Reported via %s by %s at %s'), - $problem->service, $problem->name, $date_time ); - } - elsif ( $problem->category and $problem->category ne _('Other') ) { - $meta = sprintf( _('Reported in the %s category by %s at %s'), - $problem->category, $problem->name, $date_time ); - } - else { - $meta = - sprintf( _('Reported by %s at %s'), $problem->name, $date_time ); - } + $meta = sprintf( _('Reported anonymously at %s'), $date_time ); + } + } + else { + if ( $problem->service + and $problem->category && $problem->category ne _('Other') ) + { + $meta = sprintf( + _('Reported via %s in the %s category by %s at %s'), + $problem->service, $problem->category, + $problem->name, $date_time + ); + } + elsif ( $problem->service ) { + $meta = sprintf( _('Reported via %s by %s at %s'), + $problem->service, $problem->name, $date_time ); + } + elsif ( $problem->category and $problem->category ne _('Other') ) { + $meta = sprintf( _('Reported in the %s category by %s at %s'), + $problem->category, $problem->name, $date_time ); + } + else { + $meta = + sprintf( _('Reported by %s at %s'), $problem->name, $date_time ); } - } return $meta; @@ -647,14 +649,14 @@ sub response_templates { } # returns true if the external id is the council's ref, i.e., useful to publish it -# (by way of an example, the barnet send method returns a useful reference when +# (by way of an example, the Oxfordshire send method returns a useful reference when # it succeeds, so that is the ref we should show on the problem report page). # Future: this is installation-dependent so maybe should be using the contact # data to determine if the external id is public on a council-by-council basis. # Note: this only makes sense when called on a problem that has been sent! sub can_display_external_id { my $self = shift; - if ($self->external_id && $self->send_method_used && $self->bodies_str =~ /2237/) { + if ($self->external_id && $self->send_method_used && $self->bodies_str =~ /(2237|2550)/) { return 1; } return 0; @@ -862,12 +864,12 @@ sub photos { my $i = 0; my $id = $self->id; my @photos = map { - my $format = 'jpeg'; my $cachebust = substr($_, 0, 8); + my ($hash, $format) = split /\./, $_; { - id => $_, - url_temp => "/photo/$_.temp.$format", - url_temp_full => "/photo/$_.fulltemp.$format", + id => $hash, + url_temp => "/photo/temp.$hash.$format", + url_temp_full => "/photo/fulltemp.$hash.$format", url => "/photo/$id.$i.$format?$cachebust", url_full => "/photo/$id.$i.full.$format?$cachebust", url_tn => "/photo/$id.$i.tn.$format?$cachebust", diff --git a/perllib/FixMyStreet/Email.pm b/perllib/FixMyStreet/Email.pm index 1787c32da..49f4632a8 100644 --- a/perllib/FixMyStreet/Email.pm +++ b/perllib/FixMyStreet/Email.pm @@ -1,6 +1,8 @@ package FixMyStreet::Email; +use Email::MIME; use Encode; +use POSIX qw(); use Template; use Digest::HMAC_SHA1 qw(hmac_sha1_hex); use mySociety::Email; @@ -105,15 +107,10 @@ sub send_cron { $site_name = Utils::trim_text(Encode::decode('utf8', $site_name)); $params->{_parameters_}->{site_name} = $site_name; - $params->{_line_indent} = ''; - my $attachments = delete $params->{attachments}; - - my $email = mySociety::Locale::in_gb_locale { mySociety::Email::construct_email($params) }; - - $email = munge_attachments($email, $attachments) if $attachments; + my $email = mySociety::Locale::in_gb_locale { construct_email($params) }; if ($nomail) { - print $email; + print $email->as_string; return 1; # Failure } else { my $result = FixMyStreet::EmailSend->new({ env_from => $env_from })->send($email); @@ -121,41 +118,152 @@ sub send_cron { } } -sub munge_attachments { - my ($message, $attachments) = @_; - # $attachments should be an array_ref of things that can be parsed to Email::MIME, - # for example - # [ - # body => $binary_data, - # attributes => { - # content_type => 'image/jpeg', - # encoding => 'base64', - # filename => '1234.1.jpeg', - # name => '1234.1.jpeg', - # }, - # ... - # ] - # - # XXX: mySociety::Email::construct_email isn't using a MIME library and - # requires more analysis to refactor, so for now, we'll simply parse the - # generated MIME and add attachments. - # - # (Yes, this means that the email is constructed by Email::Simple, munged - # manually by custom code, turned back into Email::Simple, and then munged - # with Email::MIME. What's your point?) - - require Email::MIME; - my $mime = Email::MIME->new($message); - $mime->parts_add([ map { Email::MIME->create(%$_)} @$attachments ]); - my $data = $mime->as_string; - - # unsure why Email::MIME adds \r\n. Possibly mail client should handle - # gracefully, BUT perhaps as the segment constructed by - # mySociety::Email::construct_email strips to \n, they seem not to. - # So we re-run the same regexp here to the added part. - $data =~ s/\r\n/\n/gs; - - return $data; +=item construct_email SPEC + +Construct an email message according to SPEC, which is an associative array +containing elements as given below. Returns an Email::MIME email. + +=over 4 + +=item _template_, _parameters_ + +Templated body text and an associative array of template parameters. _template +contains optional substititutions <?=$values['name']?>, each of which is +replaced by the value of the corresponding named value in _parameters_. It is +an error to use a substitution when the corresponding parameter is not present +or undefined. The first line of the template will be interpreted as contents of +the Subject: header of the mail if it begins with the literal string 'Subject: +' followed by a blank line. The templated text will be word-wrapped to produce +lines of appropriate length. + +=item _attachments_ + +An arrayref of hashrefs that can be passed to Email::MIME. + +=item To + +Contents of the To: header, as a literal UTF-8 string or an array of addresses +or [address, name] pairs. + +=item From + +Contents of the From: header, as an email address or an [address, name] pair. + +=item Cc + +Contents of the Cc: header, as for To. + +=item Reply-To + +Contents of the Reply-To: header, as for To. + +=item Subject + +Contents of the Subject: header, as a UTF-8 string. + +=item I<any other element> + +interpreted as the literal value of a header with the same name. + +=back + +If no Date is given, the current date is used. If no To is given, then the +string "Undisclosed-Recipients: ;" is used. It is an error to fail to give a +templated body, From or Subject (perhaps from the template). + +=cut +sub construct_email ($) { + my $p = shift; + + throw mySociety::Email::Error("Must specify both '_template_' and '_parameters_'") + if !exists($p->{_template_}) || !exists($p->{_parameters_}); + throw mySociety::Email::Error("Template parameters '_parameters_' must be an associative array") + if (ref($p->{_parameters_}) ne 'HASH'); + + (my $subject, $body) = mySociety::Email::do_template_substitution($p->{_template_}, $p->{_parameters_}, ''); + $p->{Subject} = $subject if defined($subject); + + if (!exists($p->{Subject})) { + # XXX Try to find out what's causing this very occasionally + (my $error = $body) =~ s/\n/ | /g; + $error = "missing field 'Subject' in MESSAGE - $error"; + throw mySociety::Email::Error($error); + } + throw mySociety::Email::Error("missing field 'From' in MESSAGE") unless exists($p->{From}); + + # Construct email headers + my %hdr; + + foreach my $h (grep { exists($p->{$_}) } qw(To Cc Reply-To)) { + if (ref($p->{$h}) eq '') { + # Interpret as a literal string in UTF-8, so all we need to do is + # escape it. + $hdr{$h} = $p->{$h}; + } elsif (ref($p->{$h}) eq 'ARRAY') { + # Array of addresses or [address, name] pairs. + $hdr{$h} = join(', ', map { mailbox($_, $h) } @{$p->{$h}}); + } else { + throw mySociety::Email::Error("Field '$h' in MESSAGE should be single value or an array"); + } + } + + foreach my $h (grep { exists($p->{$_}) } qw(From Sender)) { + $hdr{$h} = mailbox($p->{$h}, $h); + } + + # Some defaults + $hdr{To} ||= 'Undisclosed-recipients: ;'; + $hdr{Date} ||= POSIX::strftime("%a, %d %h %Y %T %z", localtime(time())); + + # Other headers, including Subject + foreach (keys(%$p)) { + $hdr{$_} = $p->{$_} if ($_ !~ /^_/ && !exists($hdr{$_})); + } + + my $parts = [ + _mime_create( + body_str => $body, + attributes => { + charset => 'utf-8', + encoding => 'quoted-printable', + }, + ), + ]; + + if ($p->{_attachments_}) { + push @$parts, map { _mime_create(%$_) } @{$p->{_attachments_}}; + } + + my $email = Email::MIME->create( + header_str => [ %hdr ], + parts => $parts, + attributes => { + charset => 'utf-8', + }, + ); + + return $email; +} + +# Handle being given a string, or an arrayref of [ name, email ] +sub mailbox { + my ($e, $header) = @_; + if (ref($e) eq '') { + return $e; + } elsif (ref($e) ne 'ARRAY' || @$e != 2) { + throw mySociety::Email::Error("'$header' field should be string or 2-element array"); + } else { + return Email::Address->new($e->[1], $e->[0]); + } +} + +# Don't want Date/MIME-Version headers that Email::MIME adds to all parts +sub _mime_create { + my %h = @_; + my $e = Email::MIME->create(%h); + $e->header_set('Date'); + $e->header_set('MIME-Version'); + return $e; } 1; diff --git a/perllib/FixMyStreet/Map/Zurich.pm b/perllib/FixMyStreet/Map/Zurich.pm index 3e198f820..4c597c30b 100644 --- a/perllib/FixMyStreet/Map/Zurich.pm +++ b/perllib/FixMyStreet/Map/Zurich.pm @@ -57,7 +57,7 @@ sub map_tiles { sub base_tile_url { # use the new 512px maps as used by Javascript - return 'http://www.gis.stadt-zuerich.ch/maps/rest/services/tiled/LuftbildHybrid/MapServer/WMTS/tile/1.0.0/tiled_LuftbildHybrid/default/default028mm'; + return '//www.gis.stadt-zuerich.ch/maps/rest/services/tiled/LuftbildHybrid/MapServer/WMTS/tile/1.0.0/tiled_LuftbildHybrid/default/default028mm'; } sub copyright { diff --git a/perllib/FixMyStreet/Script/Questionnaires.pm b/perllib/FixMyStreet/Script/Questionnaires.pm index 2d676f15d..f72f59077 100644 --- a/perllib/FixMyStreet/Script/Questionnaires.pm +++ b/perllib/FixMyStreet/Script/Questionnaires.pm @@ -10,8 +10,6 @@ use FixMyStreet::Cobrand; sub send { my ( $params ) = @_; send_questionnaires_period( '4 weeks', $params ); - send_questionnaires_period( '26 weeks', $params ) - if $params->{site} eq 'emptyhomes'; } sub send_questionnaires_period { @@ -29,17 +27,11 @@ sub send_questionnaires_period { ], send_questionnaire => 1, }; - # FIXME Do these a bit better... - if ($params->{site} eq 'emptyhomes' && $period eq '4 weeks') { - $q_params->{'(select max(whensent) from questionnaire where me.id=problem_id)'} = undef; - } elsif ($params->{site} eq 'emptyhomes' && $period eq '26 weeks') { - $q_params->{'(select max(whensent) from questionnaire where me.id=problem_id)'} = { '!=', undef }; - } else { - $q_params->{'-or'} = [ - '(select max(whensent) from questionnaire where me.id=problem_id)' => undef, - '(select max(whenanswered) from questionnaire where me.id=problem_id)' => { '<', \"current_timestamp - '$period'::interval" } - ]; - } + + $q_params->{'-or'} = [ + '(select max(whensent) from questionnaire where me.id=problem_id)' => undef, + '(select max(whenanswered) from questionnaire where me.id=problem_id)' => { '<', \"current_timestamp - '$period'::interval" } + ]; my $unsent = FixMyStreet::DB->resultset('Problem')->search( $q_params, { order_by => { -desc => 'confirmed' } @@ -60,13 +52,7 @@ sub send_questionnaires_period { # call checks if this is the host that sends mail for this cobrand. next unless $cobrand->email_host; - my $template; - if ($params->{site} eq 'emptyhomes') { - ($template = $period) =~ s/ //; - $template = Utils::read_file( FixMyStreet->path_to( "templates/email/emptyhomes/" . $row->lang . "/questionnaire-$template.txt" )->stringify ); - } else { - $template = FixMyStreet->get_email_template($cobrand->moniker, $row->lang, 'questionnaire.txt'); - } + my $template = FixMyStreet->get_email_template($cobrand->moniker, $row->lang, 'questionnaire.txt'); my %h = map { $_ => $row->$_ } qw/name title detail category/; $h{created} = Utils::prettify_duration( time() - $row->confirmed->epoch, 'week' ); @@ -76,10 +62,8 @@ sub send_questionnaires_period { whensent => \'current_timestamp', } ); - # We won't send another questionnaire unless they ask for it (or it was - # the first EHA questionnaire. - $row->send_questionnaire( 0 ) - if $params->{site} ne 'emptyhomes' || $period eq '26 weeks'; + # We won't send another questionnaire unless they ask for it + $row->send_questionnaire( 0 ); my $token = FixMyStreet::DB->resultset("Token")->new_result( { scope => 'questionnaire', diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm index e1eb5e2c5..75111b852 100644 --- a/perllib/FixMyStreet/Script/Reports.pm +++ b/perllib/FixMyStreet/Script/Reports.pm @@ -83,7 +83,7 @@ sub send(;$) { $h{phone_line} = $h{phone} ? _('Phone:') . " $h{phone}\n\n" : ''; if ($row->photo) { $h{has_photo} = _("This web page also contains a photo of the problem, provided by the user.") . "\n\n"; - $h{image_url} = $email_base_url . '/photo/' . $row->id . '.full.jpeg'; + $h{image_url} = $email_base_url . $row->photos->[0]->{url_full}; } else { $h{has_photo} = ''; $h{image_url} = ''; @@ -145,7 +145,7 @@ sub send(;$) { $skip = 1; 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; + debug_print("OK, adding recipient body " . $body->id . ":" . $body->name . ", " . $sender_info->{method}, $row->id) if $debug_mode; push @dear, $body->name; $reporters{ $sender }->add_body( $body, $sender_info->{config} ); } @@ -203,7 +203,7 @@ sub send(;$) { if (FixMyStreet->config('STAGING_SITE') && !FixMyStreet->config('SEND_REPORTS_ON_STAGING')) { # on a staging server send emails to ourselves rather than the bodies - %reporters = map { $_ => $reporters{$_} } grep { /FixMyStreet::SendReport::(Email|EmptyHomes)/ } keys %reporters; + %reporters = map { $_ => $reporters{$_} } grep { /FixMyStreet::SendReport::Email/ } keys %reporters; unless (%reporters) { %reporters = ( 'FixMyStreet::SendReport::Email' => FixMyStreet::SendReport::Email->new() ); } diff --git a/perllib/FixMyStreet/SendReport/Angus.pm b/perllib/FixMyStreet/SendReport/Angus.pm new file mode 100644 index 000000000..cab5de173 --- /dev/null +++ b/perllib/FixMyStreet/SendReport/Angus.pm @@ -0,0 +1,169 @@ +package FixMyStreet::SendReport::Angus; + +use Moo; + +BEGIN { extends 'FixMyStreet::SendReport'; } + +use Try::Tiny; +use Encode; +use XML::Simple; +use mySociety::Web qw(ent); + +sub get_auth_token { + my ($self, $authxml) = @_; + + my $xml = new XML::Simple; + my $obj; + + eval { + $obj = $xml->parse_string( $authxml ); + }; + + my $success = $obj->{success}; + $success =~ s/^\s+|\s+$//g if defined $success; + my $token = $obj->{AuthenticateResult}; + $token =~ s/^\s+|\s+$//g if defined $token; + + if (defined $success && $success eq 'True' && defined $token) { + return $token; + } else { + $self->error("Couldn't authenticate against Angus endpoint."); + } +} + +sub get_external_id { + my ($self, $resultxml) = @_; + + my $xml = new XML::Simple; + my $obj; + + eval { + $obj = $xml->parse_string( $resultxml ); + }; + + my $success = $obj->{success}; + $success =~ s/^\s+|\s+$//g if defined $success; + my $external_id = $obj->{CreateRequestResult}->{RequestId}; + + if (defined $success && $success eq 'True' && defined $external_id) { + return $external_id; + } else { + $self->error("Couldn't find external id in response from Angus endpoint."); + return undef; + } +} + +sub crm_request_type { + my ($self, $row, $h) = @_; + return 'StLight'; # TODO: Set this according to report category +} + +sub jadu_form_fields { + my ($self, $row, $h) = @_; + my $xml = XML::Simple->new( + NoAttr=> 1, + KeepRoot => 1, + SuppressEmpty => 0, + ); + my $metas = $row->get_extra_fields(); + my %extras; + foreach my $field (@$metas) { + $extras{$field->{name}} = $field->{value}; + } + my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($row->cobrand)->new(); + my $output = $xml->XMLout({ + formfields => { + formfield => [ + { + name => 'RequestTitle', + value => $h->{title} + }, + { + name => 'RequestDetails', + value => $h->{detail} + }, + { + name => 'ReporterName', + value => $h->{name} + }, + { + name => 'ReporterEmail', + value => $h->{email} + }, + { + name => 'ReporterAnonymity', + value => $row->anonymous ? 'True' : 'False' + }, + { + name => 'ReportedDateTime', + value => $h->{confirmed} + }, + { + name => 'ColumnId', + value => $extras{'column_id'} || '' + }, + { + name => 'ReportId', + value => $h->{id} + }, + { + name => 'ReportedNorthing', + value => $h->{northing} + }, + { + name => 'ReportedEasting', + value => $h->{easting} + }, + { + name => 'Imageurl1', + value => $row->photos->[0] ? ($cobrand->base_url . $row->photos->[0]->{url_full}) : '' + }, + { + name => 'Imageurl2', + value => $row->photos->[1] ? ($cobrand->base_url . $row->photos->[1]->{url_full}) : '' + }, + { + name => 'Imageurl3', + value => $row->photos->[2] ? ($cobrand->base_url . $row->photos->[2]->{url_full}) : '' + } + ] + } + }); + # The endpoint crashes if the JADUFormFields string has whitespace between XML elements, so strip it out... + $output =~ s/>[\s\n]+</></g; + return $output; +} + +sub send { + my ( $self, $row, $h ) = @_; + + # FIXME: should not recreate this each time + my $angus_service; + + require Integrations::AngusSOAP; + + my $return = 1; + $angus_service ||= Integrations::AngusSOAP->on_fault(sub { my($soap, $res) = @_; die ref $res ? $res->faultstring : $soap->transport->status, "\n"; }); + try { + my $authresult = $angus_service->AuthenticateJADU(); + my $authtoken = $self->get_auth_token( $authresult ); + # authenticationtoken, CallerId, CallerAddressId, DeliveryId, DeliveryAddressId, CRMRequestType, JADUXFormRef, PaymentRef, JADUFormFields + my $result = $angus_service->CreateServiceRequest( + $authtoken, '1', '1', '1', '1', $self->crm_request_type($row, $h), + 'FMS', '', $self->jadu_form_fields($row, $h) + ); + my $external_id = $self->get_external_id( $result ); + if ( $external_id ) { + $row->external_id( $external_id ); + $row->send_method_used('Angus'); + $return = 0; + } + } catch { + my $e = $_; + $self->error( "Error sending to Angus: $e" ); + }; + $self->success( !$return ); + return $return; +} + +1; diff --git a/perllib/FixMyStreet/SendReport/EastHants.pm b/perllib/FixMyStreet/SendReport/EastHants.pm index 3eb8ffcfa..55ec79613 100644 --- a/perllib/FixMyStreet/SendReport/EastHants.pm +++ b/perllib/FixMyStreet/SendReport/EastHants.pm @@ -35,12 +35,12 @@ sub send { # FIXME: should not recreate this each time my $eh_service; - require EastHantsWSDL; + require Integrations::EastHantsWSDL; $h->{category} = 'Customer Services' if $h->{category} eq 'Other'; $h->{message} = construct_message( %$h ); my $return = 1; - $eh_service ||= EastHantsWSDL->on_fault(sub { my($soap, $res) = @_; die ref $res ? $res->faultstring : $soap->transport->status, "\n"; }); + $eh_service ||= Integrations::EastHantsWSDL->on_fault(sub { my($soap, $res) = @_; die ref $res ? $res->faultstring : $soap->transport->status, "\n"; }); try { # ServiceName, RemoteCreatedBy, Salutation, FirstName, Name, Email, Telephone, HouseNoName, Street, Town, County, Country, Postcode, Comments, FurtherInfo, ImageURL my $message = ent(encode_utf8($h->{message})); @@ -52,7 +52,6 @@ sub send { $return = 0 if $result eq 'Report received'; } catch { my $e = $_; - print "Caught an error: $e\n"; $self->error( "Error sending to East Hants: $e" ); }; $self->success( !$return ); diff --git a/perllib/FixMyStreet/SendReport/EmptyHomes.pm b/perllib/FixMyStreet/SendReport/EmptyHomes.pm deleted file mode 100644 index b5faf8ddc..000000000 --- a/perllib/FixMyStreet/SendReport/EmptyHomes.pm +++ /dev/null @@ -1,56 +0,0 @@ -package FixMyStreet::SendReport::EmptyHomes; - -use Moo; -use namespace::autoclean; - -use mySociety::MaPit; - -BEGIN { extends 'FixMyStreet::SendReport::Email'; } - -sub build_recipient_list { - my ( $self, $row, $h ) = @_; - - my $all_confirmed = 1; - foreach my $body ( @{ $self->bodies } ) { - my $contact = $row->result_source->schema->resultset("Contact")->find( { - deleted => 0, - body_id => $body->id, - category => 'Empty property', - } ); - - my ($body_email, $confirmed, $note) = ( $contact->email, $contact->confirmed, $contact->note ); - - unless ($confirmed) { - $all_confirmed = 0; - #$note = 'Council ' . $row->body . ' deleted' - #unless $note; - $body_email = 'N/A' unless $body_email; - #$notgot{$body_email}{$row->category}++; - #$note{$body_email}{$row->category} = $note; - } - - push @{ $self->to }, [ $body_email, $body->name ]; - - my $area_info = mySociety::MaPit::call('area', $body->body_areas->first->area_id); - my $country = $area_info->{country}; - if ($country eq 'W') { - push @{$self->bcc}, 'wales@' . FixMyStreet->config('EMAIL_DOMAIN'); - } elsif ($country eq 'S') { - push @{$self->bcc}, 'scotland@' . FixMyStreet->config('EMAIL_DOMAIN'); - } else { - push @{$self->bcc}, 'eha@' . FixMyStreet->config('EMAIL_DOMAIN'); - } - } - - # Set address email parameter from added data - $h->{address} = $row->extra->{address}; - - return $all_confirmed && @{$self->to}; -} - -sub get_template { - my ( $self, $row ) = @_; - return Utils::read_file( FixMyStreet->path_to( "templates", "email", "emptyhomes", $row->lang, "submit.txt" )->stringify ); -} - -1; diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm index 4844aa2e9..bf5ed3e30 100644 --- a/perllib/FixMyStreet/SendReport/Open311.pm +++ b/perllib/FixMyStreet/SendReport/Open311.pm @@ -126,8 +126,8 @@ sub send { $revert = 1; } - if ($row->cobrand eq 'fixmybarangay' || $row->bodies_str =~ /$COUNCIL_ID_GREENWICH/) { - # FixMyBarangay endpoints expect external_id as an attribute, as do Greenwich + if ($row->bodies_str =~ /$COUNCIL_ID_GREENWICH/) { + # Greenwich endpoint expects external_id as an attribute $row->set_extra_fields( { 'name' => 'external_id', 'value' => $row->id } ); $revert = 1; } @@ -144,14 +144,11 @@ sub send { $self->success( 1 ); } else { $result *= 1; - # temporary fix to resolve some issues with west berks - if ( $row->bodies_str =~ /2619/ ) { - $result *= 0; - } + $self->error( "Failed to send over Open311\n" ) unless $self->error; + $self->error( $self->error . "\n" . $open311->error ); } } - $self->error( 'Failed to send over Open311' ) unless $self->success; return $result; } diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm index f3ee7787b..2ad820d1f 100644 --- a/perllib/FixMyStreet/TestMech.pm +++ b/perllib/FixMyStreet/TestMech.pm @@ -423,7 +423,7 @@ sub extract_problem_list { my $mech = shift; my $result = scraper { - process 'ul.item-list--reports li a h4', 'problems[]', 'TEXT'; + process 'ul.item-list--reports li a h3', 'problems[]', 'TEXT'; }->scrape( $mech->response ); return $result->{ problems } || []; diff --git a/perllib/Integrations/AngusSOAP.pm b/perllib/Integrations/AngusSOAP.pm new file mode 100644 index 000000000..5f100993b --- /dev/null +++ b/perllib/Integrations/AngusSOAP.pm @@ -0,0 +1,168 @@ +package Integrations::AngusSOAP; + +# Generated by SOAP::Lite (v0.715) for Perl -- soaplite.com +# Copyright (C) 2000-2006 Paul Kulchenko, Byrne Reese +# -- generated at [Thu Dec 17 15:16:47 2015] +# -- generated from https://webserviceslive.angus.gov.uk/acwebservices.cfc?wsdl +# -- generated with the stubmaker.pl script from SOAP::Lite + +# Angus provide endpoints for testing and production, make sure we're using the right one. +use FixMyStreet; +my $TEST_ENDPOINT = 'https://webservicestest.angus.gov.uk/acwebservices.cfc'; +my $LIVE_ENDPOINT = 'https://webserviceslive.angus.gov.uk/acwebservices.cfc'; +my $ENDPOINT = FixMyStreet->config('STAGING_SITE') ? $TEST_ENDPOINT : $LIVE_ENDPOINT; + +# It can be helpful to override the endpoint URL e.g. for dev or testing +$ENDPOINT = FixMyStreet->config('ANGUS_ENDPOINT') ? FixMyStreet->config('ANGUS_ENDPOINT') : $ENDPOINT; + +my %methods = ( +'GetLocaleInfo' => { + endpoint => $ENDPOINT, + soapaction => '', + namespace => 'http://DefaultNamespace', + parameters => [ + SOAP::Data->new(name => 'authenticationtoken', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'uprn', type => 'xsd:string', attr => {}), + ], # end parameters + }, # end GetLocaleInfo +'AuthenticateJADU' => { + endpoint => $ENDPOINT, + soapaction => '', + namespace => 'http://DefaultNamespace', + parameters => [ + ], # end parameters + }, # end AuthenticateJADU +'CreateServiceRequest' => { + endpoint => $ENDPOINT, + soapaction => '', + namespace => 'http://DefaultNamespace', + parameters => [ + SOAP::Data->new(name => 'authenticationtoken', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'CallerId', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'CallerAddressId', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'DeliveryId', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'DeliveryAddressId', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'CRMRequestType', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'JADUXFormRef', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'PaymentRef', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'JADUFormFields', type => 'xsd:string', attr => {}), + ], # end parameters + }, # end CreateServiceRequest +'PropertySearch' => { + endpoint => $ENDPOINT, + soapaction => '', + namespace => 'http://DefaultNamespace', + parameters => [ + SOAP::Data->new(name => 'authenticationtoken', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'postcode', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'streetname', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'town', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'UPRN', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'USRN', type => 'xsd:string', attr => {}), + ], # end parameters + }, # end PropertySearch +'CreateCustomer' => { + endpoint => $ENDPOINT, + soapaction => '', + namespace => 'http://DefaultNamespace', + parameters => [ + SOAP::Data->new(name => 'authenticationtoken', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'title', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'forename', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'surname', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'uprn', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'HouseNo', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'HouseName', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'StreetName', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'Locale', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'Town', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'County', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'Northing', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'Easting', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'postcode', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'email', type => 'xsd:string', attr => {}), + SOAP::Data->new(name => 'telephone', type => 'xsd:string', attr => {}), + ], # end parameters + }, # end CreateCustomer +); # end my %methods + +use SOAP::Lite; +use Exporter; +use Carp (); + +use vars qw(@ISA $AUTOLOAD @EXPORT_OK %EXPORT_TAGS); +@ISA = qw(Exporter SOAP::Lite); +@EXPORT_OK = (keys %methods); +%EXPORT_TAGS = ('all' => [@EXPORT_OK]); + +sub _call { + my ($self, $method) = (shift, shift); + my $name = UNIVERSAL::isa($method => 'SOAP::Data') ? $method->name : $method; + my %method = %{$methods{$name}}; + $self->proxy($method{endpoint} || Carp::croak "No server address (proxy) specified") + unless $self->proxy; + my @templates = @{$method{parameters}}; + my @parameters = (); + foreach my $param (@_) { + if (@templates) { + my $template = shift @templates; + my ($prefix,$typename) = SOAP::Utils::splitqname($template->type); + my $method = 'as_'.$typename; + # TODO - if can('as_'.$typename) {...} + my $result = $self->serializer->$method($param, $template->name, $template->type, $template->attr); + push(@parameters, $template->value($result->[2])); + } + else { + push(@parameters, $param); + } + } + $self->endpoint($method{endpoint}) + ->ns($method{namespace}) + ->on_action(sub{qq!"$method{soapaction}"!}); + $self->serializer->register_ns("http://schemas.xmlsoap.org/wsdl/soap/","wsdlsoap"); + $self->serializer->register_ns("http://DefaultNamespace","intf"); + $self->serializer->register_ns("http://xml.apache.org/xml-soap","apachesoap"); + $self->serializer->register_ns("http://rpc.xml.coldfusion","tns1"); + $self->serializer->register_ns("http://DefaultNamespace","impl"); + $self->serializer->register_ns("http://schemas.xmlsoap.org/wsdl/","wsdl"); + $self->serializer->register_ns("http://schemas.xmlsoap.org/soap/encoding/","soapenc"); + $self->serializer->register_ns("http://www.w3.org/2001/XMLSchema","xsd"); + my $som = $self->SUPER::call($method => @parameters); + if ($self->want_som) { + return $som; + } + UNIVERSAL::isa($som => 'SOAP::SOM') ? wantarray ? $som->paramsall : $som->result : $som; +} + +sub BEGIN { + no strict 'refs'; + for my $method (qw(want_som)) { + my $field = '_' . $method; + *$method = sub { + my $self = shift->new; + @_ ? ($self->{$field} = shift, return $self) : return $self->{$field}; + } + } +} +no strict 'refs'; +for my $method (@EXPORT_OK) { + my %method = %{$methods{$method}}; + *$method = sub { + my $self = UNIVERSAL::isa($_[0] => __PACKAGE__) + ? ref $_[0] + ? shift # OBJECT + # CLASS, either get self or create new and assign to self + : (shift->self || __PACKAGE__->self(__PACKAGE__->new)) + # function call, either get self or create new and assign to self + : (__PACKAGE__->self || __PACKAGE__->self(__PACKAGE__->new)); + $self->_call($method, @_); + } +} + +sub AUTOLOAD { + my $method = substr($AUTOLOAD, rindex($AUTOLOAD, '::') + 2); + return if $method eq 'DESTROY' || $method eq 'want_som'; + die "Unrecognized method '$method'. List of available method(s): @EXPORT_OK\n"; +} + +1; diff --git a/perllib/EastHantsWSDL.pm b/perllib/Integrations/EastHantsWSDL.pm index 181cc93a1..b35309c3d 100644 --- a/perllib/EastHantsWSDL.pm +++ b/perllib/Integrations/EastHantsWSDL.pm @@ -1,4 +1,4 @@ -package EastHantsWSDL; +package Integrations::EastHantsWSDL; # -- generated by SOAP::Lite (v0.60) for Perl -- soaplite.com -- Copyright (C) 2000-2001 Paul Kulchenko -- # -- generated from http://www.easthants.gov.uk/forms.nsf/InputFeedback?WSDL [Thu Oct 16 12:31:57 2008] diff --git a/perllib/Open311.pm b/perllib/Open311.pm index e500219bc..fb793b027 100644 --- a/perllib/Open311.pm +++ b/perllib/Open311.pm @@ -345,7 +345,7 @@ sub _populate_service_request_update_params { if ( $comment->photo ) { my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($comment->cobrand)->new(); my $email_base_url = $cobrand->base_url($comment->cobrand_data); - my $url = $email_base_url . '/photo/c/' . $comment->id . '.full.jpeg'; + my $url = $email_base_url . $comment->photos->[0]->{url_full}; $params->{media_url} = $url; } diff --git a/perllib/Open311/GetServiceRequestUpdates.pm b/perllib/Open311/GetServiceRequestUpdates.pm index 11bc1e64f..daa5fb64d 100644 --- a/perllib/Open311/GetServiceRequestUpdates.pm +++ b/perllib/Open311/GetServiceRequestUpdates.pm @@ -89,6 +89,13 @@ sub update_comments { # what problem it belongs to so just skip next unless $request_id; + my $comment_time = eval { + DateTime::Format::W3CDTF->parse_datetime( $request->{updated_datetime} || "" ); + }; + next if $@; + my $updated = DateTime::Format::W3CDTF->format_datetime($comment_time->clone->set_time_zone('UTC')); + next if @args && ($updated lt $args[0] || $updated gt $args[1]); + my $problem; my $criteria = { external_id => $request_id, @@ -99,8 +106,6 @@ sub update_comments { my $c = $p->comments->search( { external_id => $request->{update_id} } ); if ( !$c->first ) { - my $comment_time = DateTime::Format::W3CDTF->parse_datetime( $request->{updated_datetime} ); - my $comment = $self->schema->resultset('Comment')->new( { problem => $p, diff --git a/perllib/Open311/PopulateServiceList.pm b/perllib/Open311/PopulateServiceList.pm index 15a827217..3236f3798 100644 --- a/perllib/Open311/PopulateServiceList.pm +++ b/perllib/Open311/PopulateServiceList.pm @@ -18,7 +18,6 @@ sub process_bodies { while ( my $body = $self->bodies->next ) { next unless $body->endpoint; next unless lc($body->send_method) eq 'open311'; - next if $body->jurisdiction =~ /^fixmybarangay_\w+$/; # FMB depts. not using service discovery yet $self->_current_body( $body ); $self->process_body; } diff --git a/t/Mock/Twitter.pm b/t/Mock/Twitter.pm new file mode 100644 index 000000000..930895e28 --- /dev/null +++ b/t/Mock/Twitter.pm @@ -0,0 +1,43 @@ +package t::Mock::Twitter; + +use JSON::MaybeXS; +use Web::Simple; +use MooX::Types::MooseLike::Base qw(:all); + +has json => ( + is => 'lazy', + default => sub { + JSON->new->pretty->allow_blessed->convert_blessed; + }, +); + +sub dispatch_request { + my $self = shift; + + sub (GET + /oauth/authenticate + ?*) { + my ($self) = @_; + return [ 200, [ 'Content-Type' => 'text/html' ], [ 'TwitteB login page' ] ]; + }, + + sub (GET + /oauth/access_token + ?*) { + my ($self) = @_; + return [ 200, [ 'Content-Type' => 'text/plain' ], [ 'oauth_token=access_token&oauth_token_secret=secret' ] ]; + }, + + sub (GET + /oauth/request_token + ?*) { + my ($self) = @_; + return [ 200, [ 'Content-Type' => 'text/plain' ], [ 'oauth_token=request-token&oauth_token_secret=secret&oauth_callback_confirmed=true' ] ]; + }, + + sub (GET + /1.1/account/verify_credentials.json + ?*) { + my ($self) = @_; + my $data = { + id => '987654321', + name => 'Fiona Tester', + }; + my $json = $self->json->encode($data); + return [ 200, [ 'Content-Type' => 'text/html' ], [ $json ] ]; + }, +} + +__PACKAGE__->run_if_script; diff --git a/t/app/01app.t b/t/app/01app.t index eb98b6319..df562b829 100644 --- a/t/app/01app.t +++ b/t/app/01app.t @@ -16,12 +16,16 @@ use Encode qw(encode); ok( request('/')->is_success, 'Request should succeed' ); +SKIP: { FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'tester' ], }, sub { + skip 'Test will not pass on Mac OS', 1 if $^O eq 'darwin'; + my $page = get('/'); my $num = encode('UTF-8', "12\N{NO-BREAK SPACE}345"); like $page, qr/$num/; }; +} done_testing(); diff --git a/t/app/controller/about.t b/t/app/controller/about.t index 6a082a2ff..cec50abfa 100644 --- a/t/app/controller/about.t +++ b/t/app/controller/about.t @@ -1,3 +1,4 @@ +use utf8; use strict; use warnings; @@ -21,19 +22,12 @@ ok !$mech->res->is_success(), "want a bad response"; is $mech->res->code, 404, "got 404"; FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'emptyhomes' ], + ALLOWED_COBRANDS => [ 'fiksgatami' ], }, sub { - # check that geting the page as EHA produces a different page - ok $mech->host("reportemptyhomes.co.uk"), 'change host to reportemptyhomes'; - $mech->get_ok('/about'); - $mech->content_like(qr{About us ::}); - $mech->content_contains('html lang="en-gb"'); - - # check that geting the page as EHA in welsh produces a different page - ok $mech->host("cy.reportemptyhomes.co.uk"), 'host to cy.reportemptyhomes'; - $mech->get_ok('/about'); - $mech->content_like(qr{Amdanom ni ::}); - $mech->content_contains('html lang="cy"'); + ok $mech->host("www.fiksgatami.no"), 'host to fiksgatami'; + $mech->get_ok('/faq'); + $mech->content_like(qr{Ofte spurte spørsmÃ¥l ::}); + $mech->content_contains('html class="no-js" lang="nb"'); }; done_testing(); diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index 92cbbc00f..1dcb768dc 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -104,9 +104,9 @@ subtest 'check summary counts' => sub { $mech->content_contains( "$q_count questionnaires sent" ); FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'barnet' ], + ALLOWED_COBRANDS => [ 'oxfordshire' ], }, sub { - ok $mech->host('barnet.fixmystreet.com'); + ok $mech->host('oxfordshire.fixmystreet.com'); $mech->get_ok('/admin'); $mech->title_like(qr/Summary/); @@ -115,11 +115,11 @@ subtest 'check summary counts' => sub { my ($num_alerts) = $mech->content =~ /(\d+) confirmed alerts/; my ($num_qs) = $mech->content =~ /(\d+) questionnaires sent/; - $report->bodies_str(2489); - $report->cobrand('barnet'); + $report->bodies_str(2237); + $report->cobrand('oxfordshire'); $report->update; - $alert->cobrand('barnet'); + $alert->cobrand('oxfordshire'); $alert->update; $mech->get_ok('/admin'); @@ -171,6 +171,7 @@ subtest 'check contact creation' => sub { email => 'test@example.com', note => 'test note', non_public => undef, + confirmed => 0, } } ); $mech->content_contains( 'test category' ); diff --git a/t/app/controller/auth_social.t b/t/app/controller/auth_social.t index 84fdd4dfe..6929c0ddc 100644 --- a/t/app/controller/auth_social.t +++ b/t/app/controller/auth_social.t @@ -6,6 +6,7 @@ use LWP::Simple; use JSON::MaybeXS; use t::Mock::Facebook; +use t::Mock::Twitter; use t::Mock::MapIt; use FixMyStreet::TestMech; @@ -21,6 +22,7 @@ LWP::Protocol::PSGI->register(t::Mock::MapIt->to_psgi_app, host => 'mapit.uk'); FixMyStreet::override_config { FACEBOOK_APP_ID => 'facebook-app-id', + TWITTER_KEY => 'twitter-key', ALLOWED_COBRANDS => [ { fixmystreet => '.' } ], MAPIT_URL => 'http://mapit.uk/', }, sub { @@ -31,7 +33,10 @@ my $fb_uid = 123456789; for my $fb_state ( 'refused', 'no email', 'existing UID', 'okay' ) { for my $page ( 'my', 'report', 'update' ) { subtest "test FB '$fb_state' login for page '$page'" => sub { + # Lots of user changes happening here, make sure we don't confuse + # Catalyst with a cookie session user that no longer exists $mech->log_out_ok; + $mech->cookie_jar({}); if ($fb_state eq 'existing UID') { my $user = $mech->create_user_ok($fb_email); $user->update({ facebook_id => $fb_uid }); @@ -135,6 +140,118 @@ for my $fb_state ( 'refused', 'no email', 'existing UID', 'okay' ) { } } +my $tw_email = 'twitter@example.org'; +my $tw_uid = 987654321; + +# Twitter has no way of getting the email, so no "okay" state here +for my $tw_state ( 'refused', 'existing UID', 'no email' ) { + for my $page ( 'my', 'report', 'update' ) { + subtest "test Twitter '$tw_state' login for page '$page'" => sub { + # Lots of user changes happening here, make sure we don't confuse + # Catalyst with a cookie session user that no longer exists + $mech->log_out_ok; + $mech->cookie_jar({}); + if ($tw_state eq 'existing UID') { + my $user = $mech->create_user_ok($tw_email); + $user->update({ twitter_id => $tw_uid }); + } else { + $mech->delete_user($tw_email); + } + + # Set up a mock to catch (most, see below) requests to Twitter + my $tw = t::Mock::Twitter->new; + LWP::Protocol::PSGI->register($tw->to_psgi_app, host => 'api.twitter.com'); + + # Due to https://metacpan.org/pod/Test::WWW::Mechanize::Catalyst#External-Redirects-and-allow_external + # the redirect to Twitter's OAuth page can mess up the session + # cookie. So let's pretend we always on api.twitter.com, which + # sorts that out. + $mech->host('api.twitter.com'); + + # Fetch the page with the form via which we wish to log in + my $fields; + if ($page eq 'my') { + $mech->get_ok('/my'); + } elsif ($page eq 'report') { + $mech->get_ok('/'); + $mech->submit_form_ok( { with_fields => { pc => 'SW1A1AA' } }, "submit location" ); + $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" ); + $fields = { + title => 'Test title', + detail => 'Test detail', + }; + } else { + $mech->get_ok('/report/' . $report->id); + $fields = { + update => 'Test update', + }; + } + $mech->submit_form(with_fields => $fields, button => 'twitter_sign_in'); + + # As well as the cookie issue above, caused by this external + # redirect rewriting the host, the redirect gets handled directly + # by Catalyst, not our mocked handler, so will be a 404. Check + # the redirect happened instead. + is $mech->res->previous->code, 302, 'Twitter button redirected'; + like $mech->res->previous->header('Location'), qr{api\.twitter\.com/oauth/authenticate\?oauth_token=request-token}, 'Twitter redirect to oauth URL'; + + # Okay, now call the callback Facebook would send us to + if ($tw_state eq 'refused') { + $mech->get_ok('/auth/Twitter?denied=token'); + } else { + $mech->get_ok('/auth/Twitter?oauth_token=request-token&oauth_verifier=verifier'); + } + + # Check we're showing the right form, regardless of what came back + if ($page eq 'report') { + $mech->content_contains('/report/new'); + } elsif ($page eq 'update') { + $mech->content_contains('/report/update'); + } + + if ($tw_state eq 'refused') { + $mech->content_contains('Sorry, we could not log you in. Please fill in the form below.'); + $mech->not_logged_in_ok; + } elsif ($tw_state eq 'no email') { + $mech->content_contains('We need your email address, please give it below.'); + # We don't have an email, so check that we can still submit it, + # and the ID carries through the confirmation + if ($page eq 'update') { + $fields->{rznvy} = $tw_email; + } else { + $fields->{email} = $tw_email; + } + $fields->{name} = 'Ffion Tester'; + $mech->submit_form(with_fields => $fields); + $mech->content_contains('Nearly done! Now check your email'); + + my $email = $mech->get_email; + ok $email, "got an email"; + $mech->clear_emails_ok; + my ( $url, $url_token ) = $email->body =~ m{(https?://\S+/[CMP]/)(\S+)}; + ok $url, "extracted confirm url '$url'"; + + my $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $tw_email } ); + if ($page eq 'my') { + is $user, undef, 'No user yet exists'; + } else { + is $user->twitter_id, undef, 'User has no twitter ID'; + } + $mech->get_ok( $url . $url_token ); + $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $tw_email } ); + is $user->twitter_id, $tw_uid, 'User now has correct twitter ID'; + + } elsif ($page ne 'my') { + # /my auth login goes directly there, no message like this + $mech->content_contains('You have successfully signed in; please check and confirm your details are accurate'); + $mech->logged_in_ok; + } else { + is $mech->uri->path, '/my', 'Successfully on /my page'; + } + } + } +} + }; END { diff --git a/t/app/controller/photo.t b/t/app/controller/photo.t index 39380e769..425e3c4df 100644 --- a/t/app/controller/photo.t +++ b/t/app/controller/photo.t @@ -65,10 +65,10 @@ subtest "Check multiple upload worked" => sub { ok $mech->success, 'Made request with multiple photo upload'; $mech->base_is('http://localhost/report/new'); $mech->content_like( - qr[(<img align="right" src="/photo/1cdd4329ceee2234bd4e89cb33b42061a0724687.temp.jpeg" alt="">\s*){3}], + qr[(<img align="right" src="/photo/temp.1cdd4329ceee2234bd4e89cb33b42061a0724687.jpeg" alt="">\s*){3}], 'Three uploaded pictures are all shown, safe'); $mech->content_contains( - 'name="upload_fileid" value="1cdd4329ceee2234bd4e89cb33b42061a0724687,1cdd4329ceee2234bd4e89cb33b42061a0724687,1cdd4329ceee2234bd4e89cb33b42061a0724687"', + 'name="upload_fileid" value="1cdd4329ceee2234bd4e89cb33b42061a0724687.jpeg,1cdd4329ceee2234bd4e89cb33b42061a0724687.jpeg,1cdd4329ceee2234bd4e89cb33b42061a0724687.jpeg"', 'Returned upload_fileid contains expected hash, 3 times'); my $image_file = path($UPLOAD_DIR, '1cdd4329ceee2234bd4e89cb33b42061a0724687.jpeg'); ok $image_file->exists, 'File uploaded to temp'; diff --git a/t/app/controller/questionnaire.t b/t/app/controller/questionnaire.t index 7718d5034..7bc6545db 100644 --- a/t/app/controller/questionnaire.t +++ b/t/app/controller/questionnaire.t @@ -63,8 +63,8 @@ my $email = $mech->get_email; ok $email, "got an email"; like $email->body, qr/fill in our short questionnaire/i, "got questionnaire email"; -like $email->body, qr/Testing =96 Detail/, 'email contains encoded character'; -is $email->header('Content-Type'), 'text/plain; charset="windows-1252"', 'in the right character set'; +like $email->body_str, qr/Testing \x{2013} Detail/, 'email contains encoded character'; +is $email->header('Content-Type'), 'text/plain; charset="utf-8"', 'in the right character set'; my ($token) = $email->body =~ m{http://.*?/Q/(\S+)}; ok $token, "extracted questionnaire token '$token'"; @@ -394,31 +394,23 @@ for my $test ( } FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'emptyhomes', 'fixmystreet' ], + ALLOWED_COBRANDS => [ 'fixmystreet' ], }, sub { - # EHA extra checking - ok $mech->host("reportemptyhomes.com"), 'change host to reportemptyhomes'; - - # Reset, and all the questionaire sending function - FIXME should it detect site itself somehow? + $report->discard_changes; $report->send_questionnaire( 1 ); $report->update; $questionnaire->delete; - FixMyStreet::App->model('DB::Questionnaire')->send_questionnaires( { - site => 'emptyhomes' - } ); + FixMyStreet::App->model('DB::Questionnaire')->send_questionnaires(); $email = $mech->get_email; ok $email, "got an email"; $mech->clear_emails_ok; (my $body = $email->body) =~ s/\s+/ /g; - like $body, qr/fill in this short questionnaire/i, "got questionnaire email"; + like $body, qr/fill in our short questionnaire/i, "got questionnaire email"; ($token) = $email->body =~ m{http://.*?/Q/(\S+)}; ok $token, "extracted questionnaire token '$token'"; - $mech->get_ok("/Q/" . $token); - $mech->content_lacks( 'Would you like to receive another questionnaire' ); - # Test already answered the ever reported question, so not shown again $dt = $dt->add( weeks => 4 ); my $questionnaire2 = FixMyStreet::App->model('DB::Questionnaire')->find_or_create( @@ -429,17 +421,11 @@ FixMyStreet::override_config { } ); ok $questionnaire2, 'added another questionnaire'; - ok $mech->host("www.fixmystreet.com"), 'change host to fixmystreet'; $mech->get_ok("/Q/" . $token); $mech->title_like( qr/Questionnaire/ ); $mech->content_contains( 'Has this problem been fixed?' ); $mech->content_lacks( 'ever reported' ); - # EHA extra checking - ok $mech->host("reportemptyhomes.com"), 'change host to reportemptyhomes'; - $mech->get_ok("/Q/" . $token); - $mech->content_lacks( 'Would you like to receive another questionnaire' ); - $token = FixMyStreet::App->model("DB::Token")->find( { scope => 'questionnaire', token => $token } ); ok $token, 'found token for questionnaire'; $questionnaire = FixMyStreet::App->model('DB::Questionnaire')->find( { id => $token->data } ); @@ -452,18 +438,19 @@ FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'fiksgatami' ], }, sub { # I18N Unicode extra testing using FiksGataMi + $report->discard_changes; $report->send_questionnaire( 1 ); $report->cobrand( 'fiksgatami' ); $report->update; $questionnaire->delete; - FixMyStreet::App->model('DB::Questionnaire')->send_questionnaires( { site => 'fixmystreet' } ); # It's either fixmystreet or emptyhomes + FixMyStreet::App->model('DB::Questionnaire')->send_questionnaires(); $email = $mech->get_email; ok $email, "got an email"; $mech->clear_emails_ok; - like $email->body, qr/Testing =96 Detail/, 'email contains encoded character from user'; - like $email->body, qr/sak p=E5 FiksGataMi/, 'email contains encoded character from template'; - is $email->header('Content-Type'), 'text/plain; charset="windows-1252"', 'email is in right encoding'; + like $email->body_str, qr/Testing \x{2013} Detail/, 'email contains encoded character from user'; + like $email->body_str, qr/sak p\xe5 FiksGataMi/, 'email contains encoded character from template'; + is $email->header('Content-Type'), 'text/plain; charset="utf-8"', 'email is in right encoding'; }; $mech->delete_user('test@example.com'); diff --git a/t/app/controller/report_interest_count.t b/t/app/controller/report_interest_count.t index 506b50edd..4e86789ba 100644 --- a/t/app/controller/report_interest_count.t +++ b/t/app/controller/report_interest_count.t @@ -1,5 +1,16 @@ use strict; use warnings; + +package FixMyStreet::Cobrand::Tester; + +use parent 'FixMyStreet::Cobrand::Default'; + +sub can_support_problems { + return 1; +} + +package main; + use Test::More; use FixMyStreet::TestMech; @@ -52,7 +63,7 @@ my $report_id = $report->id; ok $report, "created test report - $report_id"; FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'fixmybarangay' ], + ALLOWED_COBRANDS => [ 'tester' ], }, sub { my $body = $mech->create_body_ok(2504, 'Westminster City Council'); @@ -76,7 +87,6 @@ FixMyStreet::override_config { }, ) { subtest $test->{desc} => sub { - ok $mech->host('fixmybarangay.com'), 'changed to fixmybarangay'; $mech->log_in_ok( $user->email ); $user->from_body( $test->{from_body} ); $user->update; @@ -92,7 +102,7 @@ FixMyStreet::override_config { $mech->content_contains('Add support'); $mech->submit_form_ok( { form_number => 1 } ); - is $mech->uri, "http://fixmybarangay.com/report/$report_id", 'add support redirects to report page'; + is $mech->uri->path, "/report/$report_id", 'add support redirects to report page'; $mech->content_contains($test->{updated_support}); } else { @@ -102,26 +112,22 @@ FixMyStreet::override_config { } subtest 'check non body user cannot increment support count' => sub { - ok $mech->host('fixmybarangay.com'), 'changed to fixmybarangay'; - ok $report->update({ interest_count => 1 }), 'updated interest count'; is $report->interest_count, 1, 'correct interest count'; $mech->get_ok("/report/$report_id"); $mech->content_contains( '1 supporter' ); - # This doesn't send cookie, so is logged out + $mech->log_out_ok( $user->email ); $mech->post_ok("/report/support", { id => $report_id } ); - is $mech->uri, "http://fixmybarangay.com/report/$report_id", 'add support redirects to report page'; + is $mech->uri->path, "/report/$report_id", 'add support redirects to report page'; $mech->content_contains( '1 supporter' ); }; }; subtest 'check support details not shown if not enabled in cobrand' => sub { - ok $mech->host('www.fixmystreet.com'), 'changed to fixmystreet'; - $report->interest_count(1); ok $report->update, 'updated interest count'; diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index cf72221b4..eb29d37da 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -420,7 +420,7 @@ foreach my $test ( changes => { photo1 => '', }, - errors => [ "Please upload a JPEG image only" ], + errors => [ "Please upload an image only" ], }, { msg => 'bad photo upload gives error', @@ -443,7 +443,7 @@ foreach my $test ( changes => { photo1 => '', }, - errors => [ "That image doesn't appear to have uploaded correctly (Please upload a JPEG image only ), please try again." ], + errors => [ "That image doesn't appear to have uploaded correctly (Please upload an image only ), please try again." ], }, { msg => 'photo with octet-stream gets through okay', diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index f9f5189e5..7b4bf7854 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -760,7 +760,8 @@ subtest 'check meta correct for comments marked confirmed but not marked open' = user => $user, problem_id => $report->id, text => 'update text', - confirmed => DateTime->now( time_zone => 'local' ), + # Subtract a day to deal with any code/db timezone difference + confirmed => DateTime->now( time_zone => 'local' ) - DateTime::Duration->new( days => 1 ), problem_state => 'confirmed', anonymous => 0, mark_open => 0, diff --git a/t/app/controller/reports.t b/t/app/controller/reports.t index 02625fcc7..8869adaa7 100644 --- a/t/app/controller/reports.t +++ b/t/app/controller/reports.t @@ -12,6 +12,7 @@ $mech->create_body_ok(2514, 'Birmingham City Council'); my $body_edin_id = $mech->create_body_ok(2651, 'City of Edinburgh Council')->id; my $body_west_id = $mech->create_body_ok(2504, 'Westminster City Council')->id; my $body_fife_id = $mech->create_body_ok(2649, 'Fife Council')->id; +my $body_slash_id = $mech->create_body_ok(10000, 'Electricity/Gas Council')->id; $mech->delete_problems_for_body( $body_west_id ); $mech->delete_problems_for_body( $body_edin_id ); @@ -122,6 +123,10 @@ is scalar @$problems, 5, 'correct number of problems displayed'; FixMyStreet::override_config { MAPIT_URL => 'http://mapit.mysociety.org/', }, sub { + $mech->get_ok('/reports'); + $mech->follow_link_ok({ url_regex => qr{/reports/Electricity_Gas\+Council} }); + is $mech->uri->path, '/reports/Electricity_Gas+Council', 'Path is correct'; + $mech->get_ok('/reports/City+of+Edinburgh?t=new'); }; $problems = $mech->extract_problem_list; @@ -191,17 +196,6 @@ $mech->get_ok('/reports'); $stats = $mech->extract_report_stats; is $stats->{'Westminster City Council'}->[1], 5, 'non public reports included in stats'; -subtest "test emptyhomes all reports page" => sub { - FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'emptyhomes' ], - }, sub { - ok $mech->host("reportemptyhomes.com"), 'change host to reportemptyhomes'; - $mech->get_ok('/reports'); - # EHA lacks one column the others have - $mech->content_lacks('state unknown'); - }; -}; - subtest "test fiksgatami all reports page" => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'fiksgatami' ], diff --git a/t/app/helpers/send_email.t b/t/app/helpers/send_email.t index f60f7fa5a..e2c8688a8 100644 --- a/t/app/helpers/send_email.t +++ b/t/app/helpers/send_email.t @@ -41,8 +41,7 @@ my $email = Email::MIME->new($email_as_string); my $expected_email_content = path(__FILE__)->parent->child('send_email_sample.txt')->slurp; my $name = FixMyStreet->config('CONTACT_NAME'); -$name = "\"$name\"" if $name =~ / /; -my $sender = $name . ' <' . FixMyStreet->config('DO_NOT_REPLY_EMAIL') . '>'; +my $sender = '"' . $name . '" <' . FixMyStreet->config('DO_NOT_REPLY_EMAIL') . '>'; $expected_email_content =~ s{CONTACT_EMAIL}{$sender}; my $expected_email = Email::MIME->new($expected_email_content); diff --git a/t/app/helpers/send_email_sample.txt b/t/app/helpers/send_email_sample.txt index 1ccce6a23..0f7406172 100644 --- a/t/app/helpers/send_email_sample.txt +++ b/t/app/helpers/send_email_sample.txt @@ -1,5 +1,5 @@ MIME-Version: 1.0 -Subject: test email =?utf-8?Q?=E2=98=BA?= +Subject: =?UTF-8?B?dGVzdCBlbWFpbCDimLo=?= Content-Type: text/plain; charset="utf-8" To: test@recipient.com Content-Transfer-Encoding: quoted-printable @@ -24,5 +24,3 @@ culpa qui officia deserunt mollit anim id est laborum. Yours,=20=20 FixMyStreet.=20= - - diff --git a/t/app/helpers/send_email_sample_mime.txt b/t/app/helpers/send_email_sample_mime.txt index c4ca97bcc..0649d1ceb 100644 --- a/t/app/helpers/send_email_sample_mime.txt +++ b/t/app/helpers/send_email_sample_mime.txt @@ -1,57 +1,49 @@ -MIME-Version: 1.0 -Subject: test email =?utf-8?Q?=E2=98=BA?= -Content-Type: multipart/mixed; boundary="BOUNDARY" -To: test@recipient.com -Content-Transfer-Encoding: 7bit -From: CONTACT_EMAIL - - ---BOUNDARY -MIME-Version: 1.0 -Subject: test email =?utf-8?Q?=E2=98=BA?= -Content-Type: text/plain; charset="utf-8" -To: test@recipient.com -Content-Transfer-Encoding: quoted-printable -From: CONTACT_EMAIL - -Hello, - -This is a test email where foo: bar. - -utf8: =E6=88=91=E4=BB=AC=E5=BA=94=E8=AF=A5=E8=83=BD=E5=A4=9F=E6=97=A0=E7=BC= -=9D=E5=A4=84=E7=90=86UTF8=E7=BC=96=E7=A0=81 - - indented_text - -long line: Lorem ipsum dolor sit amet, consectetur adipisicing elit, -sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. -Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris -nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in -reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla -pariatur. Excepteur sint occaecat cupidatat non proident, sunt in -culpa qui officia deserunt mollit anim id est laborum. - -Yours,=20=20 -FixMyStreet.=20= - - - ---BOUNDARY -MIME-Version: 1.0 -Content-Type: image/gif; name="foo.gif" -Content-Disposition: inline; filename="foo.gif" -Content-Transfer-Encoding: quoted-printable - -GIF89a=01=00=01=00=80=00=00=00=00=00=CC=CC=CC,=00=00=00=00=01=00=01=00=00= -=02=01L=00;= - ---BOUNDARY -MIME-Version: 1.0 -Content-Type: image/gif; name="bar.gif" -Content-Disposition: inline; filename="bar.gif" -Content-Transfer-Encoding: quoted-printable - -GIF89a=01=00=01=00=80=00=00=00=00=00=CC=CC=CC,=00=00=00=00=01=00=01=00=00= -=02=01L=00;= - ---BOUNDARY-- +MIME-Version: 1.0
+Subject: =?UTF-8?B?dGVzdCBlbWFpbCDimLo=?=
+Content-Type: multipart/mixed; boundary="BOUNDARY"
+To: test@recipient.com
+Content-Transfer-Encoding: 7bit
+From: CONTACT_EMAIL
+
+
+--BOUNDARY
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+Hello,
+
+This is a test email where foo: bar.
+
+utf8: =E6=88=91=E4=BB=AC=E5=BA=94=E8=AF=A5=E8=83=BD=E5=A4=9F=E6=97=A0=E7=BC=
+=9D=E5=A4=84=E7=90=86UTF8=E7=BC=96=E7=A0=81
+
+ indented_text
+
+long line: Lorem ipsum dolor sit amet, consectetur adipisicing elit,
+sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
+nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+culpa qui officia deserunt mollit anim id est laborum.
+
+Yours,=20=20
+FixMyStreet.=20=
+
+--BOUNDARY
+Content-Type: image/gif; name="foo.gif"
+Content-Disposition: inline; filename="foo.gif"
+Content-Transfer-Encoding: quoted-printable
+
+GIF89a=01=00=01=00=80=00=00=00=00=00=CC=CC=CC,=00=00=00=00=01=00=01=00=00=
+=02=01L=00;=
+
+--BOUNDARY
+Content-Type: image/gif; name="bar.gif"
+Content-Disposition: inline; filename="bar.gif"
+Content-Transfer-Encoding: quoted-printable
+
+GIF89a=01=00=01=00=80=00=00=00=00=00=CC=CC=CC,=00=00=00=00=01=00=01=00=00=
+=02=01L=00;=
+
+--BOUNDARY--
diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t index 0130f404e..e94ee8ce1 100644 --- a/t/app/model/alert_type.t +++ b/t/app/model/alert_type.t @@ -287,7 +287,7 @@ foreach my $test ( desc => 'address only', addressLine => '18 North Bridge', locality => undef, - nearest => qr/: 18 North Bridge\n/, + nearest => qr/: 18 North Bridge\r?\n/, }, { desc => 'no fields', diff --git a/t/app/model/photoset.t b/t/app/model/photoset.t index cfb5236a8..577e39eb1 100644 --- a/t/app/model/photoset.t +++ b/t/app/model/photoset.t @@ -58,7 +58,7 @@ subtest 'Photoset with photo inline in DB' => sub { my $report = make_report( $image_path->slurp ); my $photoset = $report->get_photoset(); is $photoset->num_images, 1, 'Found just 1 image'; - is $photoset->data, '1cdd4329ceee2234bd4e89cb33b42061a0724687'; + is $photoset->data, '1cdd4329ceee2234bd4e89cb33b42061a0724687.jpeg'; }; $image_path->copy( path( $UPLOAD_DIR, '0123456789012345678901234567890123456789.jpeg' ) ); diff --git a/t/app/model/user.t b/t/app/model/user.t index 24e5d2d98..bf73a9d09 100644 --- a/t/app/model/user.t +++ b/t/app/model/user.t @@ -46,7 +46,7 @@ END { sub create_update { my ($problem, %params) = @_; - my $dt = DateTime->now()->add(hours => 1); + my $dt = DateTime->now()->add(days => 1); return FixMyStreet::App->model('DB::Comment')->find_or_create({ problem_id => $problem->id, user_id => $problem->user_id, diff --git a/t/app/sendreport/angus.t b/t/app/sendreport/angus.t new file mode 100644 index 000000000..a19ee483a --- /dev/null +++ b/t/app/sendreport/angus.t @@ -0,0 +1,61 @@ +use strict; +use warnings; + +use FixMyStreet::DB; + +use Test::More; + +use_ok("FixMyStreet::SendReport::Angus"); + +my $u = FixMyStreet::DB->resultset('User')->new( { email => 'test@example.org', name => 'A User' } ); + +my $p = FixMyStreet::DB->resultset('Problem')->new( { + latitude => 1, + longitude => 1, + title => 'title', + detail => 'detail', + user => $u, + id => 1, + name => 'A User', + cobrand => 'fixmystreet', +} ); + +my $angus = FixMyStreet::SendReport::Angus->new(); + +subtest 'parses authentication token correctly' => sub { + my $authxml = <<EOT; + <AuthenticateResponse> + + <AuthenticateResult> + TVRreUxqRTJPQzR5TlRVdU1qSjhNakF4Tmpvd01Ub3lNam94TlRvME16b3pPUT09VGhvdVNoYWx0Tm90UGFzcw== + </AuthenticateResult> + <success> + True + </success> + <message></message> + + </AuthenticateResponse> +EOT +; + is $angus->get_auth_token($authxml), 'TVRreUxqRTJPQzR5TlRVdU1qSjhNakF4Tmpvd01Ub3lNam94TlRvME16b3pPUT09VGhvdVNoYWx0Tm90UGFzcw==', 'token correct'; +}; + +subtest 'parses report external id correctly' => sub { + my $respxml = <<EOT; +<CreateRequestResponse> + + <CreateRequestResult> + <RequestId>7245</RequestId> + </CreateRequestResult> + + <success>True</success> + <message></message> + +</CreateRequestResponse> +EOT +; + is $angus->get_external_id($respxml), '7245', 'external id correct'; +}; + + +done_testing(); diff --git a/t/app/uri_for.t b/t/app/uri_for.t index 810aade62..9cbcd3767 100644 --- a/t/app/uri_for.t +++ b/t/app/uri_for.t @@ -17,7 +17,6 @@ use_ok('FixMyStreet::App'); my $fms_c = ctx_request('http://www.fixmystreet.com/'); my $fgm_c = ctx_request('http://www.fiksgatami.no/'); -my $reh_en_c = ctx_request('http://reportemptyhomes.com/'); is( $fms_c->uri_for('/bar/baz') . "", @@ -44,29 +43,4 @@ is( 'FiksGataMi url with lat not zoom' ); -FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'emptyhomes' ], -}, sub { - like( - $reh_en_c->uri_for_email( '/foo' ), - qr{^http://en.}, - 'adds en to retain language' - ); -}; - -# instantiate this here otherwise sets locale to cy and breaks test -# above -my $reh_cy_c; -FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'emptyhomes' ], -}, sub { - $reh_cy_c = ctx_request('http://cy.reportemptyhomes.com/'); - - like( - $reh_cy_c->uri_for_email( '/foo' ), - qr{^http://cy.}, - 'retains language' - ); -}; - done_testing(); diff --git a/t/cobrand/fixamingata.t b/t/cobrand/fixamingata.t index 50b7713d1..0cf7a31fe 100644 --- a/t/cobrand/fixamingata.t +++ b/t/cobrand/fixamingata.t @@ -46,10 +46,10 @@ FixMyStreet::override_config { FixMyStreet::DB->resultset('Problem')->send_reports(); }; my $email = $mech->get_email; -like $email->header('Content-Type'), qr/iso-8859-1/, 'encoding looks okay'; +like $email->header('Content-Type'), qr/utf-8/, 'encoding looks okay'; like $email->header('Subject'), qr/Ny rapport: Test Test/, 'subject looks okay'; like $email->header('To'), qr/other\@example.org/, 'to line looks correct'; -like $email->body, qr/V=E4nligen,/, 'signature looks correct'; +like $email->body_str, qr/V\xe4nligen,/, 'signature looks correct'; $mech->clear_emails_ok; my $user = @@ -91,8 +91,8 @@ FixMyStreet::override_config { $mech->email_count_is(1); $email = $mech->get_email; -like $email->header('Content-Type'), qr/iso-8859-1/, 'encoding looks okay'; -like $email->body, qr/V=E4nligen,/, 'signature looks correct'; +like $email->header('Content-Type'), qr/utf-8/, 'encoding looks okay'; +like $email->body_str, qr/V\xe4nligen,/, 'signature looks correct'; $mech->clear_emails_ok; subtest "Test ajax decimal points" => sub { diff --git a/t/cobrand/fixmybarangay.t b/t/cobrand/fixmybarangay.t deleted file mode 100644 index 2f99b8c1e..000000000 --- a/t/cobrand/fixmybarangay.t +++ /dev/null @@ -1,150 +0,0 @@ -use strict; -use warnings; -use Test::More; - -BEGIN { - use FixMyStreet; - FixMyStreet->test_mode(1); -} - -use FixMyStreet::TestMech; -my $mech = FixMyStreet::TestMech->new; - -# Front page test - -ok $mech->host("www.fixmybarangay.com"), "change host to FixMyBarangay"; -FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'fixmybarangay' ], -}, sub { - $mech->get_ok('/'); -}; -$mech->content_like( qr/FixMyBarangay/ ); - -# Set up bodies - -my $luz = $mech->create_body_ok( 1, 'Bgy Luz', id => 1 ); -$luz->update( { send_method => 'Email' } ); - -my $bsn = $mech->create_body_ok( 2, 'Bgy BSN', id => 2 ); -$bsn->update( { send_method => 'Email' } ); - -my $dps = $mech->create_body_ok( 3, 'DPS', id => 3 ); -$dps->update( { send_method => 'Open311', endpoint => 'http://dps.endpoint.example.com', jurisdiction => 'FMB', api_key => 'test' } ); -FixMyStreet::DB->resultset('BodyArea')->find_or_create({ area_id => 1, body_id => $dps->id }); -FixMyStreet::DB->resultset('BodyArea')->find_or_create({ area_id => 2, body_id => $dps->id }); - -# Create contacts for these bodies -# 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. - -$mech->create_contact_ok( - body_id => $luz->id, - category => 'Streetlight (BGY)', - email => 'bgy@example.com', -); -$mech->create_contact_ok( - body_id => $dps->id, - category => 'Streetlight (DPS)', - email => 'LIGHT', -); - -# Create a couple of reports - -my @reports = $mech->create_problems_for_body( 1, $luz->id, 'Test', { - cobrand => 'fixmybarangay', - category => 'Streetlight (BGY)', -}); -my $luz_report = $reports[0]; - -@reports = $mech->create_problems_for_body( 1, $dps->id, 'Test', { - cobrand => 'fixmybarangay', - category => 'Streetlight (DPS)', -}); -my $dps_report = $reports[0]; - -$mech->get_ok( '/report/' . $luz_report->id ); -$mech->get_ok( '/report/' . $dps_report->id ); - -# Send the reports - -$mech->email_count_is(0); - -FixMyStreet::override_config { - SEND_REPORTS_ON_STAGING => 1, -}, sub { - FixMyStreet::DB->resultset('Problem')->send_reports('fixmybarangay'); -}; - -# Check BGY one sent by email -my $email = $mech->get_email; -like $email->header('Subject'), qr/Problem Report: Test Test/, 'subject looks okay'; -like $email->header('To'), qr/bgy\@example.com/, 'to line looks correct'; -$mech->clear_emails_ok; - -$luz_report->discard_changes; -$dps_report->discard_changes; -ok $luz_report->whensent, 'Luz report marked as sent'; -ok $dps_report->whensent, 'DPS report marked as sent'; -is $dps_report->send_method_used, 'Open311', 'DPS report sent via Open311'; -is $dps_report->external_id, 248, 'DPS report has right external ID'; - -my $fmb_test_email = 'luz_test_user@example.com'; -my $user = FixMyStreet::DB->resultset('User')->find_or_create( { email => $fmb_test_email, from_body => $luz->id, password => 'fmbsecret' } ); -ok $user, "test user does exist"; - -my $alert = FixMyStreet::DB->resultset('Alert')->find_or_create({ - user => $user, - parameter => '-0.142497580865087', - parameter2 => '51.5016605453401', - alert_type => 'local_problems', - whensubscribed => '2014-01-01 10:00:00', - confirmed => 1, - cobrand => 'fixmybarangay', -}); - -FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'fixmybarangay' ], -}, sub { - FixMyStreet::DB->resultset('AlertType')->email_alerts(); -}; - -$mech->email_count_is(1); -$email = $mech->get_email; -like $email->body, qr/The following FixMyBarangay reports/, 'Start of email looks correct'; -$mech->clear_emails_ok; - -$mech->log_out_ok; -$mech->get_ok( '/report/' . $luz_report->id ); -$mech->content_lacks( "Remove from site" ); -$mech->content_contains( "Report abuse" ); - -$mech->post_ok('/report/delete/' . $luz_report->id); -is $mech->uri->path, '/report/' . $luz_report->id, "should redirect to report page, deletion ignored"; -$luz_report->discard_changes; -is $luz_report->state, 'confirmed', 'should be confirmed'; - -$user = $mech->log_in_ok($fmb_test_email); - -FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'fixmybarangay' ], -}, sub { - $mech->get_ok( '/report/' . $luz_report->id ); -}; -$mech->content_contains( "Remove from site" ); -$mech->content_lacks( "Report abuse" ); - -$mech->form_id('remove-from-site-form'); -$mech->submit_form(); -is $mech->uri->path, '/report/' . $luz_report->id, "should redirect to report page, deletion successful"; -$luz_report->discard_changes; -is $luz_report->state, 'hidden', 'should be hidden'; - -$mech->delete_user($fmb_test_email); - -$mech->delete_body($luz); -$mech->delete_body($bsn); -$mech->delete_body($dps); - -ok $mech->host("www.fixmystreet.com"), "change host back"; - -done_testing(); diff --git a/t/cobrand/form_extras.t b/t/cobrand/form_extras.t index 9c20b7ad4..c6f6976d5 100644 --- a/t/cobrand/form_extras.t +++ b/t/cobrand/form_extras.t @@ -13,7 +13,6 @@ sub path_to_web_templates { my $self = shift; return [ FixMyStreet->path_to( 't/cobrand/form_extras/templates' )->stringify, - FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify ]; } diff --git a/t/cobrand/loading.t b/t/cobrand/loading.t index 48a10293e..b4738fb63 100644 --- a/t/cobrand/loading.t +++ b/t/cobrand/loading.t @@ -44,8 +44,8 @@ FixMyStreet::override_config { }, sub { run_host_tests( 'www.fixmystreet.com' => 'FixMyStreet', - 'reportemptyhomes.com' => 'FixMyStreet', - 'barnet.fixmystreet.com' => 'FixMyStreet', + 'fiksgatami.example.org' => 'FixMyStreet', + 'oxfordshire.fixmystreet.com' => 'FixMyStreet', 'some.odd.site.com' => 'FixMyStreet', ); }; @@ -62,49 +62,49 @@ FixMyStreet::override_config { # Couple of cobrands, hostname checking and default fallback FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'emptyhomes', 'fixmystreet' ], + ALLOWED_COBRANDS => [ 'fiksgatami', 'fixmystreet' ], }, sub { run_host_tests( 'www.fixmystreet.com' => 'FixMyStreet', - 'reportemptyhomes.com' => 'EmptyHomes', - 'barnet.fixmystreet.com' => 'FixMyStreet', # not in the allowed_cobrands list + 'fiksgatami.example.org' => 'FiksGataMi', + 'oxfordshire.fixmystreet.com' => 'FixMyStreet', # not in the allowed_cobrands list 'some.odd.site.com' => 'Default', ); }; -# now enable barnet too and check that it works +# now enable oxfordshire too and check that it works FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'emptyhomes', 'barnet', 'fixmystreet' ], + ALLOWED_COBRANDS => [ 'fiksgatami', 'oxfordshire', 'fixmystreet' ], }, sub { run_host_tests( 'www.fixmystreet.com' => 'FixMyStreet', - 'reportemptyhomes.com' => 'EmptyHomes', - 'barnet.fixmystreet.com' => 'Barnet', # found now it is in allowed_cobrands + 'fiksgatami.example.org' => 'FiksGataMi', + 'oxfordshire.fixmystreet.com' => 'Oxfordshire', # found now it is in allowed_cobrands 'some.odd.site.com' => 'Default', ); }; # And a check with some regex matching FixMyStreet::override_config { - ALLOWED_COBRANDS => [ { 'fixmystreet' => 'empty' }, 'barnet', { 'testing' => 'fixmystreet' } ], + ALLOWED_COBRANDS => [ { 'fixmystreet' => 'example' }, 'oxfordshire', { 'testing' => 'fixmystreet' } ], }, sub { run_host_tests( 'www.fixmystreet.com' => 'testing', - 'reportemptyhomes.com' => 'FixMyStreet', - 'barnet.fixmystreet.com' => 'Barnet', + 'fiksgatami.example.org' => 'FixMyStreet', + 'oxfordshire.fixmystreet.com' => 'Oxfordshire', 'some.odd.site.com' => 'Default', ); }; # check that the moniker works as expected both on class and object. -is FixMyStreet::Cobrand::EmptyHomes->moniker, 'emptyhomes', +is FixMyStreet::Cobrand::FiksGataMi->moniker, 'fiksgatami', 'class->moniker works'; -is FixMyStreet::Cobrand::EmptyHomes->new->moniker, 'emptyhomes', +is FixMyStreet::Cobrand::FiksGataMi->new->moniker, 'fiksgatami', 'object->moniker works'; # check is_default works ok FixMyStreet::Cobrand::Default->is_default, '::Default is default'; -ok !FixMyStreet::Cobrand::EmptyHomes->is_default, '::Emptyhomes is not default'; +ok !FixMyStreet::Cobrand::FiksGataMi->is_default, '::FiksGataMi is not default'; # all done done_testing(); diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t index 4734dc837..cf66136e5 100644 --- a/t/cobrand/zurich.t +++ b/t/cobrand/zurich.t @@ -661,7 +661,7 @@ subtest "external report triggers email" => sub { }; $email = $mech->get_email; my $report_id = $report->id; - like $email->header('Subject'), qr/Meldung #$report_id/, 'subject looks okay'; + like Encode::decode('MIME-Header', $email->header('Subject')), qr/Meldung #$report_id/, 'subject looks okay'; like $email->header('To'), qr/test\@example.com/, 'to line looks correct'; like $email->body, qr/$PUBLIC_RESPONSE/, 'public_response was passed on' or die $email->body; $mech->clear_emails_ok; @@ -894,6 +894,11 @@ subtest 'email images to external partners' => sub { my $expected_email_content = path(__FILE__)->parent->child('zurich_attachments.txt')->slurp; my $REPORT_ID = $report->id; + $expected_email_content =~ s{Subject: (.*?)\r?\n}{ + my $subj = Encode::decode('MIME-Header', $1); + $subj =~ s{REPORT_ID}{$REPORT_ID}g; + 'Subject: ' . Email::MIME::Encode::mime_encode($subj, "utf-8") . "\n"; + }eg; $expected_email_content =~ s{REPORT_ID}{$REPORT_ID}g; $expected_email_content =~ s{BOUNDARY}{$boundary}g; my $expected_email = Email::MIME->new($expected_email_content); diff --git a/t/cobrand/zurich_attachments.txt b/t/cobrand/zurich_attachments.txt index 4ccc90205..bdc4333bf 100644 --- a/t/cobrand/zurich_attachments.txt +++ b/t/cobrand/zurich_attachments.txt @@ -1,40 +1,33 @@ -MIME-Version: 1.0 -Subject: =?iso-8859-1?Q?Z=FCri?= wie neu: Weitergeleitete Meldung #REPORT_ID -Content-Type: multipart/mixed; boundary="BOUNDARY" -To: "External Body" <external_body@example.org> -Content-Transfer-Encoding: 7bit -From: FixMyStreet <division@example.org> - - ---BOUNDARY -MIME-Version: 1.0 -Subject: =?iso-8859-1?Q?Z=FCri?= wie neu: Weitergeleitete Meldung #REPORT_ID -Content-Type: text/plain; charset="iso-8859-1" -To: "External Body" <external_body@example.org> -Content-Transfer-Encoding: quoted-printable -From: FixMyStreet <division@example.org> - -Gr=FCezi External Body, - -=D6ffentliche URL: http://www.example.org/report/REPORT_ID - -Bei Fragen zu "Z=FCri wie neu" wenden Sie sich bitte an -gis-zentrum@zuerich.ch.= - - - ---BOUNDARY -MIME-Version: 1.0 -Content-Type: image/jpeg; name="REPORT_ID.0.jpeg" -Content-Disposition: inline; filename="REPORT_ID.0.jpeg" -Content-Transfer-Encoding: base64 - -/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEP -ERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4e -Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCABTAAEDAREA -AhEBAxEB/8QAFwAAAwEAAAAAAAAAAAAAAAAAAAIIB//EAB8QAQAABAcAAAAAAAAAAAAAAAADBAbT -BxcYVVaUpf/EABcBAQEBAQAAAAAAAAAAAAAAAAAFBgT/xAAgEQEAAAQHAQAAAAAAAAAAAAAAAwQV -UgECFlNhodGx/9oADAMBAAIRAxEAPwCywAIozyxS5R58tbbujSW33j6zFRj3fGbKbjAGAgAACs9N -FCbtUfYg2mO1BM25e/V+lQeW3ISo/9k= - ---BOUNDARY-- +MIME-Version: 1.0
+Subject: =?iso-8859-1?Q?Z=FCri?= wie neu: Weitergeleitete Meldung #REPORT_ID
+Content-Type: multipart/mixed; boundary="BOUNDARY"
+To: "External Body" <external_body@example.org>
+Content-Transfer-Encoding: 7bit
+From: "FixMyStreet" <division@example.org>
+
+
+--BOUNDARY
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+Gr=C3=BCezi External Body,
+
+=C3=96ffentliche URL: http://www.example.org/report/REPORT_ID
+
+Bei Fragen zu "Z=C3=BCri wie neu" wenden Sie sich bitte an
+gis-zentrum@zuerich.ch.=
+
+--BOUNDARY
+Content-Type: image/jpeg; name="REPORT_ID.0.jpeg"
+Content-Disposition: inline; filename="REPORT_ID.0.jpeg"
+Content-Transfer-Encoding: base64
+
+/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEP
+ERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCABTAAEDAREA
+AhEBAxEB/8QAFwAAAwEAAAAAAAAAAAAAAAAAAAIIB//EAB8QAQAABAcAAAAAAAAAAAAAAAADBAbT
+BxcYVVaUpf/EABcBAQEBAQAAAAAAAAAAAAAAAAAFBgT/xAAgEQEAAAQHAQAAAAAAAAAAAAAAAwQV
+UgECFlNhodGx/9oADAMBAAIRAxEAPwCywAIozyxS5R58tbbujSW33j6zFRj3fGbKbjAGAgAACs9N
+FCbtUfYg2mO1BM25e/V+lQeW3ISo/9k=
+
+--BOUNDARY--
@@ -14,11 +14,11 @@ use mySociety::Locale; die "You need to run 'commonlib/bin/gettext-makemo --quiet FixMyStreet' " . "to generate the *.mo files needed." unless -e FixMyStreet->path_to( - 'locale/cy_GB.UTF-8/LC_MESSAGES/FixMyStreet-EmptyHomes.mo'); + 'locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.mo'); # Test the language negotiation works my $lang = mySociety::Locale::negotiate_language( - 'en-gb,English,en_GB|cy,Cymraeg,cy_GB|es,Spanish,es_ES', + 'en-gb,English,en_GB|es,Spanish,es_ES', undef, HTTP::Headers->new( Accept_Language => 'es,en-gb;q=0.6,en;q=0.4' @@ -28,27 +28,26 @@ is $lang, 'es', 'Language negotiation works okay'; # Example strings my $english = "Please enter a valid email"; -my $welsh = "Cofnodwch gyfeiriad e-bost dilys"; +my $norwegian = "Legg til en gyldig e-post"; # set english as the language mySociety::Locale::negotiate_language( # - 'en-gb,English,en_GB|cy,Cymraeg,cy_GB', 'en_GB' + 'en-gb,English,en_GB|nb,Norwegian,nb_NO', 'en_GB' ); -mySociety::Locale::gettext_domain( 'FixMyStreet-EmptyHomes', 1 ); +mySociety::Locale::gettext_domain( 'FixMyStreet', 1 ); mySociety::Locale::change(); is _($english), $english, "english to english"; -# set to welsh and check for translation -mySociety::Locale::change('cy'); -is _($english), $welsh, "english to welsh"; +mySociety::Locale::change('nb'); +is _($english), $norwegian, "english to norwegian"; # check that being in a deep directory does not confuse the code chdir FixMyStreet->path_to('t/app/controller') . ''; -mySociety::Locale::gettext_domain( 'FixMyStreet-EmptyHomes', 1, +mySociety::Locale::gettext_domain( 'FixMyStreet', 1, FixMyStreet->path_to('locale')->stringify ); -mySociety::Locale::change('cy'); -is _($english), $welsh, "english to welsh (deep directory)"; +mySociety::Locale::change('nb'); +is _($english), $norwegian, "english to norwegian (deep directory)"; # test that sorting works as expected in the right circumstances... my @random_sorted = qw( Ã… Z Ø A ); @@ -56,10 +55,10 @@ my @EN_sorted = qw( A Ã… Ø Z ); my @NO_sorted = qw( A Z Ø Ã… ); my @default_sorted = qw( A Z Ã… Ø ); -{ +SKIP: { mySociety::Locale::negotiate_language( # - 'en-gb,English,en_GB|cy,Cymraeg,cy_GB', 'en_GB' + 'en-gb,English,en_GB', 'en_GB' ); mySociety::Locale::change(); @@ -71,14 +70,18 @@ my @default_sorted = qw( A Z Ã… Ø ); is_deeply( [ keysort { $_ } @random_sorted ], \@default_sorted, "keysort correctly with no locale" ); + skip 'Will not pass on Mac', 1 if $^O eq 'darwin'; + # Note - this obeys the locale is_deeply( [ sort { strcoll( $a, $b ) } @random_sorted ], \@EN_sorted, "sort strcoll correctly with no locale (to 'en_GB')" ); } -{ +SKIP: { + skip 'Will not pass on Mac', 2 if $^O eq 'darwin'; + mySociety::Locale::negotiate_language( # - 'en-gb,English,en_GB|cy,Cymraeg,cy_GB', 'en_GB' + 'en-gb,English,en_GB', 'en_GB' ); mySociety::Locale::change(); use locale; @@ -93,7 +96,9 @@ my @default_sorted = qw( A Z Ã… Ø ); \@EN_sorted, "sort strcoll correctly with use locale 'en_GB'" ); } -{ +SKIP: { + skip 'Will not pass on Mac', 2 if $^O eq 'darwin'; + mySociety::Locale::negotiate_language( # 'nb-no,Norwegian,nb_NO', 'nb_NO' ); diff --git a/t/open311.t b/t/open311.t index 6333355e8..42d09b29c 100644 --- a/t/open311.t +++ b/t/open311.t @@ -3,6 +3,8 @@ use utf8; use strict; use warnings; +use File::Temp 'tempdir'; +use Path::Tiny; use Test::More; use Test::Warn; use FixMyStreet::DB; @@ -24,7 +26,7 @@ EOT is $o->_process_error( $err_text ), "400: Service Code cannot be null -- can't proceed with the request.\n", 'error text parsing'; is $o->_process_error( '503 - service unavailable' ), 'unknown error', 'error text parsing of bad error'; -my $o2 = Open311->new( endpoint => 'http://192.168.50.1/open311/', jurisdiction => 'example.org' ); +my $o2 = Open311->new( endpoint => 'http://127.0.0.1/open311/', jurisdiction => 'example.org' ); my $u = FixMyStreet::DB->resultset('User')->new( { email => 'test@example.org', name => 'A User' } ); @@ -258,16 +260,26 @@ subtest 'extended request update post parameters' => sub { }; subtest 'check media url set' => sub { - $comment->photo(1); + my $UPLOAD_DIR = tempdir( CLEANUP => 1 ); + + my $image_path = path('t/app/controller/sample.jpg'); + $image_path->copy( path( $UPLOAD_DIR, '0123456789012345678901234567890123456789.jpeg' ) ); + + $comment->photo("0123456789012345678901234567890123456789"); $comment->cobrand('fixmystreet'); - my $results = make_update_req( $comment, '<?xml version="1.0" encoding="utf-8"?><service_request_updates><request_update><update_id>248</update_id></request_update></service_request_updates>' ); + FixMyStreet::override_config { + UPLOAD_DIR => $UPLOAD_DIR, + }, sub { + my $results = make_update_req( $comment, '<?xml version="1.0" encoding="utf-8"?><service_request_updates><request_update><update_id>248</update_id></request_update></service_request_updates>' ); - is $results->{ res }, 248, 'got update id'; + is $results->{ res }, 248, 'got update id'; - my $c = CGI::Simple->new( $results->{ req }->content ); - my $expected_path = '/c/' . $comment->id . '.full.jpeg'; - like $c->param('media_url'), qr/$expected_path/, 'image url included'; + my $c = CGI::Simple->new( $results->{ req }->content ); + my $expected_path = '/c/' . $comment->id . '.0.full.jpeg'; + like $c->param('media_url'), qr/$expected_path/, 'image url included'; + }; + $comment->photo(undef); }; foreach my $test ( diff --git a/t/open311/getservicerequestupdates.t b/t/open311/getservicerequestupdates.t index 18a5802bb..134d5422e 100644 --- a/t/open311/getservicerequestupdates.t +++ b/t/open311/getservicerequestupdates.t @@ -38,7 +38,7 @@ UPDATED_DATETIME }; -my $dt = DateTime->now; +my $dt = DateTime->now(formatter => DateTime::Format::W3CDTF->new); # basic xml -> perl object tests for my $test ( @@ -388,7 +388,7 @@ subtest 'Update with media_url includes image in update' => sub { is $problem->comments->count, 1, 'comment count'; my $c = $problem->comments->first; is $c->external_id, 638344; - is $c->photo, '1cdd4329ceee2234bd4e89cb33b42061a0724687', 'photo exists'; + is $c->photo, '1cdd4329ceee2234bd4e89cb33b42061a0724687.jpeg', 'photo exists'; }; foreach my $test ( @@ -571,7 +571,8 @@ subtest 'check that existing comments are not duplicated' => sub { is $problem->comments->count, 1, 'one comment before fetching updates'; $requests_xml =~ s/UPDATED_DATETIME2/$dt/; - $requests_xml =~ s/UPDATED_DATETIME/@{[ $comment->confirmed ]}/; + my $confirmed = DateTime::Format::W3CDTF->format_datetime($comment->confirmed); + $requests_xml =~ s/UPDATED_DATETIME/$confirmed/; my $o = Open311->new( jurisdiction => 'mysociety', endpoint => 'http://example.com', test_mode => 1, test_get_returns => { 'servicerequestupdates.xml' => $requests_xml } ); @@ -596,12 +597,12 @@ subtest 'check that existing comments are not duplicated' => sub { foreach my $test ( { desc => 'check that closed and then open comment results in correct state', - dt1 => $dt->subtract( hours => 1 ), + dt1 => $dt->clone->subtract( hours => 1 ), dt2 => $dt, }, { desc => 'check that old comments do not change problem status', - dt1 => $dt->subtract( hours => 2 ), + dt1 => $dt->clone->subtract( minutes => 90 ), dt2 => $dt, } ) { @@ -627,7 +628,7 @@ foreach my $test ( { $problem->comments->delete; $problem->state( 'confirmed' ); - $problem->lastupdate( $dt->subtract( hours => 3 ) ); + $problem->lastupdate( $dt->clone->subtract( hours => 3 ) ); $problem->update; $requests_xml =~ s/UPDATED_DATETIME/$test->{dt1}/; @@ -683,7 +684,7 @@ foreach my $test ( { $problem->comments->delete; $problem->state( 'confirmed' ); - $problem->lastupdate( $dt->subtract( hours => 3 ) ); + $problem->lastupdate( $dt->clone->subtract( hours => 3 ) ); $problem->update; my @alerts = map { diff --git a/templates/email/barnet/site-name.txt b/templates/email/barnet/site-name.txt deleted file mode 100644 index 78563bdf3..000000000 --- a/templates/email/barnet/site-name.txt +++ /dev/null @@ -1 +0,0 @@ -Barnet Council FixMyStreet diff --git a/templates/email/emptyhomes/cy/alert-confirm.txt b/templates/email/emptyhomes/cy/alert-confirm.txt deleted file mode 100644 index 9be79a952..000000000 --- a/templates/email/emptyhomes/cy/alert-confirm.txt +++ /dev/null @@ -1,15 +0,0 @@ -Subject: Cadarnhau eich rhybudd ar reportemptyhomes.com - -Helo, - -Cliciwch ar y ddolen isod i gadarnhau'r rhybudd yr ydych newydd -ofyn am danysgrifio iddo ar Asiantaeth Tai Gwag: - - [% token_url %] - -Os na allwch glicio ar y ddolen, dylech ei chopïo a'i gludo ym -mar cyfeiriad eich porwr gwe. - -Yn gywir, -Tîm yr Asiantaeth Tai Gwag - diff --git a/templates/email/emptyhomes/cy/alert-problem-area.txt b/templates/email/emptyhomes/cy/alert-problem-area.txt deleted file mode 100644 index c7712f62f..000000000 --- a/templates/email/emptyhomes/cy/alert-problem-area.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: Adroddiadau newydd am eiddo gwag yn ardal <?=$values['area_name']?> ar reportemptyhomes.com - -Mae'r eiddo gwag canlynol wedi cael eu hychwanegu yn ardal -<?=$values['area_name']?>: - -<?=$values['data']?> - -Yn gywir, -reportemptyhomes.com - -I roi'r gorau i dderbyn negeseuon e-bost pan fydd eiddo newydd yn ymddangos yn ardal -<?=$values['area_name']?>, dilynwch y ddolen hon: -<?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/cy/alert-problem-council.txt b/templates/email/emptyhomes/cy/alert-problem-council.txt deleted file mode 100644 index 678e3fa9f..000000000 --- a/templates/email/emptyhomes/cy/alert-problem-council.txt +++ /dev/null @@ -1,12 +0,0 @@ -Subject: Adroddiadau newydd am eiddo gwag a hysbyswyd i ardal <?=$values['area_name']?> ar reportemptyhomes.com - -Mae'r eiddo gwag canlynol wedi cael eu hysbysu i ardal <?=$values['area_name']?>: - -<?=$values['data']?> - -Yn gywir, -reportemptyhomes.com - -I roi'r gorau i dderbyn negeseuon e-bost pan gaiff eiddo gwag newydd eu hysbysu i ardal -<?=$values['area_name']?>, dilynwch y ddolen hon: -<?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/cy/alert-problem-nearby.txt b/templates/email/emptyhomes/cy/alert-problem-nearby.txt deleted file mode 100644 index b72d68979..000000000 --- a/templates/email/emptyhomes/cy/alert-problem-nearby.txt +++ /dev/null @@ -1,11 +0,0 @@ -Subject: Eiddo gwag cyfagos newydd ar reportemptyhomes.com - -Mae'r eiddo gwag cyfagos newydd wedi cael eu hychwanegu: - -<?=$values['data']?> - -Yn gywir, -reportemptyhomes.com - -I roi'r gorau i dderbyn negeseuon e-bost pan fydd eiddo gerllaw, -dilynwch y ddolen hon: <?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/cy/alert-problem-ward.txt b/templates/email/emptyhomes/cy/alert-problem-ward.txt deleted file mode 100644 index 603c55fa0..000000000 --- a/templates/email/emptyhomes/cy/alert-problem-ward.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: Adroddiadau newydd am eiddo gwag a hysbyswyd i ardal <?=$values['area_name']?>, yn ward <?=$values['ward_name']?> ar reportemptyhomes.com - -Mae'r eiddo gwag canlynol wedi cael eu hysbysu i ardal <?=$values['area_name']?>, -o fewn ward <?=$values['ward_name']?>: - -<?=$values['data']?> - -Yn gywir, -reportemptyhomes.com - -I roi'r gorau i dderbyn negeseuon e-bost pan gaiff eiddo newydd eu hysbysu i ardal -<?=$values['area_name']?>, o fewn ward <?=$values['ward_name']?>, -dilynwch y ddolen hon: <?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/cy/alert-problem.txt b/templates/email/emptyhomes/cy/alert-problem.txt deleted file mode 100644 index a2c56cf52..000000000 --- a/templates/email/emptyhomes/cy/alert-problem.txt +++ /dev/null @@ -1,11 +0,0 @@ -Subject: Adroddiadau newydd am eiddo gwag ar reportemptyhomes.com - -Mae'r eiddo gwag canlynol wedi cael eu hychwanegu: - -<?=$values['data']?> - -Yn gywir, -reportemptyhomes.com - -I roi'r gorau i dderbyn negeseuon e-bost pan fydd eiddo newydd yn ymddangos, -dilynwch y ddolen hon: <?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/cy/alert-update.txt b/templates/email/emptyhomes/cy/alert-update.txt deleted file mode 100644 index 9a80d55c5..000000000 --- a/templates/email/emptyhomes/cy/alert-update.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: Diweddariadau newydd am eiddo gwag - '<?=$values['title']?>' - -Mae'r diweddariadau canlynol wedi cael eu gadael am yr eiddo gwag hwn: - -<?=$values['data']?> - -Gweld y diweddariadau hyn neu eu hateb: <?=$values['problem_url']?> - -Yn gywir, -reportemptyhomes.com - -I roi'r gorau i dderbyn negeseuon e-bost pan fydd diweddariadau newydd yn ymddangos am yr eiddo hwn, -dilynwch y ddolen hon: <?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/cy/partial.txt b/templates/email/emptyhomes/cy/partial.txt deleted file mode 100644 index 0692e2548..000000000 --- a/templates/email/emptyhomes/cy/partial.txt +++ /dev/null @@ -1,16 +0,0 @@ -Subject: Eich adroddiad newydd ar reportemptyhomes.com - -Helo[% report.name || report.email %], - -Rydym wedi storio'r adroddiad y gwnaethoch ei lwytho i'r Asiantaeth Tai Gwag -drwy gyfrwng -[% report.service %]. I gadarnhau'r manylion sydd gennym, -ac i ychwanegu atynt, ewch i'r URL canlynol: - -[% token_url %] - -Yna, gallwn anfon eich adroddiad at y cyngor. Diolch! - -Yn gywir, -Tîm yr Asiantaeth Tai Gwag - diff --git a/templates/email/emptyhomes/cy/problem-confirm.txt b/templates/email/emptyhomes/cy/problem-confirm.txt deleted file mode 100644 index a9f1b021d..000000000 --- a/templates/email/emptyhomes/cy/problem-confirm.txt +++ /dev/null @@ -1,21 +0,0 @@ -Subject: Cadarnhau eich adroddiad am eiddo gwag - -Helo [% report.user.name %], - -Cliciwch ar y ddolen isod i gadarnhau'r adroddiad am eiddo gwag -yr ydych newydd ei ychwanegu at y safle: - -[% token_url %] - -Os nad yw eich rhaglen e-bost yn gadael i chi glicio ar y ddolen hon, -dylech ei chopïo a'i gludo i'ch porwr gwe a phwyso'r fysell 'return'. - -Roedd gan eich adroddiad y pwnc: -[% report.title %] - -A'r manylion: -[% report.detail %] - -Yn gywir, -reportemptyhomes.com - diff --git a/templates/email/emptyhomes/cy/questionnaire-26weeks.txt b/templates/email/emptyhomes/cy/questionnaire-26weeks.txt deleted file mode 100644 index b2b40ac80..000000000 --- a/templates/email/emptyhomes/cy/questionnaire-26weeks.txt +++ /dev/null @@ -1,25 +0,0 @@ -Subject: Holiadur ar eich adroddiad am eiddo gwag - -Helo <?=$values['name']?>, - -Chwe mis yn ôl, fe wnaethoch adrodd am eiddo gwag ar ReportEmptyHomes.com gan roi'r -manylion sydd wedi'u cynnwys ar ddiwedd y neges e-bost hon. Er mwyn cadw'n safle'n gyfredol -ac yn berthnasol, byddwn yn ddiolchgar petaech yn llenwi'r holiadur byr hwn er mwyn -dweud wrthom ni beth sydd wedi digwydd: - - <?=$values['url']?> - -Peidiwch ag ateb y neges hon; mae blwch sylwadau cyhoeddus -ar yr holiadur. - -Yn gywir, -reportemptyhomes.com - -Roedd eich adroddiad fel a ganlyn: - -<?=$values['title']?> - -Math o eiddo: <?=$values['category']?> - -<?=$values['detail']?> - diff --git a/templates/email/emptyhomes/cy/questionnaire-4weeks.txt b/templates/email/emptyhomes/cy/questionnaire-4weeks.txt deleted file mode 100644 index c4c9d80aa..000000000 --- a/templates/email/emptyhomes/cy/questionnaire-4weeks.txt +++ /dev/null @@ -1,25 +0,0 @@ -Subject: Holiadur ar eich adroddiad am eiddo gwag - -Helo <?=$values['name']?>, - -Bedair wythnos yn ôl, fe wnaethoch adrodd am eiddo gwag ar ReportEmptyHomes.com gan roi'r -manylion sydd wedi'u cynnwys ar ddiwedd y neges e-bost hon. Er mwyn cadw'n safle'n gyfredol -ac yn berthnasol, byddwn yn ddiolchgar petaech yn gallu llenwi'r holiadur byr hwn -i ddweud wrthom beth sydd wedi digwydd: - - <?=$values['url']?> - -Peidiwch ag ateb y neges e-bost hon; mae blwch sylwadau cyhoeddus -ar yr holiadur. - -Yn gywir, -reportemptyhomes.com - -Roedd eich adroddiad fel a ganlyn: - -<?=$values['title']?> - -Math o eiddo: <?=$values['category']?> - -<?=$values['detail']?> - diff --git a/templates/email/emptyhomes/cy/submit.txt b/templates/email/emptyhomes/cy/submit.txt deleted file mode 100644 index 061758d12..000000000 --- a/templates/email/emptyhomes/cy/submit.txt +++ /dev/null @@ -1,39 +0,0 @@ -Subject: Adroddiad am eiddo gwag - -Annwyl Swyddog Eiddo Gwag, - -Dyma gyfeiriad newydd am eiddo gwag yn eich ardal, a wnaed gan ddefnyddiwr -gwefan ReportEmptyHomes.com; dywedwyd wrth ddefnyddiwr y wefan fod yr achos -wedi cael ei gyfeirio atoch. Byddem yn ddiolchgar petaech yn gwneud yr hyn y -gallwch i helpu adfer yr eiddo hwn i'w ddefnyddio eto. - -<?=$values['url']?> - -<?=$values['has_photo']?>Os hoffech gael help neu gyngor ar gael eiddo gwag yn -ôl mewn defnydd mae llawer o wybodaeth ddefnyddiol ar wefan yr Asiantaeth Tai -Gwag www.EmptyHomes.com - os oes gennych unrhyw gwestiynau eraill, rhowch alwad -i ni. - ----------- - -Enw: <?=$values['name']?> - -E-bost: <?=$values['email']?> - -<?=$values['phone_line']?>Pwnc: <?=$values['title']?> - -Math o eiddo: <?=$values['category']?> - -Address: <?=$values['address']?> - -Manylion: <?=$values['detail']?> - -<?=$values['closest_address']?>---------- - -Bydd ymatebion i'r neges e-bost hon yn mynd at y defnyddiwr a gyflwynodd yr -adroddiad, os hoffech ofyn am fwy o wybodaeth. - -Yn gywir, -reportemptyhomes.com - - diff --git a/templates/email/emptyhomes/cy/update-confirm.txt b/templates/email/emptyhomes/cy/update-confirm.txt deleted file mode 100644 index 655844adf..000000000 --- a/templates/email/emptyhomes/cy/update-confirm.txt +++ /dev/null @@ -1,18 +0,0 @@ -Subject: Cadarnhewch eich diweddariad ar reportemptyhomes.com - -Helo [% update.user.name %], - -Cliciwch ar y ddolen isod i gadarnhau'r diweddariad yr ydych newydd ei -ysgrifennu: - -[% token_url %] - -Os nad ydych yn gallu clicio ar y ddolen, dylech ei chopïo a'i gludo -ym mar cyfeiriad eich porwr gwe. - -Mae eich diweddariad yn darllen fel a ganlyn: - -[% update.text %] - -Yn gywir, -Tîm yr Asiantaeth Tai Gwag diff --git a/templates/email/emptyhomes/en-gb/alert-confirm.txt b/templates/email/emptyhomes/en-gb/alert-confirm.txt deleted file mode 100644 index 31952be28..000000000 --- a/templates/email/emptyhomes/en-gb/alert-confirm.txt +++ /dev/null @@ -1,14 +0,0 @@ -Subject: Confirm your alert on reportemptyhomes.com - -Hi, - -Please click on the link below to confirm the alert you just -asked to subscribe to on reportemptyhomes.com: - - [% token_url %] - -If you can't click the link, please copy and paste it to the -address bar of your web browser. - -Yours, -The reportemptyhomes.com team diff --git a/templates/email/emptyhomes/en-gb/alert-problem-area.txt b/templates/email/emptyhomes/en-gb/alert-problem-area.txt deleted file mode 100644 index 0fb11665c..000000000 --- a/templates/email/emptyhomes/en-gb/alert-problem-area.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: New empty properties in <?=$values['area_name']?> on reportemptyhomes.com - -The following empty properties have been added within -<?=$values['area_name']?>: - -<?=$values['data']?> - -Yours, -reportemptyhomes.com - -To stop receiving emails when there are new properties in -<?=$values['area_name']?>, please follow this link: -<?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/en-gb/alert-problem-council.txt b/templates/email/emptyhomes/en-gb/alert-problem-council.txt deleted file mode 100644 index 6c2d5b55c..000000000 --- a/templates/email/emptyhomes/en-gb/alert-problem-council.txt +++ /dev/null @@ -1,12 +0,0 @@ -Subject: New empty properties reported to <?=$values['area_name']?> on reportemptyhomes.com - -The following empty properties have been reported to <?=$values['area_name']?>: - -<?=$values['data']?> - -Yours, -reportemptyhomes.com - -To stop receiving emails when there are new properties reported to -<?=$values['area_name']?>, please follow this link: -<?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/en-gb/alert-problem-nearby.txt b/templates/email/emptyhomes/en-gb/alert-problem-nearby.txt deleted file mode 100644 index abe027d20..000000000 --- a/templates/email/emptyhomes/en-gb/alert-problem-nearby.txt +++ /dev/null @@ -1,11 +0,0 @@ -Subject: New nearby empty properties on reportemptyhomes.com - -The following nearby empty properties have been added: - -<?=$values['data']?> - -Yours, -reportemptyhomes.com - -To stop receiving emails when there are nearby properties, -please follow this link: <?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/en-gb/alert-problem-ward.txt b/templates/email/emptyhomes/en-gb/alert-problem-ward.txt deleted file mode 100644 index 14dabc386..000000000 --- a/templates/email/emptyhomes/en-gb/alert-problem-ward.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: New empty properties reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on reportemptyhomes.com - -The following empty properties have been reported to <?=$values['area_name']?> -within <?=$values['ward_name']?>: - -<?=$values['data']?> - -Yours, -reportemptyhomes.com - -To stop receiving emails when there are new properties reported to -<?=$values['area_name']?> within <?=$values['ward_name']?>, -please follow this link: <?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/en-gb/alert-problem.txt b/templates/email/emptyhomes/en-gb/alert-problem.txt deleted file mode 100644 index 30dc10c42..000000000 --- a/templates/email/emptyhomes/en-gb/alert-problem.txt +++ /dev/null @@ -1,11 +0,0 @@ -Subject: New empty properties on reportemptyhomes.com - -The following empty properties have been added: - -<?=$values['data']?> - -Yours, -reportemptyhomes.com - -To stop receiving emails when there are new properties, -please follow this link: <?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/en-gb/alert-update.txt b/templates/email/emptyhomes/en-gb/alert-update.txt deleted file mode 100644 index 9ae295b3e..000000000 --- a/templates/email/emptyhomes/en-gb/alert-update.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: New updates on empty property- '<?=$values['title']?>' - -The following updates have been left on this empty property: - -<?=$values['data']?> - -View or reply to these updates: <?=$values['problem_url']?> - -Yours, -reportemptyhomes.com - -To stop receiving emails when there are new updates on this property, -please follow this link: <?=$values['unsubscribe_url']?> diff --git a/templates/email/emptyhomes/en-gb/contact.txt b/templates/email/emptyhomes/en-gb/contact.txt deleted file mode 100644 index 446265517..000000000 --- a/templates/email/emptyhomes/en-gb/contact.txt +++ /dev/null @@ -1,5 +0,0 @@ -Subject: reportemptyhomes.com message: [% subject %] - -[% message %] - -[ Sent by contact.cgi on [% host %]. IP address [% ip %] ] diff --git a/templates/email/emptyhomes/en-gb/partial.txt b/templates/email/emptyhomes/en-gb/partial.txt deleted file mode 100644 index 0ec2d4b68..000000000 --- a/templates/email/emptyhomes/en-gb/partial.txt +++ /dev/null @@ -1,14 +0,0 @@ -Subject: Confirm your report on reportemptyhomes.com - -Hi [% report.name || report.email %], - -To confirm the report you have uploaded to reportemptyhomes.com via -[% report.service %], and to check or add any details, -please visit the following URL: - -[% token_url %] - -Thanks! - -Yours, -The reportemptyhomes.com team diff --git a/templates/email/emptyhomes/en-gb/problem-confirm.txt b/templates/email/emptyhomes/en-gb/problem-confirm.txt deleted file mode 100644 index f8ff3e7ca..000000000 --- a/templates/email/emptyhomes/en-gb/problem-confirm.txt +++ /dev/null @@ -1,20 +0,0 @@ -Subject: Confirm your empty property report - -Hi [% report.user.name %], - -Please click on the link below to confirm the empty property -report you just added to the site: - -[% token_url %] - -If your email program does not let you click on this link, -copy and paste it into your web browser and press return. - -Your report had the subject: -[% report.title %] - -And details: -[% report.detail %] - -Yours, -reportemptyhomes.com diff --git a/templates/email/emptyhomes/en-gb/questionnaire-26weeks.txt b/templates/email/emptyhomes/en-gb/questionnaire-26weeks.txt deleted file mode 100644 index 30fd4a874..000000000 --- a/templates/email/emptyhomes/en-gb/questionnaire-26weeks.txt +++ /dev/null @@ -1,33 +0,0 @@ -Subject: Questionnaire about your empty property report - -Hi <?=$values['name']?>, - -Getting empty homes back into use can be difficult, properties can -remain empty for many months if the owner is unwilling or the property -is in very poor repair. If nothing has happened or you are not satisfied -with the progress the council is making, now is the right time to say -so. We think it's a good idea to contact some other people who may be -able to help or put pressure on the council For advice on how to do this -and other useful information please go to http://www.emptyhomes.com - -Over six months ago, you reported an empty home on ReportEmptyHomes.com -with the details provided at the end of this email. To keep our site up -to date and relevant, I'd be grateful if you could fill in this short -questionnaire to tell us what has happened: - - <?=$values['url']?> - -Please do not reply to this email; there is a public comment -box on the questionnaire. - -Yours, -reportemptyhomes.com - -Your report was as follows: - -<?=$values['title']?> - -Property type: <?=$values['category']?> - -<?=$values['detail']?> - diff --git a/templates/email/emptyhomes/en-gb/questionnaire-4weeks.txt b/templates/email/emptyhomes/en-gb/questionnaire-4weeks.txt deleted file mode 100644 index f66e9af5e..000000000 --- a/templates/email/emptyhomes/en-gb/questionnaire-4weeks.txt +++ /dev/null @@ -1,32 +0,0 @@ -Subject: Questionnaire about your empty property report - -Hi <?=$values['name']?>, - -Getting empty homes back into use can be difficult. -If you are not satisfied with progress or information from the council, -now is the right time to say. You may also want to try contacting some -other people who may be able to help. For advice on how to do this and -other useful information please go to -http://www.emptyhomes.com - -Over four weeks ago, you reported an empty home on ReportEmptyHomes.com -with the details provided at the end of this email. To keep our site up -to date and relevant, I'd be grateful if you could fill in this short -questionnaire to tell us what has happened: - - <?=$values['url']?> - -Please do not reply to this email; there is a public comment -box on the questionnaire. - -Yours, -reportemptyhomes.com - -Your report was as follows: - -<?=$values['title']?> - -Property type: <?=$values['category']?> - -<?=$values['detail']?> - diff --git a/templates/email/emptyhomes/en-gb/submit.txt b/templates/email/emptyhomes/en-gb/submit.txt deleted file mode 100644 index 2256732d5..000000000 --- a/templates/email/emptyhomes/en-gb/submit.txt +++ /dev/null @@ -1,37 +0,0 @@ -Subject: Empty property report - -Dear Empty Property Officer, - -This is a new referral of an empty property in your area made by a user of the -website ReportEmptyHomes.com; the website user has been told that the case has -been referred to you. We would be grateful if you could do whatever you can to -help get this property back into use. - -<?=$values['url']?> - -<?=$values['has_photo']?>If you would like help or advice on getting empty properties back into use -there is lots of useful information on the Empty Homes Agency's website -www.EmptyHomes.com - if you have further questions please give us a call. - ----------- - -Name: <?=$values['name']?> - -Email: <?=$values['email']?> - -<?=$values['phone_line']?>Subject: <?=$values['title']?> - -Property type: <?=$values['category']?> - -Address: <?=$values['address']?> - -Details: <?=$values['detail']?> - -<?=$values['closest_address']?>---------- - -Replies to this email will go to the user who submitted the report, if -you would like to ask for any further information. - -Yours, -reportemptyhomes.com - diff --git a/templates/email/emptyhomes/en-gb/update-confirm.txt b/templates/email/emptyhomes/en-gb/update-confirm.txt deleted file mode 100644 index 8facbcf07..000000000 --- a/templates/email/emptyhomes/en-gb/update-confirm.txt +++ /dev/null @@ -1,17 +0,0 @@ -Subject: Confirm your update on reportemptyhomes.com - -Hi [% update.user.name %], - -Please click on the link below to confirm the update you just wrote: - -[% token_url %] - -If your email program does not let you click on this link, -copy and paste it into your web browser and press return. - -Your update reads: - -[% update.text %] - -Yours, -The reportemptyhomes.com team diff --git a/templates/email/fixmybarangay/login.txt b/templates/email/fixmybarangay/login.txt deleted file mode 100644 index 3ca8d1323..000000000 --- a/templates/email/fixmybarangay/login.txt +++ /dev/null @@ -1,14 +0,0 @@ -Subject: [% loc('Your FixMyBarangay.com account details') %] - -Please click on the link below to confirm your email address. Then you will be -able to view your problem reports and manage them more easily. - -[% c.uri_for_action( 'auth/token', token ) %] - -Note that your can't create new reports on FixMyBarangay unless your account has -been authorised as a staff account, which we can do after it has been created. -Get in touch with the team if you think this applies to you, and we haven't yet -authorised your account. - -[% INCLUDE 'signature.txt' %] - diff --git a/templates/email/fixmybarangay/signature.txt b/templates/email/fixmybarangay/signature.txt deleted file mode 100644 index eb5000f58..000000000 --- a/templates/email/fixmybarangay/signature.txt +++ /dev/null @@ -1,2 +0,0 @@ -Yours, -The FixMyBarangay team diff --git a/templates/email/fixmybarangay/site-name.txt b/templates/email/fixmybarangay/site-name.txt deleted file mode 100644 index 075d881b5..000000000 --- a/templates/email/fixmybarangay/site-name.txt +++ /dev/null @@ -1 +0,0 @@ -FixMyBarangay diff --git a/templates/email/zerotb/alert-update.txt b/templates/email/zerotb/alert-update.txt deleted file mode 100644 index ee32524f9..000000000 --- a/templates/email/zerotb/alert-update.txt +++ /dev/null @@ -1,9 +0,0 @@ -Subject: New stockout report for Clinic - '<?=$values['title']?>' - -The following stockouts have been reported for this clinic: - -<?=$values['data']?> - -You cannot contact anyone by replying to this email. - -<?=$values['signature']?> diff --git a/templates/web/angus/angus_search.html b/templates/web/angus/angus_search.html new file mode 100644 index 000000000..f519b8f4f --- /dev/null +++ b/templates/web/angus/angus_search.html @@ -0,0 +1,6 @@ +<form action="//www.angus.gov.uk/site/scripts/google_results.aspx" method="get" id="search" class="form form__search"> + <div> + <input size="18" maxlength="40" class="field" name="q" id="SearchSite" placeholder="Explore Angus Council" type="text"> + <input value="Search" class="button button__primary" type="submit"> + </div> +</form> diff --git a/templates/web/angus/around/intro.html b/templates/web/angus/around/intro.html new file mode 100644 index 000000000..45e94194a --- /dev/null +++ b/templates/web/angus/around/intro.html @@ -0,0 +1 @@ +<h1>Report, view, or discuss local issues</h1> diff --git a/templates/web/angus/footer.html b/templates/web/angus/footer.html new file mode 100644 index 000000000..a09c7ce2f --- /dev/null +++ b/templates/web/angus/footer.html @@ -0,0 +1,27 @@ + </div><!-- .content role=main --> + </div><!-- .container --> + </div><!-- .table-cell --> + + <div class="nav-wrapper"> + <div class="nav-wrapper-2"> + <div id="main-nav" role="navigation"> + [% INCLUDE 'main_menu.html' extra_class = 'nav-menu--main' %] + </div> + </div> + </div> + +<!-- [% INCLUDE 'debug_footer.html' %] --> + </div> <!-- .wrapper --> + + [% IF pagefooter %] + <div class="angus_footer"> + <footer role="contentinfo"> + [% INCLUDE 'front/footer-marketing.html' %] + </footer> + </div> + [% END %] + + [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] + +</body> +</html> diff --git a/templates/web/angus/front/footer-marketing.html b/templates/web/angus/front/footer-marketing.html new file mode 100644 index 000000000..59413121d --- /dev/null +++ b/templates/web/angus/front/footer-marketing.html @@ -0,0 +1,24 @@ +<div class="tablewrapper bordered"> + <p class="social"><a href="https://twitter.com/anguscouncil" class="icon-twitter" title="Follow Angus Council on Twitter">Twitter</a> <a href="https://www.facebook.com/AngusCouncil" class="icon-facebook" title="Join Angus Council on Facebook">Facebook</a> <a href="https://www.youtube.com/channel/UCtdcoPEFDA_CikJMiJjiDtA" class="icon-youtube" title="Watch Angus Council videos on YouTube">YouTube</a></p> + <ul> + <li> + <a href="http://www.angus.gov.uk/info/19999/council_and_democracy/172/contact_us "><strong>Contact the Council</strong></a> + </li> + <li> + <a href="http://www.angus.gov.uk/socialmedia">Social media</a> + </li> + <li> + <a href="http://www.angus.gov.uk/whats_new">Recently published</a> + </li> + <li> + <a href="http://www.angus.gov.uk/site_map">Site map</a> + </li> + <li> + <a href="http://www.angus.gov.uk/terms">Terms and disclaimer</a> + </li> + <li> + <a href="http://www.angus.gov.uk/cookies">Cookies</a> + </li> + </ul> + <p><span class="copyright">All content © Angus Council.</span></p> +</div>
\ No newline at end of file diff --git a/templates/web/fixmystreet/header.html b/templates/web/angus/header.html index bc9e16af8..a7199949d 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/angus/header.html @@ -17,25 +17,16 @@ <meta name="mobileoptimized" content="0"> [% INCLUDE 'header_opengraph.html' %] - [% SET start = c.config.ADMIN_BASE_URL IF admin; - - # 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)"> + <link rel="stylesheet" href="[% version('/cobrands/angus/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/angus/layout.css') %]" media="(min-width:48em)"> [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/angus/layout.css') %]"> <![endif]--> - <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> - <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% version('/cobrands/angus/position_map.js') %]" charset="utf-8"></script> + [% INCLUDE 'common_header_tags.html' %] [% extra_js %] [% IF c.req.uri.host == 'osm.fixmystreet.com' %] @@ -54,6 +45,8 @@ <div class="container"> [% INCLUDE 'header_logo.html' %] <a href="#main-nav" id="nav-link">Main Navigation</a> + + [% INCLUDE 'angus_search.html' %] </div> </header> @@ -66,6 +59,7 @@ </div> [% END %] + [% INCLUDE 'post_header_extra.html' %] [% pre_container_extra %] <div class="container"> diff --git a/templates/web/angus/main_menu.html b/templates/web/angus/main_menu.html new file mode 100644 index 000000000..3a07c61cd --- /dev/null +++ b/templates/web/angus/main_menu.html @@ -0,0 +1,24 @@ +[% + SET base = ""; + SET base = c.cobrand.base_url IF admin; +%] +<ul class="nav-menu [% extra_class %]"> + <li><[% IF c.req.uri.path == '/' + %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn" + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/my' + %]span[% ELSE %]a href="[% base %]/my"[% END + %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports/Angus' + %]span[% ELSE %]a href="[% base %]/reports/Angus"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports/Angus' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/alert' + %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/faq' + %]span[% ELSE %]a href="[% base %]/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% + %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' + %]span[% ELSE %]a href="[% base %]/privacy"[% END + %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> +</ul> diff --git a/templates/web/angus/maps/fms.html b/templates/web/angus/maps/fms.html new file mode 100644 index 000000000..d76d9329d --- /dev/null +++ b/templates/web/angus/maps/fms.html @@ -0,0 +1,13 @@ +[% 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.angus.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script> +<script 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 include_key = 1 %] diff --git a/templates/web/angus/post_header_extra.html b/templates/web/angus/post_header_extra.html new file mode 100644 index 000000000..16a82de3e --- /dev/null +++ b/templates/web/angus/post_header_extra.html @@ -0,0 +1,14 @@ +<div class="angus_nav"> + <div class="container"> + <ul> + <li><a href="http://www.angus.gov.uk/">Home</a></li> + <li><a href="/">FixMyStreet</a></li> + </ul> + </div> +</div> + +<div class="wrapper wrapper__main_menu"> + <div class="container"> + [% INCLUDE 'main_menu.html' extra_class = 'nav-menu--breadcrumb' %] + </div> +</div> diff --git a/templates/web/base/front/international_banner.html b/templates/web/angus/report/new/after_category.html index e69de29bb..e69de29bb 100644 --- a/templates/web/base/front/international_banner.html +++ b/templates/web/angus/report/new/after_category.html diff --git a/templates/web/angus/report/new/category_at_top.html b/templates/web/angus/report/new/category_at_top.html new file mode 100644 index 000000000..8002eb37a --- /dev/null +++ b/templates/web/angus/report/new/category_at_top.html @@ -0,0 +1 @@ +[% PROCESS "report/new/category_wrapper.html" %]
\ No newline at end of file diff --git a/templates/web/barnet/about/faq-en-gb.html b/templates/web/barnet/about/faq-en-gb.html deleted file mode 100755 index bc381a509..000000000 --- a/templates/web/barnet/about/faq-en-gb.html +++ /dev/null @@ -1,103 +0,0 @@ -[% INCLUDE 'header.html', title = 'Help', bodyclass = 'twothirdswidthpage' %] - -<h1>Frequently Asked Questions</h1> - -<p>These pages are for reporting things which are broken or dirty or damaged or dumped, and need fixing, cleaning or clearing, such as:</p> - <ul><li>abandoned vehicles - <li>flyposting or graffiti - <li>flytipping or litter - <li>streetcleaning, such as broken glass in a cycle lane - <li>unlit lampposts - <li>broken playground equipment - <li>potholes - </ul> - -<dl> - <dt>What issues can’t be reported here?</dt> - <dd><p>It is not a way of reporting all issues. Problems such as:</p> - <ul> - <li>missed rubbish or recycling collections - <li>anti-social behaviour - <li>noise pollution or barking dogs - <li>fires and smoke/smell pollution - <li>proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. - <li>complaining about your neighbours - <li>complaining or commenting about the council - </ul> - </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>Barnet Council and FixMyStreet are not responsible for the content and accuracy -of material submitted by their 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>Yes a special mobile friendly version is available to report problem in Barnet’s streets or parks. - </dd> - - <dt>Can I use these pages to report problems outside of the London Borough of Barnet?</dd> - <dd>No, please visit the main FixMyStreet site at <a href="https://www.fixmystreet.com/">https://www.fixmystreet.com/</a> to report problem outside the borough.</dd> - - <dt>Who built FixMyStreet?</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. Our first project -was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your -elected representatives, for free. 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, UK.</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>Who gets to see my email address?</dt> - <dd>If you submit a problem, your details, and details - of the problem, will be submitted to Barnet Council. -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. 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.</dd> - - <dt>What emails will you send to me?</dt> - <dd>We will email you if someone leaves an update on a -problem you’ve reported, and send you a questionnaire email four weeks -after you submit a problem, asking for a status update; we’ll only ever -send you emails in relation to your problem.</dd> - - <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> - <dd> -The software behind this site is open source, and available -to you mainly under the GNU Affero GPL software license. You can <a -href="http://github.com/mysociety/fixmystreet">download the -source code</a> and help us 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> - -[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/barnet/footer.html b/templates/web/barnet/footer.html deleted file mode 100644 index e5f8739b4..000000000 --- a/templates/web/barnet/footer.html +++ /dev/null @@ -1,80 +0,0 @@ - <p id="barnet-powered-by" class="desk-only"> - <a href="https://www.fixmystreet.com/council">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a> - </p> - </div><!-- .content role=main --> - </div><!-- .container --> - </div><!-- .table-cell --> - - <div class="nav-wrapper"> - <div class="nav-wrapper-2"> - <div id="main-nav" role="navigation"> - <ul class="nav-menu nav-menu--mysoc"> - <li><a href="https://www.fixmystreet.com/council">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a></li> - </ul> - <ul class="nav-menu nav-menu--main"> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" - >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports/Barnet' %]span[% ELSE %]a href="/reports/Barnet"[% 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> <!-- .wrapper --> -</div> -</div> -</div> - -<!-- googleoff: index --> - <div id="column_nav"> - <div class="navigation active"> - <h2><a href="/">FixMyStreet</a></h2> - <ul> - <li>[% c.req.uri.path == '/' ? '<strong>Report a problem</strong>' : '<a href="/">Report a problem</a>' %]</li> - <li>[% c.req.uri.path == '/reports/Barnet' ? '<strong>All reports</strong>' : '<a href="/reports/Barnet">All reports</a>' %]</li> - <li>[% c.req.uri.path == '/alert' ? '<strong>Local alerts</strong>' : '<a href="/alert">Local alerts</a>' %]</li> - <li class="lastItem">[% c.req.uri.path == '/faq' ? '<strong>Help</strong>' : '<a href="/faq">Help</a>' %]</li> - </ul> - </div> - <div class="clear"></div> - </div> - <div class="clear"></div> - <div id="footer"> - <p class="addNav"> - <a href="http://www.barnet.gov.uk/copyright">Copyright</a> | <a href="http://www.barnet.gov.uk/privacy">Privacy notice</a> | <a accesskey="0" href="http://www.barnet.gov.uk/accessibility">Accessibility</a> | <a accesskey="8" href="http://www.barnet.gov.uk/terms">Disclaimer</a> | <a accesskey="3" href="http://www.barnet.gov.uk/site_map">Sitemap</a> | <a href="http://www.barnet.gov.uk/contact">Contact us</a> | <a accesskey="6" href="http://www.barnet.gov.uk/a_to_z">A - Z</a> - </p> - <p class="assocLinks"> - <a id="goto_browsealoud" href="http://www.browsealoud.co.uk" title="BrowseAloud"><span class="hidden">BrowseAloud</span></a> - <a id="goto_directgov" href="http://www.direct.gov.uk" title="DirectGov"><span class="hidden">DirectGov</span></a> - <a class="external_link" id="share_facebook" href="http://www.facebook.com/barnetcouncil" title="London Borough of Barnet on Facebook"><span class="hidden">Facebook</span></a> - <a class="external_link" id="share_twitter" href="http://www.twitter.com/barnetcouncil" title="London Borough of Barnet on Twitter"><span class="hidden">Twitter</span></a> - <a class="external_link" id="share_youtube" href="http://www.youtube.com/Barnetcouncil1" title="London Borough of Barnet on YouTube"><span class="hidden">YouTube</span></a> - <a class="external_link" id="share_flickr" href="http://www.flickr.com/photos/barnetcouncil" title="London Borough of Barnet on Flickr"><span class="hidden">Flickr</span></a> - <a class="external_link" id="share_sharethis" href="http://www.sharethis.com/barnetcouncil" title="London Borough of Barnet on ShareThis"><span class="hidden">ShareThis</span></a> - </p> - <div class="clear"></div> - <p class="hidden"> - <a accesskey="1" href="http://www.barnet.gov.uk">Homepage</a> - <a accesskey="2" href="http://www.barnet.gov.uk/whats_new" rel="nofollow">What's new</a> - <a accesskey="4" href="http://www.barnet.gov.uk/site_search" rel="nofollow">Search facility </a> - <a accesskey="5" href="http://www.barnet.gov.uk/faqs" rel="nofollow">Frequently asked questions</a> - <a accesskey="9" href="http://www.barnet.gov.uk/feedback" rel="nofollow">Feedback</a> - <a accesskey="/" href="#mast" rel="nofollow">Top of the page</a> - <a accesskey="s" href="#content" rel="nofollow">Skip to content</a> - <a accesskey="n" href="#column_nav" rel="nofollow">Skip to main navigation</a> - </p> - <div id="bottomBar"> - </div> - </div> -<!-- googleon: index --> -</div> -</div> - </body> -</html> diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html deleted file mode 100644 index bb89483cb..000000000 --- a/templates/web/barnet/header.html +++ /dev/null @@ -1,96 +0,0 @@ -<!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]--> -<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> - <head> - <meta name="viewport" content="initial-scale=1.0"> - - <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> - <meta name="HandHeldFriendly" content="true"> - <meta name="mobileoptimized" content="0"> - - <link rel="ToC" href="http://www.barnet.gov.uk/site_map" /> - <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="/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)"> - <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/barnet/layout.css') %]"> - <![endif]--> - <link rel="stylesheet" href="[% version('/cobrands/barnet/barnet.css') %]" media="(min-width:48em)"> - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/barnet/barnet.css') %]"> - <![endif]--> - - <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> - <script src="[% version('/cobrands/barnet/position_map.js') %]" charset="utf-8"></script> - [% 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="/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> - <li><a href="#column_nav" rel="nofollow">Skip to main navigation</a></li> - </ul> - <div class="mast_links"></div> - <span class="clear"></span> - <div id="search"></div> - <div class="clear"></div> - </div> - <div id="page_wrap"> - <div id="page"> - <div id="breadcrumb"> - <!-- googleoff:all --> - <ul> - <li><a href="http://www.barnet.gov.uk/">Home</a></li> - <li><a href="/">FixMyStreet</a></li> - <li class="bc_end"><span> - [% IF c.req.uri.path == '/' %]Report a problem[% ELSE %][% title %][% END %] - </span></li> - </ul> - <!-- googleon:all --> - </div> - <div id="content" class="withWidth fullWidth"> - [% IF c.user_exists %] - <div id="user-meta"> - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - </div> - [% END %] - - <h1 id="page-title"> - <span>FixMyStreet</span> - </h1> - - <div class="wrapper"> - <div class="table-cell"> - <header id="site-header" role="banner"> - <div class="container"> - <a href="/" id="site-logo">FixMyStreet</a> - <a href="#main-nav" id="nav-link">Main Navigation</a> - </div> - </header> - - [% pre_container_extra %] - - <div class="container"> - <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> - - <!-- end of header --> diff --git a/templates/web/barnet/report/new/councils_text_all.html b/templates/web/barnet/report/new/councils_text_all.html deleted file mode 100644 index ae02f7647..000000000 --- a/templates/web/barnet/report/new/councils_text_all.html +++ /dev/null @@ -1,4 +0,0 @@ -<p> -All the information you provide here will be sent to the <strong>relevant department</strong>. -[% loc('The summary and description will also be made public (see our <a href="/privacy">privacy policy</a>).') %] -</p> diff --git a/templates/web/barnet/report/updates-sidebar-notes.html b/templates/web/barnet/report/updates-sidebar-notes.html deleted file mode 100644 index 3ac015f53..000000000 --- a/templates/web/barnet/report/updates-sidebar-notes.html +++ /dev/null @@ -1 +0,0 @@ - <p>Please note that updates are not sent to the relevant department. If you leave your name it will be public. Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a></p> diff --git a/templates/web/barnet/site-name.html b/templates/web/barnet/site-name.html deleted file mode 100644 index 78563bdf3..000000000 --- a/templates/web/barnet/site-name.html +++ /dev/null @@ -1 +0,0 @@ -Barnet Council FixMyStreet diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html index 84ea6840c..d5e575666 100644 --- a/templates/web/base/admin/body.html +++ b/templates/web/base/admin/body.html @@ -24,7 +24,7 @@ [% END %] [% END %] <br> - <a href="[% c.uri_for_email( '/reports/' _ body_id ) %]" class="admin-offsite-link">[% loc('List all reported problems' ) %]</a> | + <a href="[% c.uri_for_email(body.url(c)) %]" class="admin-offsite-link">[% loc('List all reported problems' ) %]</a> | <a href="[% c.uri_for( 'body', body_id, { text => 1 } ) %]">[% loc('Text only version') %]</a> </p> @@ -124,7 +124,6 @@ <form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> - [% IF c.cobrand.moniker != 'emptyhomes' %] <div class="admin-hint"> <p> [% loc('Choose a <strong>category</strong> name that makes sense to the public (e.g., "Pothole", "Street lighting") but is helpful @@ -137,7 +136,6 @@ <p> <strong>[% loc('Category:') %] </strong><input type="text" name="category" size="30" value="[% contact.category | html %]"> </p> - [% END %] <div class="admin-hint"> <p> @@ -162,7 +160,7 @@ </p> </div> <p> - <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed %]> + <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed OR contact.confirmed == "" %]> <label for="confirmed" class="inline">[% loc('Confirmed') %]</label> </p> diff --git a/templates/web/fixmystreet/alert/list-ajax.html b/templates/web/base/alert/list-ajax.html index 639af6f07..639af6f07 100644 --- a/templates/web/fixmystreet/alert/list-ajax.html +++ b/templates/web/base/alert/list-ajax.html diff --git a/templates/web/base/alert/updates.html b/templates/web/base/alert/updates.html index 5efc41bac..104bfa55a 100644 --- a/templates/web/base/alert/updates.html +++ b/templates/web/base/alert/updates.html @@ -5,16 +5,27 @@ [% INCLUDE 'errors.html' %] +<p><a href="[% c.uri_for( '/rss', problem_id ) %]"> + <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0" style="float:right"> + </a> +</p> + <p> [% loc('Receive email when updates are left on this problem.') %] </p> <form action="/alert/subscribe" method="post"> -<label class="n" for="alert_rznvy">[% loc('Email:') %]</label> -<input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30"> -<input type="hidden" name="id" value="[% problem_id | html %]"> -<input type="hidden" name="type" value="updates"> -<input type="submit" value="[% loc('Subscribe') %]"> + <fieldset> + <label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label> + + <div class="form-txt-submit-box"> + <input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" placeholder="[% loc('Your email') %]"> + <input class="green-btn" type="submit" value="[% loc('Subscribe') %]"> + </div> + + <input type="hidden" name="id" value="[% problem_id | html %]"> + <input type="hidden" name="type" value="updates"> + </fieldset> </form> diff --git a/templates/web/base/around/_error_multiple.html b/templates/web/base/around/_error_multiple.html index 15089ba6b..b47a91ca9 100644 --- a/templates/web/base/around/_error_multiple.html +++ b/templates/web/base/around/_error_multiple.html @@ -13,7 +13,7 @@ [% IF partial_token %] <p style="margin-top: 0; color: #cc0000;"> - <img align="right" src="/photo/[% partial_report.id %].jpeg" hspace="5"> + <img align="right" src="[% partial_report.photos.first.url_temp %]" hspace="5"> [% loc("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 :") %] </p> [% END %] diff --git a/templates/web/base/around/_main.html b/templates/web/base/around/_main.html index 1b832cb49..900dcb6aa 100644 --- a/templates/web/base/around/_main.html +++ b/templates/web/base/around/_main.html @@ -1,8 +1,3 @@ -<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm"> - <div id="side-form"> - <div id="report-a-problem-main"> - [% pre_container_extra %] - [% INCLUDE 'around/_error_multiple.html' %] - </div> - </div> -</form> +<div class="tablewrapper"> + [% INCLUDE 'around/_error_multiple.html' %] +</div> diff --git a/templates/web/base/around/_updates.html b/templates/web/base/around/_updates.html index 8110a6c7c..458983e8f 100755 --- a/templates/web/base/around/_updates.html +++ b/templates/web/base/around/_updates.html @@ -1,12 +1,5 @@ -<h1>[% loc('Problems in this area') %]</h1> - -<p id="alert_links_area"> - <a id="email_alert" rel="nofollow" href="[% email_url | html %]"> - [%- loc('Email me new local problems') -%] -</a> | - <a href="[% rss_url | html %]" id="rss_alert"> - <span>[% rss_alt %]</span> - <img src="/i/feed.png" width="16" height="16" title="[% rss_title %]" alt="[% rss_alt %]" border="0" style="vertical-align: top"> - </a> -</p> - +<div class="shadow-wrap"> + <ul id="key-tools" class="singleton"> + <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">[% loc("Get updates") %]</a></li> + </ul> +</div> diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html index d38ae6754..7bf62e528 100755 --- a/templates/web/base/around/display_location.html +++ b/templates/web/base/around/display_location.html @@ -30,7 +30,7 @@ PROCESS "maps/${map.type}.html" around_page = 1; SET bodyclass = 'mappage'; - SET rss = [ tprintf(loc('Recent local problems, %s', "%s is the site name"), site_name), rss_url ] IF c.cobrand.moniker != 'emptyhomes'; + SET rss = [ tprintf(loc('Recent local problems, %s', "%s is the site name"), site_name), rss_url ]; INCLUDE 'header.html', title => loc('Viewing a location') robots => 'noindex,nofollow'; @@ -51,7 +51,6 @@ [% map_html %] - [% IF c.cobrand.moniker != 'emptyhomes' %] <p id='sub_map_links'> [% map_sub_links %] [% IF c.req.params.no_pins %] @@ -68,7 +67,6 @@ [% END %] [% END %] </p> - [% END %] </div> @@ -82,13 +80,11 @@ [% TRY %][% INCLUDE 'around/extra_text.html' %][% CATCH file %][% END %] [% END %] - [% IF c.cobrand.moniker != 'emptyhomes' %] [% INCLUDE 'around/_updates.html' %] <section class="full-width"> [% INCLUDE "around/tabbed_lists.html" %] </section> - [% END %] </div> [% IF allow_creation %] diff --git a/templates/web/base/around/postcode_form.html b/templates/web/base/around/postcode_form.html index 601f0ee9e..9c0bc5942 100644 --- a/templates/web/base/around/postcode_form.html +++ b/templates/web/base/around/postcode_form.html @@ -6,9 +6,6 @@ question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); %] - [% IF c.cobrand.moniker == 'fixmybarangay' %] - [% INCLUDE '_barangay_buttons.html' %] - [% ELSE %] <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> <label for="pc">[% question %]:</label> <div> @@ -21,6 +18,5 @@ [% END %] </form> - [% END %] </div> </div> diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index d856dc19a..253dc26a1 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -14,13 +14,23 @@ <input type="hidden" name="r" value="[% c.req.params.r | html %]"> -[% IF NOT oauth_need_email AND c.config.FACEBOOK_APP_ID %] +[% IF NOT oauth_need_email AND (c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY) %] + [% IF c.config.FACEBOOK_APP_ID %] <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> Log in with Facebook </button> </div> + [% END %] + [% IF c.config.TWITTER_KEY %] + <div class="form-box"> + <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> + <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> + Log in with Twitter + </button> + </div> + [% END %] <div id="js-social-email-hide"> [% END %] @@ -56,7 +66,7 @@ [% END %] </div> -[% IF NOT oauth_need_email AND c.config.FACEBOOK_APP_ID %] +[% IF NOT oauth_need_email AND (c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY) %] </div> [% END %] diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index d13509a7a..99d409362 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -12,7 +12,7 @@ <script type="text/javascript" src="[% start %][% version('/js/geo.min.js') %]"></script> <script type="text/javascript" src="[% start %][% version('/js/fixmystreet.js') %]"></script> -<script type="text/javascript" src="[% start %][% version(js_override || '/js/fixmystreet-old-box.js') %]"></script> +<script type="text/javascript" src="[% start %][% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script> [% IF admin %] <script src="[% start %]/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js"></script> diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html index b3e1e8426..c0f94ce56 100644 --- a/templates/web/base/dashboard/index.html +++ b/templates/web/base/dashboard/index.html @@ -17,7 +17,6 @@ </hgroup> <div class="filters"> - [% IF c.cobrand.moniker != 'fixmybarangay' %] <p> <label for="ward">Ward:</label> <select name="ward"><option value=''>All</option> @@ -26,7 +25,6 @@ [% END %] </select> </p> - [% END %] <p> <label for="category">Report category:</label> diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html index 3f4e5b551..7626736a0 100644 --- a/templates/web/base/footer.html +++ b/templates/web/base/footer.html @@ -1,33 +1,53 @@ - </div><!-- #mysociety .container --> - - <div id="navigation" class="container" role="navigation"> - <div class="spacer"></div> - <ul id="site-nav" class="nav"> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END - %]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END - %]>[% 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> - - </div> - -</div></div></div><!-- wrappers --> - -<div id="footer"> - - <p><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) | replace(' ', ' ') %]</a></p> - - [% INCLUDE 'front/footer-marketing.html' %] - -</div> - -[% INCLUDE 'debug_footer.html' %] + [% IF pagefooter %] + <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 class="nav-menu nav-menu--mysoc"> + <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li> + </ul> +[% + SET base = ""; + SET base = c.cobrand.base_url IF admin; +%] + <ul class="nav-menu nav-menu--main"> + <li><[% IF c.req.uri.path == '/' + %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn" + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/my' + %]span[% ELSE %]a href="[% base %]/my"[% END + %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports' + %]span[% ELSE %]a href="[% base %]/reports"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/alert' + %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/faq' + %]span[% ELSE %]a href="[% base %]/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% + %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' + %]span[% ELSE %]a href="[% base %]/privacy"[% END + %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> + </ul> + </div> + </div> + </div> + +<!-- [% INCLUDE 'debug_footer.html' %] --> + </div> <!-- .wrapper --> + + [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] </body> </html> diff --git a/templates/web/base/header.html b/templates/web/base/header.html index 1d7960661..7ef37675a 100644 --- a/templates/web/base/header.html +++ b/templates/web/base/header.html @@ -1,30 +1,61 @@ +[% + SET html_att = ' lang="' _ lang_code _ '"'; + # For a right-to-left language, use the following line in your own header: + # SET html_att = html_att _ ' dir="rtl"'; +-%] <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 iel8"[% html_att %]><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 iel8"[% html_att %]><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 iel8"[% html_att %]><![endif]--> +<!--[if IE 9]> <html class="no-js ie9"[% html_att %]><![endif]--> +<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> - <meta name="apple-mobile-web-app-capable" content="yes"> - <meta name="apple-mobile-web-app-status-bar-style" content="black"> + <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> [% INCLUDE 'header_opengraph.html' %] + [% SET start = c.config.ADMIN_BASE_URL IF admin; - <link rel="stylesheet" href="[% version('/css/core.css') %]"> + # 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/' _ css_dir _ '/layout.css') %]"> + <![endif]--> + <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] - - </head> - <body> + [% extra_js %] + + [% IF c.req.uri.host == 'osm.fixmystreet.com' %] + <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]"> + [% END %] -<div id="wrapper"><div id="wrapper2"><div id="wrapper3"> + [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] + + </head> + [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] + <body class="[% bodyclass | html IF bodyclass %]"> - [% IF NOT title AND NOT c.req.path %]<h1 id="header" role="banner">[% ELSE %]<div id="header" role="banner"><a href="/">[% END - %][% loc('FixMyStreet') %] - [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %] + <div class="wrapper"> + <div class="table-cell"> + <header id="site-header" role="banner"> + <div class="container"> + [% INCLUDE 'header_logo.html' %] + <a href="#main-nav" id="nav-link">Main Navigation</a> + </div> + </header> [% IF c.user_exists %] <div id="user-meta"> @@ -37,6 +68,7 @@ [% pre_container_extra %] - <div id="mysociety" class="container" role="main"> + <div class="container"> + <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> - [% INCLUDE 'debug_header.html' %] + <!-- [% INCLUDE 'debug_header.html' %] --> diff --git a/templates/web/base/header_logo.html b/templates/web/base/header_logo.html index e69de29bb..66378235a 100644 --- a/templates/web/base/header_logo.html +++ b/templates/web/base/header_logo.html @@ -0,0 +1,2 @@ + <a href="[% c.cobrand.base_url IF admin %]/" id="site-logo">[% site_name %]</a> + <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> diff --git a/templates/web/base/index-steps.html b/templates/web/base/index-steps.html index 431791c20..0ee57bfca 100644 --- a/templates/web/base/index-steps.html +++ b/templates/web/base/index-steps.html @@ -1,26 +1,6 @@ <h2>[% loc('How to report a problem') %]</h2> <ol class="big-numbers"> -[% IF c.cobrand.moniker == 'fixmybarangay' %] - <li>Text <span class="promo-big">FMB LUZ</span> or <span class="promo-big">FMB BSN</span> followed by your report to - <ul id="promo-list"> - <li> - <span class="promo-bigger">391-FMB</span> (391362) SMART short code - </li> - <li> - <span class="promo-bigger">0908 896 8278</span> for all networks - </li> - </ul> - <div class="promo-example"> - For example:<br/> - <div> - FMB LUZ Busted streetlamp, P. Cabantan St., Pole # 12345, near Sto. Antonio Chapel - </div> - </div> - </li> - <li>Or visit the Barangay Center in person</li> - <li>Staff? <a href="/auth">Sign in</a> and click on the map! -[% ELSE %] <li>[% question %]</li> <li>[% loc('Locate the problem on a map of the area') %]</li> <li>[% loc('Enter details of the problem') %]</li> @@ -30,13 +10,10 @@ [% ELSE %] <li>[% loc('We send it to the council on your behalf') %]</li> [% END %] -[% END %] </ol> -[% IF c.cobrand.moniker != 'emptyhomes' %] <section class="full-width"> [% INCLUDE "front/stats.html" %] [% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %] </section> -[% END %] diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html index b97104f92..2171566ba 100644 --- a/templates/web/base/js/translation_strings.html +++ b/templates/web/base/js/translation_strings.html @@ -50,7 +50,7 @@ upload_max_files_exceeded: '[% loc ('Whoa there Testino! Three photos are enough.') | replace("'", "\\'") %]', upload_default_message: '[% loc ('Drag and drop photos here or <u>click to upload</u>') | replace("'", "\\'") %]', upload_cancel_confirmation: '[% loc ('Are you sure you want to cancel this upload?') | replace("'", "\\'") %]', - upload_invalid_file_type: '[% loc ('Please upload a JPEG image only') | replace("'", "\\'") %]', + upload_invalid_file_type: '[% loc ('Please upload an image only') | replace("'", "\\'") %]', report_problem_heading: '[% loc('Click map to report a problem') | replace("'", "\\'") %]' }; diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html index dff18c025..c3911d4c1 100644 --- a/templates/web/base/my/my.html +++ b/templates/web/base/my/my.html @@ -21,9 +21,7 @@ c.uri_for('/') ) %] [% END %] -[% IF c.cobrand.moniker == 'fixmybarangay' %] - [% INCLUDE '_barangay_buttons.html' %] -[% ELSIF c.cobrand.moniker == 'hart' %] +[% IF c.cobrand.moniker == 'hart' %] [% INCLUDE '_hart_hants_note.html' %] [% END %] diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html index 86887c163..1068e21e3 100644 --- a/templates/web/base/questionnaire/index.html +++ b/templates/web/base/questionnaire/index.html @@ -82,7 +82,7 @@ [% IF upload_fileid %] <p>[% loc('You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p> [% FOREACH id IN upload_fileid.split(',') %] - <img align="right" src="/photo/[% id %].temp.jpeg" alt=""> + <img align="right" src="/photo/temp.[% id %]" alt=""> [% END %] [% END %] <input type="file" name="photo1" id="form_photo"> @@ -93,7 +93,6 @@ </div> [% END %] -[% IF c.cobrand.moniker != 'emptyhomes' %] <div class="js-another-questionnaire"> <p>[% loc('Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?') %]</p> <p class="radio-segmented-control"> @@ -103,7 +102,6 @@ <label class="inline" for="another_no">[% loc('No') %]</label> </p> </div> -[% END %] <p><input type="submit" name="submit" value="[% loc('Submit questionnaire') %]"></p> diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html index 6ae43f798..704dfd29c 100644 --- a/templates/web/base/report/_item.html +++ b/templates/web/base/report/_item.html @@ -3,7 +3,7 @@ [% IF problem.photo %] <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt=""> [% END %] - <h4>[% problem.title | html %]</h4> + <h3 class="item-list__heading">[% problem.title | html %]</h3> <small> [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %] [%- prettify_dt( problem.confirmed, 1 ) %] diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index a7aafb6d0..7260e619a 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -54,7 +54,7 @@ <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 %] + [%- IF !problem.used_map %]; <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' %] diff --git a/templates/web/base/report/new/category.html b/templates/web/base/report/new/category.html index f640c548c..8cfbecdcd 100644 --- a/templates/web/base/report/new/category.html +++ b/templates/web/base/report/new/category.html @@ -4,11 +4,8 @@ category = category | lower; END; %] <label for='form_category' id="form_category_label"> - [%- IF c.cobrand.moniker == 'emptyhomes' %] - [%- loc('Property type:') %] - [%- ELSE %] [%- loc('Category') %] - [%- END -%]</label> + </label> <select name='category' id='form_category'> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html index 68fb2c796..3fbf7c160 100644 --- a/templates/web/base/report/new/form_report.html +++ b/templates/web/base/report/new/form_report.html @@ -31,7 +31,7 @@ [% IF upload_fileid %] <p>[% loc('You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p> [% FOREACH id IN upload_fileid.split(',') %] - <img align="right" src="/photo/[% id %].temp.jpeg" alt=""> + <img align="right" src="/photo/temp.[% id %]" alt=""> [% END %] [% END %] <input type="file" name="photo1" id="form_photo"> diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html index a39200c72..75ff76204 100644 --- a/templates/web/base/report/new/form_user_loggedin.html +++ b/templates/web/base/report/new/form_user_loggedin.html @@ -26,11 +26,9 @@ <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') %]"> - [% IF c.cobrand.moniker != 'fixmybarangay' || c.user.from_body %] - <div class="general-notes"> - <p>[% loc('We never show your email address or phone number.') %]</p> - </div> - [% END %] + <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') %]"> diff --git a/templates/web/base/report/new/form_user_loggedout.html b/templates/web/base/report/new/form_user_loggedout.html index 6657c87a1..889834580 100644 --- a/templates/web/base/report/new/form_user_loggedout.html +++ b/templates/web/base/report/new/form_user_loggedout.html @@ -1,12 +1,22 @@ -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] <h3>[% loc("Now to submit your report…") %]</h3> + [% IF c.config.FACEBOOK_APP_ID %] <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> Log in with Facebook </button> </div> + [% END %] + [% IF c.config.TWITTER_KEY %] + <div class="form-box"> + <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> + <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> + Log in with Twitter + </button> + </div> + [% END %] <div id="js-social-email-hide"> [% PROCESS 'report/new/form_user_loggedout_email.html' required = 0 %] [% ELSE %] @@ -20,6 +30,6 @@ [% PROCESS 'report/new/form_user_loggedout_by_email.html' %] </div> -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] </div> [% END %] diff --git a/templates/web/base/report/update-form.html b/templates/web/base/report/update-form.html index 3e0ac890b..29529e5a1 100644 --- a/templates/web/base/report/update-form.html +++ b/templates/web/base/report/update-form.html @@ -5,7 +5,7 @@ [% IF NOT login_success AND NOT oauth_need_email %] <h2>[% loc( 'Provide an update') %]</h2> - [% IF c.cobrand.moniker != 'emptyhomes' AND c.cobrand.moniker != 'stevenage' %] + [% IF c.cobrand.moniker != 'stevenage' %] <div class="general-notes"> [% INCLUDE 'report/updates-sidebar-notes.html' %] </div> diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html index f7072ae18..007bd68d8 100644 --- a/templates/web/base/report/update/form_update.html +++ b/templates/web/base/report/update/form_update.html @@ -13,7 +13,7 @@ [% IF upload_fileid %] <p>[% loc('You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p> [% FOREACH id IN upload_fileid.split(',') %] - <img align="right" src="/photo/[% id %].temp.jpeg" alt=""> + <img align="right" src="/photo/temp.[% id %]" alt=""> [% END %] [% END %] <input type="file" name="photo1" id="form_photo"> @@ -38,7 +38,7 @@ ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')], ['fixed', loc('Fixed')] ] %] - <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> + <option [% 'selected ' IF state.0 == problem.state_display %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> [% ELSE %] diff --git a/templates/web/base/report/update/form_user_loggedout.html b/templates/web/base/report/update/form_user_loggedout.html index 4176633f1..fa26eb8f4 100644 --- a/templates/web/base/report/update/form_user_loggedout.html +++ b/templates/web/base/report/update/form_user_loggedout.html @@ -1,11 +1,21 @@ -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] <h3>[% loc("Now to submit your update…") %]</h3> + [% IF c.config.FACEBOOK_APP_ID %] <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> Log in with Facebook </button> </div> + [% END %] + [% IF c.config.TWITTER_KEY %] + <div class="form-box"> + <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> + <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> + Log in with Twitter + </button> + </div> + [% END %] <div id="js-social-email-hide"> [% INCLUDE 'report/update/form_user_loggedout_email.html' required=0 %] [% ELSE %] @@ -19,6 +29,6 @@ [% INCLUDE 'report/update/form_user_loggedout_by_email.html' %] </div> -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] </div> [% END %] diff --git a/templates/web/base/report/updates.html b/templates/web/base/report/updates.html index b0a015f03..fc2ac6c78 100644 --- a/templates/web/base/report/updates.html +++ b/templates/web/base/report/updates.html @@ -28,7 +28,7 @@ [%- IF update.mark_fixed %][% update_state = loc( 'marked as fixed' ) %][% END %] [%- IF update.mark_open %][% update_state = loc( 'reopened' ) %][% END %] [%- IF !update_state && update.problem_state %] - [%- state = update.meta_problem_state %] + [%- state = update.problem_state_display %] [%- IF c.cobrand.moniker == 'bromley' OR problem.bodies_str == '2482' %] [%- SET update_state = 'marked as no further action' IF state == 'unable to fix' %] [%- SET update_state = 'marked as third party responsibility' IF state == 'not responsible' %] diff --git a/templates/web/base/reports/_rss.html b/templates/web/base/reports/_rss.html index 9756f131d..f2d164bfa 100644 --- a/templates/web/base/reports/_rss.html +++ b/templates/web/base/reports/_rss.html @@ -1,2 +1,19 @@ -<p><a href="[% rss_url %]"><img align="right" src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% tprintf(loc('RSS feed of problems in this %s'), thing) %]" border="0" hspace="4"></a> +<div class="shadow-wrap"> + <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]> + <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% + IF c.cobrand.moniker == 'bromley' AND thing == 'council'; + 'Get updates of reports in Bromley'; + ELSIF c.cobrand.moniker == 'bromley'; + 'Get updates of reports in this ward'; + ELSIF c.cobrand.is_council; + tprintf(loc('Get updates of %s problems'), thing); + ELSE; + tprintf(loc('Get updates of problems in this %s'), thing); + END + %]</a></li> + [% IF children.size %] + <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% ward_text %]</a></li> + [% END %] + </ul> +</div> diff --git a/templates/web/base/reports/_ward-list.html b/templates/web/base/reports/_ward-list.html index e78ac7d90..ed341d389 100755 --- a/templates/web/base/reports/_ward-list.html +++ b/templates/web/base/reports/_ward-list.html @@ -1,9 +1,14 @@ -[% IF location == 'before' AND children.size %] -<h2 style="clear:right">[% ward_text %]</h2> -<p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> -<ul> -[% FOR child IN children.values.sort('name') %] -<li><a href="[% child.url %]">[% child.name %]</a></li> -[% END %] -</ul> +[% IF children.size %] +<section id="council_wards" class="hidden-js"> +<h2>[% ward_text %]</h2> + <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> + <ul class="item-list item-list--wards full-width"> + [% FOR child IN children.values.sort('name') %] + <li class="item-list__item item-list--wards__item"> + <a href="[% child.url %]">[% child.name %]</a> + </li> + [% END %] + </ul> +</section> [% END %] + diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html index dfaa98d6a..2ec409765 100755 --- a/templates/web/base/reports/body.html +++ b/templates/web/base/reports/body.html @@ -26,8 +26,6 @@ [% map_html %] -[% INCLUDE 'reports/_ward-list.html', location = 'before' %] - </div> <div id="side"> @@ -51,7 +49,7 @@ [% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %] -[% INCLUDE 'reports/_ward-list.html', location = 'after' %] +[% INCLUDE 'reports/_ward-list.html' %] [% IF c.cobrand.moniker == 'fixmystreet' %] <p class="promo"> diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html index 5430b25e2..da83e005f 100644 --- a/templates/web/bromley/report/display.html +++ b/templates/web/bromley/report/display.html @@ -72,7 +72,7 @@ [% IF upload_fileid %] <p>[% loc('You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p> [% FOREACH id IN upload_fileid.split(',') %] - <img align="right" src="/photo/[% id %].temp.jpeg" alt=""> + <img align="right" src="/photo/temp.[% id %]" alt=""> [% END %] [% END %] <input type="file" name="photo1" id="form_photo"> @@ -102,7 +102,7 @@ ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')], ['fixed', loc('Fixed')] ] %] - <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> + <option [% 'selected ' IF state.0 == problem.state_display %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> [% ELSE %] 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 858da1a07..96f23d1fb 100644 --- a/templates/web/bromley/report/new/fill_in_details_form.html +++ b/templates/web/bromley/report/new/fill_in_details_form.html @@ -60,7 +60,7 @@ [% IF upload_fileid %] <p>[% loc('You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p> [% FOREACH id IN upload_fileid.split(',') %] - <img align="right" src="/photo/[% id %].temp.jpeg" alt=""> + <img align="right" src="/photo/temp.[% id %]" alt=""> [% END %] [% END %] <input type="file" name="photo1" id="form_photo"> diff --git a/templates/web/eastsussex/header.html.template b/templates/web/eastsussex/header.html.template index 1ca60f4b7..d80d4101a 100644 --- a/templates/web/eastsussex/header.html.template +++ b/templates/web/eastsussex/header.html.template @@ -11,7 +11,7 @@ <![endif]--> <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html' %] [% extra_js %] <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/report-form.js') %]"></script> diff --git a/templates/web/eastsussex/report/update-form.html b/templates/web/eastsussex/report/update-form.html index 4d0c2529f..e4fb47a45 100644 --- a/templates/web/eastsussex/report/update-form.html +++ b/templates/web/eastsussex/report/update-form.html @@ -47,7 +47,7 @@ <h2>[% loc( 'Provide an update') %]</h2> - [% IF c.cobrand.moniker != 'emptyhomes' AND c.cobrand.moniker != 'stevenage' %] + [% IF c.cobrand.moniker != 'stevenage' %] <div class="general-notes"> [% INCLUDE 'report/updates-sidebar-notes.html' %] </div> @@ -72,7 +72,7 @@ [% IF upload_fileid %] <p>[% loc('You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p> [% FOREACH id IN upload_fileid.split(',') %] - <img align="right" src="/photo/[% id %].temp.jpeg" alt=""> + <img align="right" src="/photo/temp.[% id %]" alt=""> [% END %] [% END %] <input type="file" name="photo1" id="form_photo"> @@ -101,7 +101,7 @@ ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')], ['fixed', loc('Fixed')] ] %] - <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> + <option [% 'selected ' IF state.0 == problem.state_display %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> [% ELSE %] diff --git a/templates/web/emptyhomes/about/about-cy.html b/templates/web/emptyhomes/about/about-cy.html deleted file mode 100644 index dab6cefea..000000000 --- a/templates/web/emptyhomes/about/about-cy.html +++ /dev/null @@ -1,44 +0,0 @@ -[% INCLUDE 'header.html', title => loc('About us') %] - -<h1>[% loc('About us') %]</h1> - -<div style="float: left; width: 48%;"> - - <h2>Yr Asiantaeth Tai Gwag</h2> - -<p>Mae'r Asiantaeth Tai Gwag yn elusen ymgyrchu annibynnol. Nid ydym yn rhan -o'r llywodraeth, ac nid oes gennym unrhyw gysylltiadau ffurfiol â chynghorau -lleol er ein bod yn cydweithio â'r naill a'r llall. Rydym yn bodoli er mwyn -amlygu gwastraff yr eiddo gwag ac yn gweithio gyda eraill er mwyn dyfeisio a -hyrwyddo atebion cynaliadwy er mwyn adfer eiddo gwag yn eiddo y mae pobl yn byw -ynddynt eto. Rydym wedi'n lleoli yn Llundain ond rydym yn gweithio ledled -Lloegr. Rydym hefyd yn gweithio mewn partneriaeth ag elusennau eraill ledled y -DU.</p> - -</div> - -<div style="float: right; width:48%;"> - - <h2>Shelter Cymru</h2> - -<p>Shelter Cymru yw’r elusen yng Nghymru ar gyfer pobl a chartrefi ac -rydym eisiau i bawb yng Nghymru gael cartref addas. Credwn fod cartref yn hawl -sylfaenol a’i fod yn hanfodol i iechyd a lles pobl a chymunedau. Rydym -yn gweithio dros bobl sydd mewn angen am dai. Mae gennym swyddfeydd ar draws -Cymru ac rydym yn atal pobl rhag colli eu cartrefi drwy gynnig cyngor -annibynnol, cyfrinachol, am ddim. Pan fo’r angen, rydym yn herio’n -adeiladol ar ran pobl er mwyn sicrhau eu bod yn cael eu cynorthwyo’n -gywir ac i wella ymarfer a dysgu. Mae Shelter Cymru yn credu y gall gwneud -gwell defnydd o gartrefi gwag gyfrannu’n sylweddol at y ddaprariaeth o -dai fforddiadwy yng Nghymru. - - <a href="http://www.sheltercymru.org.uk/shelter/advice/pdetail.asp?cat=20"> - Gwybodaeth bellach am ein gwaith ar gartrefi gwag</a>. - - </p> - -</div> - -<br clear="both"> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/about/about-en-gb.html b/templates/web/emptyhomes/about/about-en-gb.html deleted file mode 100644 index e9eeea103..000000000 --- a/templates/web/emptyhomes/about/about-en-gb.html +++ /dev/null @@ -1,62 +0,0 @@ -[% INCLUDE 'header.html', title => loc('About us') %] - -<h1>[% loc('About us') %]</h1> - -<div style="float: left; width: 31%; margin-right: 4%"> - - <h2>The Empty Homes Agency</h2> - - <p>The Empty Homes agency is an independent campaigning charity. We - are not part of government, and have no formal links with local councils - although we work in cooperation with both. We exist to highlight the waste - of empty property and work with others to devise and promote sustainable - solutions to bring empty property back into use. We are based in London but - work across England. We also work in partnership with other charities across - the UK.</p> - -</div> - -<div style="float: left; width: 31%;"> - - <h2>Shelter<br>Cymru</h2> - - <p>Shelter Cymru is Wales’ people and homes charity and wants - everyone in Wales to have a decent home. We believe a home is a fundamental - right and essential to the health and well-being of people and communities. - We work for people in housing need. We have offices all over Wales and - prevent people from losing their homes by offering free, confidential and - independent advice. When necessary we constructively challenge on behalf of - people to ensure they are properly assisted and to improve practice and - learning. We believe that bringing empty homes back into use can make a - significant contribution to the supply of affordable homes in Wales. - - <a href="http://www.sheltercymru.org.uk/shelter/advice/pdetail.asp?cat=20"> - Further information about our work on empty homes</a>. - - </p> - -</div> - -<div style="float: right; width: 31%;"> - - <h2>The Scottish Empty Homes Partnership</h2> - -<p>The Scottish Empty Homes Partnership works with Scottish Local Authorities -and their partners to help them bring the 23,000+ long term private sector -empty homes in Scotland back into use. In existence since June 2010, the -Partnership is funded by Scottish Government and hosted by Shelter Scotland. - -<p>We provide training for empty homes officers, share best practice, link -industry professionals and provide consultancy and advice to councils and -others working to bring private sector empty homes back into use. We aim to -highlight the opportunities for communities in bringing empty homes back into -use. Based on our experience we also make recommendations for changes in both -practice and policy on local and national levels. To find out more about the -work we do please -<a href="http://scotland.shelter.org.uk/housing_issues/empty_homes">visit our webpage</a>. - -</div> - -<br clear="both"> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/about/faq-cy.html b/templates/web/emptyhomes/about/faq-cy.html deleted file mode 100644 index 842f0c028..000000000 --- a/templates/web/emptyhomes/about/faq-cy.html +++ /dev/null @@ -1,62 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Frequently Asked Questions') %] - -<h1>Cwestiynau Cyffredin</h1> - -<dl> -<dt>Beth yw diben y safle hwn?</dt> -<dd>Diben y safle hwn yw ei gwneud mor hawdd â phosibl i chi gael tai gwag yn eich ardal yn ôl mewn defnydd. Mae’n gwneud cynghorau’n atebol am ymateb i’r tai gwag rydych chi’n rhoi gwybod amdanynt, ac am ddelio â nhw.</dd> -<dt>Sut ydw i’n defnyddio’r safle?</dt> -<dd>Rhowch god post neu gyfeiriad yn y blwch ar y dudalen hafan ac fe gyflwynir map o’r ardal honno i chi. Cliciwch ar y man lle mae’r eiddo gwag, llenwch y manylion, llwythwch ffotograff i fyny os oes un gennych a phwyswch anfon. A dyna’r cyfan.</dd> -<dt>A yw’r gwasanaeth ar gael am ddim?</dt> -<dd>Ydy. Talwyd am gostau datblygu a chynnal y safle hwn gan yr Asiantaeth Tai Gwag a Shelter Cymru drwy haelioni eu cyllidwyr. Mae'r Asiantaeth Tai Gwag a Shelter Cymru yn elusennau cofrestredig, felly os ydych yn credu yn ein nodau a hoffech gyfrannu, mae croeso i chi wneud hynny. -<a href="https://secure.thebiggive.org.uk/donate/donate.php?charity_id=6651">Asiantaeth Tai Gwag</a>, -<a href="http://cymraeg.sheltercymru.org.uk/Help/donating.aspx?ParentID=7&year=0&type=1&subcat=32&pageid=93">Shelter Cymru</a>, -<a href="http://scotland.shelter.org.uk/donate">Shelter Scotland</a>.</dd> - -<dt>Ydych chi’n cael gwared ar gynnwys gwirion neu anghyfreithlon?</dt> -<dd>Rydym yn cadw’r hawl i ddileu unrhyw adroddiadau neu ddiweddariadau yr ydym yn eu hystyried yn amhriodol.</dd> -<dt>Sut mae cynghorau’n dod ag eiddo gwag yn ôl mewn defnydd?</dt> -<dd><p>Mae gan bob cyngor yng Nghymru a Lloegr bwerau i ddod â thai gwag yn ôl mewn defnydd. Mae llawer ohonynt yn dda iawn wrth wneud hynny, nid yw rhai eraill. Mae’r rhan fwyaf o gynghorau’n ceisio helpu a dwyn perswâd ar y perchennog i ddod â’u heiddo yn ôl mewn defnydd; dim ond pan fydd help a pherswâd wedi methu y byddant yn defnyddio pwerau cyfreithiol fel Gorchmynion Rheoli Anheddau Gwag.</p> <p> -Mae’r rhan fwyaf o eiddo gwag yn cael eu dwyn yn ôl mewn defnydd ymhen hir a hwyr gan eu perchennog. Fodd bynnag, mewn achosion niferus, mae hyn yn cymryd blynyddoedd. Yn aml, bydd eiddo gwag yn dirywio’n gyflym – bydd chwyn yn eu goresgyn a bydd y tywydd yn ymosod arnynt. Maent yn aml yn cael eu defnyddio gan sgwatwyr, pobl sy’n tipio’n anghyfreithlon, fandaliaid ac weithiau cânt eu rhoi ar dân yn fwriadol. Mae’r gymdogaeth gyfan yn dioddef wrth aros i’r perchennog ddelio â’i eiddo.</p> <p> -Mae cynghorau’n helpu ac yn dwyn perswâd ar berchenogion i adfer eu heiddo i’w defnyddio yn gyflymach. -Hyd yn oed wedyn, gall y broses fod yn araf, yn enwedig os yw’r eiddo mewn cyflwr gwael iawn neu os yw’r perchennog yn amharod i wneud unrhyw beth. Yn y rhan fwyaf o achosion, bydd chwe mis yn mynd heibio cyn y gallwch ddisgwyl gweld unrhyw beth yn newid, weithiau hwy. Nid yw hyn yn golygu nad yw’r cyngor yn gwneud unrhyw beth, a dyma pam rydym ni’n annog y cyngor i ddiweddaru’r wefan fel y gallwch weld beth sy’n digwydd.</p> <p> -Byddwn yn cysylltu â chi ddwywaith (mis a chwe mis ar ôl i chi roi gwybod am yr eiddo gwag), fel y gallwch ddweud wrthym beth sydd wedi digwydd. Os nad yw’r cyngor yn gwneud unrhyw beth, neu os ydych chi’n meddwl bod eu hymateb yn annigonol, byddwn yn rhoi cyngor i chi ar beth i’w wneud nesaf.</p> <p> -Os taw’r llywodraeth neu un o’i hasiantaethau sy’n berchen ar yr eiddo gwag, nid oes gan gynghorau unrhyw bŵer i helpu’n aml. Fodd bynnag, mae’n bosibl y byddwch yn gallu gweithredu’ch hunan yn uniongyrchol gan ddefnyddio PROD: -<a href="http://www.emptyhomes.com/what-you-can-do-2/resources/prods-2">http://www.emptyhomes.com/what-you-can-do-2/resources/prods-2</a> -</dd> - <dt>A fydd adrodd am eiddo gwag yn gwneud unrhyw wahaniaeth?</dt> - <dd><p>Bydd. Gall cynghorau wneud gwahaniaeth gwirioneddol, ond mae ganddynt lawer o bethau i’w gwneud. Bydd llawer o gynghorau ddim ond yn delio ag eiddo gwag sydd wedi cael eu hysbysu iddyn nhw. Os nad yw pobl yn rhoi gwybod am eiddo gwag, mae’n bosibl iawn y daw cynghorau i’r casgliad bod meysydd gwaith eraill yn fwy pwysig.</p> <p> - Mae dros 840,000 o dai gwag yn y DU. Mae’r Asiantaeth Tai Gwag yn amcangyfrif bod dros hanner y rhain yn wag heb angen. Effaith hyn yw gostwng sylweddol yn y stoc tai sydd ar gael, gan fwydo argyfwng tai’r DU. Sgil-effaith y gwastraff hwn yw bod llawer mwy o bwysau’n cael ei roi ar dir adeiladau gan fod mwy o dai’n cael eu hadeiladu i ateb y diffyg. Mae’r Asiantaeth Tai Gwag yn amcangyfrif y byddai dod â dim ond chwarter tai gwag y DU yn ôl mewn defnydd yn rhoi cartrefi i 700,000 o bobl, yn arbed 160 cilometr sgwâr o dir ac yn arbed 10 miliwn tunnell fetrig o CO<sub>2</sub> dros adeiladu’r un nifer o dai newydd. - </dt> - </dl> - <h2>Cwestiynau Preifatrwydd </h2> - <dl> - <dt>Pwy sy’n cael gweld fy nghyfeiriad e-bost?</dt> - <dd>Os gwnaethoch gyflwyno eiddo gwag, wrth reswm, mae eich manylion yn cael eu darparu i ni. Ni fyddwn byth yn rhoi nac yn gwerthu eich cyfeiriad e-bost i unrhyw un arall, oni bai ein bod ni’n gorfod gwneud hynny yn ôl y gyfraith.</dd> - <dt>A fyddwch chi’n anfon negeseuon sbam budr, bwystfilaidd at fy nghyfeiriad e-bost?</dt> - <dd>Byth. Byddwn yn anfon neges e-bost atoch os yw rhywun yn gadael diweddariad ar adroddiad a wnaed gennych, ac yn anfon holiaduron e-bost atoch chi bedair wythnos a chwe mis wedi i chi gyflwyno problem yn gofyn am ddiweddariad am ei statws; dim ond ynghylch eich problem y byddwn yn anfon negeseuon e-bost atoch chi.</dd> - </dl> - <h2>Cwestiynau am y Sefydliad </h2> - <dl> - <dt>Pwy adeiladodd y safle hwn?</dt> - <dd>Adeiladwyd y safle hwn gan <a href="http://www.mysociety.org/">mySociety</a>. - Mae mySociety yn brosiect elusen gofrestredig sydd wedi tyfu o gymuned o wirfoddolwyr a wnaeth adeiladu safleoedd fel <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. - Prif genhadaeth mySociety yw adeiladu prosiectau ar y Rhyngrwyd sy’n cynnig manteision syml, dirnadwy i bobl yn yr agweddau dinesig a chymunedol ar eu bywydau. Ein prosiect cyntaf oedd <a href="http://www.writetothem.com/">WriteToThem</a>, lle gallwch ysgrifennu at eich cynrychiolwyr etholedig, am ddim. - <a href="https://secure.mysociety.org/donate/">Cyfrannu at mySociety</a></dd> - <dt>Lle mae’r "cod gwreiddiol" i’r safle hwn?</dt> - <dd>Y meddalwedd wrth gefn y safle hwn yw cod agored, ac mae ar gael i chi yn bennaf o dan drwydded meddalwedd GNU Affero GPL. Gallwch <a - href="http://github.com/mysociety/fixmystreet"> lawrlwytho’r cod gwreiddiol</a> a’n helpu ni i’w ddatblygu. - Mae croeso i chi hefyd ei ddefnyddio yn eich prosiectau eich hunan, er bod rhaid i chi ryddhau’r cod gwreiddiol i unrhyw brosiectau o’r fath.</dd> - <dt>Pobl sy’n adeiladu pethau, nid sefydliadau. Pwy wnaeth ei adeiladu <em>go iawn</em>?</dt> - <dd>Ysgrifennwyd yr addasiad hwn o <a href="https://www.fixmystreet.com/">Fix­MyStreet</a> - gan Matthew Somerville. Diolch i’r - <a href="http://www.ordnancesurvey.co.uk">Arolwg Ordnans</a> (am y mapiau, - codau post y DU a chyfeiriadau’r DU – data © Hawlfraint y Goron, cedwir pob hawl - , Y Weinyddiaeth Gyfiawnder 100037819 2008), - Yahoo! am eu llyfrgelloedd JavaScript wedi’u trwyddedu gan BSD, y gymuned meddalwedd am ddim gyfan (daethpwyd â’r prosiect arbennig hwn i chi gan Perl, PostgreSQL, - a’r rhif 161.290) ac <a - href="http://www.bytemark.co.uk/">Bytemark</a> (sydd mor garedig â gwesteia’n holl weinyddion). - - Rhowch wybod i ni os ydym wedi hepgor unrhyw un.</dd> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/about/faq-en-gb.html b/templates/web/emptyhomes/about/faq-en-gb.html deleted file mode 100755 index 4b3e71ce2..000000000 --- a/templates/web/emptyhomes/about/faq-en-gb.html +++ /dev/null @@ -1,96 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Frequently Asked Questions') %] - -<h1>Frequently Asked Questions</h1> - <dl> - <dt>What is this site for?</dt> - <dd>This site is to help make it as easy as possible for you to get -empty homes in your area put back into use. It makes councils accountable for responding and dealing with the empty homes you -report.</dd> - <dt>How do I use the site?</dt> - <dd>Enter a postcode or address in the box on the homepage and you -are presented with a map of that area. Click where the empty property is, fill -in the details, upload a photo if you have one and press submit. That’s -it. </dd> - <dt>Is it free?</dt> - <dd>Yes. The costs of developing and running this site are shared -between the Empty Homes Agency, Shelter Cymru and Shlter Scotland through the generosity of their funders. We are all registered charities, so if you believe in their aims and would like to make a contribution, please do: -<a href="https://secure.thebiggive.org.uk/donate/donate.php?charity_id=6651">Empty Homes</a>, -<a href="http://www.sheltercymru.org.uk/Help/donating.aspx?ParentID=7&year=0&type=1&subcat=32&pageid=93">Shelter Cymru</a>, -<a href="http://scotland.shelter.org.uk/donate">Shelter Scotland</a>.</dd> - <dt>Do you remove silly or illegal content?</dt> - <dd>We reserve the right to remove any reports or updates -which we consider to be inappropriate.</dd> - <dt>How do councils bring empty properties back into use?</dt> - <dd><p>All councils in England and Wales have powers to bring empty -homes back into use. Many are very good at it, some are not. Most councils seek -to persuade and help the owner to bring their property back into use; they only -use legal powers such as Empty Dwelling Management Orders when help and -persuasion have failed.</p> <p> -Most empty homes are brought back into use eventually by their owner. But in -many cases this takes years. Empty homes often decline fast – they become -overrun with weeds and attacked by the weather. They are often used by -squatters, fly tippers, vandals and are sometimes subject to arson. The whole -neighbourhood suffers waiting for the owner to deal with their property.</p> <p> -Councils help and persuade owners to bring their properties into use faster. -Even so the process can be slow, especially if the property is in very poor -repair or the owner is unwilling to do anything. In most cases it takes six -months before you can expect to see anything change, occasionally longer. This -doesn’t mean the council isn’t doing anything, which is why we encourage -councils to update you to let you know what is happening.</p> <p> -If the empty home is owned by the government or one its agencies, councils are -often powerless to help. However you might be able to take action directly -yourself using the -<a href="http://emptyhomes.com/what-you-can-do-2/resources/prods-2/">Community Right to Reclaim Land</a> -</dd> - <dt>Will reporting an empty home make any difference?</dt> - <dd><p>Yes. Councils can make a real difference, but they have lots of -things to do. Many councils only deal with empty homes that are reported to -them. If people do not report empty homes, councils may well conclude that -other areas of work are more important.</p> <p> -</dt> - </dl> - <h2>Privacy Questions</h2> - <dl> - <dt>Who gets to see my email address?</dt> - <dd>If you submit an empty property, your details are provided to us and to the council. We will never give or sell your email address to -anyone else, unless we are obliged to by law.</dd> - <dt>Will you send nasty, brutish spam to my email address?</dt> - <dd>Never. We will email you if someone leaves an update on a -report you’ve made, and send you questionnaire emails four weeks and six months -after you submit a problem, asking for a status update; we’ll only ever -send you emails in relation to your report.</dd> - </dl> - <h2>Organisation Questions</h2> - <dl> - <dt>Who built this site?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</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. Their first project -was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your -elected representatives, for free. -<a href="https://secure.mysociety.org/donate/">Donate to mySociety</a></dd> - <dt>Where’s the "source code" to this site?</dt> - <dd>The software behind this site is open source, and available -to you mainly under the GNU Affero GPL software license. You can <a -href="http://github.com/mysociety/fixmystreet">download the -source code</a> and help us 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.</dd> - <dt>People build things, not organisations. Who <em>actually</em> built it?</dt> - <dd>This adaptation of <a href="https://www.fixmystreet.com/">Fix­MyStreet</a> -was written by Matthew Somerville. Thanks go to -<a href="http://www.ordnancesurvey.co.uk">Ordnance Survey</a> (for the maps, -UK postcodes, and UK addresses – data © Crown copyright, all -rights reserved, Ministry of Justice 100037819 2008), -Yahoo! for their BSD-licensed JavaScript libraries, the entire free software -community (this particular project was brought to you by Perl, PostgreSQL, -and the number 161.290) and <a -href="http://www.bytemark.co.uk/">Bytemark</a> (who kindly host all -our servers). - -Let us know if we’ve missed anyone.</dd> - </dl> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/alert/index.html b/templates/web/emptyhomes/alert/index.html deleted file mode 100644 index cbb2b45f9..000000000 --- a/templates/web/emptyhomes/alert/index.html +++ /dev/null @@ -1,5 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Local RSS feeds and email alerts') %] - -<h1>[% loc('Local RSS feeds and email alerts') %]</h1> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/around/extra_text.html b/templates/web/emptyhomes/around/extra_text.html deleted file mode 100644 index a69aa8fbf..000000000 --- a/templates/web/emptyhomes/around/extra_text.html +++ /dev/null @@ -1,9 +0,0 @@ -[% -# Need to ignore any county council -FOR coun IN all_areas.values; - SET council = coun IF coun.type != 'CTY'; -END; -%] -<a href="/local/[% c.cobrand.short_name(council) | lower %]/"> - Find out local news and stats for [% council.name %] -</a> diff --git a/templates/web/emptyhomes/contact/blurb.html b/templates/web/emptyhomes/contact/blurb.html deleted file mode 100644 index f1a2aa611..000000000 --- a/templates/web/emptyhomes/contact/blurb.html +++ /dev/null @@ -1,3 +0,0 @@ -<p> -[% loc('We’d love to hear what you think about this website. Just fill in the form. Please don’t contact us about individual empty homes; use the box accessed from <a href="/">the front page</a>.') %] -</p> diff --git a/templates/web/emptyhomes/footer.html b/templates/web/emptyhomes/footer.html deleted file mode 100644 index 29af4df9f..000000000 --- a/templates/web/emptyhomes/footer.html +++ /dev/null @@ -1,43 +0,0 @@ -</div> -</div> - -<div id="emptyhomes-footer"> - -<div> -Empty Homes<br> -14-16 Cowcross Street<br> -London<br> -EC1M 6DG<br> -Tel: 020 3135 0674<br> -Email: <a href="mailto:info@emptyhomes.com">info@emptyhomes.com</a> -</div> - -<div> -<i>In conjunction with,</i> -</div> - -<div> -<i>in Wales:</i><br> -Shelter Cymru<br> -[% lang_code == 'cy' ? '25 Heol Walter<br>Abertawe' : '25 Walter Road<br>Swansea' %] -<br>SA1 5NN<br> -<a href="mailto:emptyhomes@sheltercymru.org.uk">emptyhomes@sheltercymru.org.uk</a> -</div> - -<div> -<i>in Scotland:</i><br> -Scottish Empty Homes Partnership<br> -Shelter Scotland<br> -6 South Charlotte Street<br> -Edinburgh EH2 4AW<br> -Tel: 0344 515 2461<br> -<a href="mailto:EmptyHomes@shelter.org.uk">EmptyHomes@shelter.org.uk</a> -</div> - -</div> - -[% INCLUDE 'debug_footer.html' %] - -</body> -</html> - diff --git a/templates/web/emptyhomes/front/stats.html b/templates/web/emptyhomes/front/stats.html deleted file mode 100644 index 5ecc415bf..000000000 --- a/templates/web/emptyhomes/front/stats.html +++ /dev/null @@ -1,7 +0,0 @@ -[% stats = c.cobrand.front_stats_data %] - -<div id="front_stats"> - <div>[% tprintf( loc("<big>%s</big> reports"), stats ) %]</div> - <!-- <div><a href="/local/">[% loc('Find latest local and national news') %]</a></div> --> - <div id="eha-app-link"><a href="https://itunes.apple.com/gb/app/empty-homes-spotter/id482550587?mt=8">Get the Empty Homes Spotter App for iPhone</a></div> -</div> diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html deleted file mode 100644 index 0f6d1b3b8..000000000 --- a/templates/web/emptyhomes/header.html +++ /dev/null @@ -1,56 +0,0 @@ -<!doctype html> -<!--[if lt IE 7]><html class="ie6" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="ie7" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="ie8" lang="[% lang_code %]"><![endif]--> -<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]--> -<head> - -[% SET start = c.config.ADMIN_BASE_URL IF admin %] - - <link rel="stylesheet" type="text/css" href="[% start %][% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="[% start %][% version('/cobrands/emptyhomes/css/css.css') %]"> - [% INCLUDE 'common_header_tags.html' %] - -</head> -<body> - -<div id="header"> - <a href="http://www.emptyhomes.com/"><img id="eha-logo" border="0" src="/cobrands/emptyhomes/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="left"></a> - <div> - <small><em>in conjunction with</em></small> - <br> - <a href="http://www.sheltercymru.org.uk/"><img border="0" src="/cobrands/emptyhomes/Sheltercymru47s.png" alt="Shelter Cymru" width="80" height="33" align="bottom"></a> - <a href="http://scotland.shelter.org.uk/housing_issues/more_homes/empty_homes"><img border="0" src="/cobrands/emptyhomes/SEHPlogo-bwS.png" alt="Scottish Empty Homes Partnership" width="131" height="40" align="bottom"></a> - <a href="http://www.channel4.com/"><img src="/cobrands/emptyhomes/c4logo.png" border="0" alt="Channel 4" align="bottom" width="30" height="40"></a> - <a href="http://www.tigeraspect.co.uk/"><img src="/cobrands/emptyhomes/tiger-aspect.png" border="0" alt="Tiger Aspect" align="bottom" width="113" height="30"></a> - </div> -</div> - -<div id="navigation"> - <ul> - <li><a href="/">[% loc("Report a problem") %]</a></li> - <li><a href="/reports">[% loc("All reports") %]</a></li> - <li><a href="/faq">[% loc("Help") %]</a></li> - <li><a href="/about">[% loc('About us') %]</a></li> - [% IF lang_code == 'en-gb' %] - <li><a href="http://cy.[% c.cobrand.base_host %][% c.req.uri.path_query %]">Cymraeg</a></li> - [% ELSE %] - <li><a href="http://en.[% c.cobrand.base_host %][% c.req.uri.path_query %]">English</a></li> - [% END %] - </ul> -</div> - -<ul id="meta"> - [% IF c.user_exists %] - <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %] - <li><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> - [% ELSE %] - <li> </li> - [% END %] -</ul> - -<div id="wrapper"> -<div id="mysociety"> - - [% INCLUDE 'debug_header.html' %] - diff --git a/templates/web/emptyhomes/index-steps.html b/templates/web/emptyhomes/index-steps.html deleted file mode 100644 index c358205c0..000000000 --- a/templates/web/emptyhomes/index-steps.html +++ /dev/null @@ -1,13 +0,0 @@ -[%# NB: if the site is reenabled, this template should be deleted, -and we'll then defer to the version in templates/web/base/ again %] - -<h2> This site is currently suspended </h2> - -<ol class="big-numbers"> - - <li> If you would like to report an empty home, please contact your - local council in England or Empty Homes in Scotland</li> - <li> If you have recently reported an empty home you will be - contacted by email </li> - <li> If you have been contacted, please follow the instructions in your email </li> -</ol> diff --git a/templates/web/emptyhomes/index.html b/templates/web/emptyhomes/index.html deleted file mode 100644 index 1d17c3423..000000000 --- a/templates/web/emptyhomes/index.html +++ /dev/null @@ -1,57 +0,0 @@ -[% INCLUDE 'header.html', title = '' %] - -<div class="grid-50"> - <!-- - <h1 class="bl"> - <small>[% loc('Report, view, or discuss local problems') %]</small> - </h1> - - [% IF error %] - <p class="error">[% error %]</p> - [% END %] - - [% PROCESS 'around/postcode_form.html' %] - --> - - <div class="grid-50"> - [% INCLUDE 'front/stats.html' %] - </div> - -[% - recent_photos = c.cobrand.recent_photos('front', 2); - probs = c.cobrand.recent(); -%] -[% IF probs.size %] - <div class="grid-50"> - <h2 class="bl"><small>[% loc('Recently reported problems') %]</small></h2> - <ul id="nearby_lists"> - [% FOREACH p IN probs %] - <li> - <a href="/report/[% p.id %]">[% p.title | html %]</a> - <small>[% prettify_dt( p.confirmed, 1 ) %]</small> - </li> - [% END %] - </ul> - </div> -[% END %] - -</div> - -<div class="grid-50"> - <div id="eha_steps"> - [% INCLUDE 'index-steps.html', - question = c.cobrand.enter_postcode_text %] - </div> - - [% IF recent_photos.size %] - <p id="front_photos"> - [% FOREACH p IN recent_photos %] - <a href="/report/[% p.id %]"><img border="0" height="100" - src="[% p.photos.first.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> - [% END %] - </p> - [% END %] - -</div> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/report/banner.html b/templates/web/emptyhomes/report/banner.html deleted file mode 100644 index d473a777e..000000000 --- a/templates/web/emptyhomes/report/banner.html +++ /dev/null @@ -1,6 +0,0 @@ -[% IF problem.is_fixed %] -<p class="banner" id="fixed"> - [% loc('This problem has been fixed') %]. -</p> -[% END %] - diff --git a/templates/web/emptyhomes/report/new/councils_text_all.html b/templates/web/emptyhomes/report/new/councils_text_all.html deleted file mode 100644 index a2eae5efb..000000000 --- a/templates/web/emptyhomes/report/new/councils_text_all.html +++ /dev/null @@ -1,8 +0,0 @@ -<p> -[% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong>.') - all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) - ); -%] -</p> diff --git a/templates/web/emptyhomes/report/new/councils_text_none.html b/templates/web/emptyhomes/report/new/councils_text_none.html deleted file mode 100644 index 088e6fa1d..000000000 --- a/templates/web/emptyhomes/report/new/councils_text_none.html +++ /dev/null @@ -1,10 +0,0 @@ -<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.", - all_areas.size - ); -%] -[% loc("If you submit a report here it will be left on the site, but not reported to the council – please still leave your report, so that we can show to the council the activity in their area."); %] -</p> diff --git a/templates/web/emptyhomes/report/new/fill_in_details_form.html b/templates/web/emptyhomes/report/new/fill_in_details_form.html deleted file mode 100644 index 20b0b6842..000000000 --- a/templates/web/emptyhomes/report/new/fill_in_details_form.html +++ /dev/null @@ -1,142 +0,0 @@ -<h1>[% loc('Report your problem') %]</h1> - - [% IF report.used_map %] - <p class="change_location">[% loc('Wrong location? Just click again on the map.') %]</p> - [% 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 %] - -[% 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') - ); - %] - </p> -[% ELSE %] - [% PROCESS 'report/new/councils_text.html' %] -[% 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> - -[% INCLUDE 'errors.html' %] - -<div id="problem_form"> - -[% INCLUDE 'report/new/form_heading.html' %] - -<div class="fieldset"> - -[% IF field_errors.bodies %] - <div class='form-error'>[% field_errors.bodies %]</div> -[% END %] - -<div id="form_sign_in_yes"> - -<h3>[% loc('Public information (shown on site)') %]</h3> - -<p>[% loc('Please do not give address or personal information in this section.') %]</p> - -[% PROCESS "report/new/category_wrapper.html" %] - -[% IF field_errors.title %] - <div class='form-error'>[% field_errors.title %]</div> -[% END %] - -<div class="form-field"> - <label for="form_title">[% loc('Subject:') %]</label> - <input type="text" value="[% report.title | html %]" name="title" id="form_title" size="25" required> -</div> - -[% IF field_errors.detail %] - <div class='form-error'>[% field_errors.detail %]</div> -[% END %] - -<div class="form-field"> - <label for="form_detail">[% loc('Details:') %]</label> - <textarea name="detail" id="form_detail" rows="7" cols="26" required>[% report.detail | html %]</textarea> -</div> - -[% IF c.cobrand.allow_photo_upload %] - [% IF field_errors.photo %] - <div class='form-error'>[% field_errors.photo %]</div> - [% END %] - - <div class='form-field'> - [% IF upload_fileid || report.photo %] - <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> - [% IF upload_fileid %] - <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> - [% END %] - [% IF report.photo %] - <img align="right" src="/photo/[% report.id %].jpeg" hspace="5"> - [% END %] - [% END %] - - <label for="form_photo">[% loc('Photo:') %]</label> - <input type="file" name="photo" id="form_photo" style="width:20em"> - </div> -[% END %] - -</div> - -<div id="form_sign_in_no"> - -<h3>[% loc('Private information (not shown on site)') %]</h3> - -[% IF field_errors.address %] - <div class='form-error'>[% field_errors.address %]</div> -[% END %] - -<div class="form-field"> - <label for="form_address">[% loc('Property address:') %]</label> - <textarea name="address" id="form_address" rows="7" cols="26">[% report.extra.address | html %]</textarea> -</div> - - [% IF field_errors.name %] - <div class='form-error'>[% field_errors.name %]</div> - [% END %] - - <div class="form-field"> - <label for="form_name">[% loc('Your name:') %]</label> - <input type="text" required value="[% report.name | html %]" name="name" id="form_name" size="25"> - </div> - - [% IF field_errors.email %] - <div class='form-error'>[% field_errors.email %]</div> - [% END %] - - <div class="form-field"> - <label for="form_email">[% loc('Your email:') %]</label> - <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" size="25" required> - </div> - - <div class="form-field"> - <label for="form_phone">[% loc('Phone:') %]</label> - <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" size="15"> - <small>[% loc('(optional)') %]</small> - </div> - - <p> - <input type="submit" value="[% loc('Submit') %]"> - </p> - -</div> - -[% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> -[% END %] - -<input type="hidden" name="submit_problem" value="1"> - -</div> -</div> - diff --git a/templates/web/emptyhomes/report/new/fill_in_details_text.html b/templates/web/emptyhomes/report/new/fill_in_details_text.html deleted file mode 100644 index b557a9942..000000000 --- a/templates/web/emptyhomes/report/new/fill_in_details_text.html +++ /dev/null @@ -1,6 +0,0 @@ -[% loc('Please fill in details of the empty property below, saying what type of -property it is e.g. an empty home, block of flats, office etc. Tell us -something about its condition and any other information you feel is relevant. -There is no need for you to give the exact address. Please be polite, concise -and to the point; writing your message entirely in block capitals makes it hard -to read, as does a lack of punctuation.') %] diff --git a/templates/web/emptyhomes/report/new/form_heading.html b/templates/web/emptyhomes/report/new/form_heading.html deleted file mode 100644 index 911804a58..000000000 --- a/templates/web/emptyhomes/report/new/form_heading.html +++ /dev/null @@ -1 +0,0 @@ -<h2>[% loc('Empty property details form') %]</h2> diff --git a/templates/web/emptyhomes/report/new/notes.html b/templates/web/emptyhomes/report/new/notes.html deleted file mode 100644 index d355cc1ba..000000000 --- a/templates/web/emptyhomes/report/new/notes.html +++ /dev/null @@ -1 +0,0 @@ -[%# This file deliberately left empty - there are no notes for EmptyHomes %]
\ No newline at end of file diff --git a/templates/web/emptyhomes/reports/_ward-list.html b/templates/web/emptyhomes/reports/_ward-list.html deleted file mode 100755 index e69de29bb..000000000 --- a/templates/web/emptyhomes/reports/_ward-list.html +++ /dev/null diff --git a/templates/web/emptyhomes/reports/index.html b/templates/web/emptyhomes/reports/index.html deleted file mode 100755 index 8b8704134..000000000 --- a/templates/web/emptyhomes/reports/index.html +++ /dev/null @@ -1,29 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Summary reports') %] - -<p> -[% loc("This is a summary of all reports on this site; select a particular council to see the empty homes news for that area.") %] -</p> - -<table cellpadding="3" cellspacing="1" border="0"> -<tr> -<th>[% loc('Name') %]</th> -<th>[% loc('New problems') %]</th> -<th>[% loc('Older problems') %]</th> -</tr> - -[% FOREACH body IN bodies %] -<tr align="center" -[%- IF NOT body.areas.size %] class="gone" -[%- ELSIF loop.count % 2 %] class="a" -[%- END -%] -> -<td align="left"><a href="/local/[% c.cobrand.short_name(body) | lower %]/">[% body.name %]</a></td> -<td>[% open.${body.id}.new or 0 %]</td> -<td>[% (open.${body.id}.older or 0) + (open.${body.id}.unknown or 0) + (fixed.${body.id}.new or 0) + (fixed.${body.id}.old or 0) %]</td> -</tr> - -[% END %] -</table> - -[% INCLUDE 'footer.html' %] - diff --git a/templates/web/emptyhomes/site-name.html b/templates/web/emptyhomes/site-name.html deleted file mode 100644 index 7fd286328..000000000 --- a/templates/web/emptyhomes/site-name.html +++ /dev/null @@ -1 +0,0 @@ -[% loc('Report Empty Homes') %] diff --git a/templates/web/emptyhomes/tokens/confirm_problem.html b/templates/web/emptyhomes/tokens/confirm_problem.html deleted file mode 100644 index a8a025058..000000000 --- a/templates/web/emptyhomes/tokens/confirm_problem.html +++ /dev/null @@ -1,42 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Confirmation') %] - -<h1>[% loc('Confirmation') %]</h1> - -[% 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.' - ) - %]</p> - - <p>[% - loc( - 'It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn’t mean the council isn’t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step.' - ) - %]</p> - - <p>[% - loc( - 'We may contact you periodically to ask if anything has changed with the property you reported.' - ) - %]</p> - - <p>[% - loc( - 'Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK’s empty homes crisis.' - ) - %]</p> -[% ELSE %] - <p>[% - loc( 'Thank you for reporting this empty property on ReportEmptyHomes.com. -At present the report cannot be sent through to the council for this area. We -are working with councils to link them into the system so that as many areas -as possible will be covered.') - %]</p> -[% END %] - -<p> - <a href="[% c.uri_for( '/report', report.id ) | html %]">[% loc('View your report') %]</a>. -</p> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html index ac607be8a..5bc0eaf4b 100644 --- a/templates/web/fiksgatami/header.html +++ b/templates/web/fiksgatami/header.html @@ -24,7 +24,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html' %] [% extra_js %] [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] diff --git a/templates/web/fixmybarangay/_barangay_buttons.html b/templates/web/fixmybarangay/_barangay_buttons.html deleted file mode 100644 index 2925a487d..000000000 --- a/templates/web/fixmybarangay/_barangay_buttons.html +++ /dev/null @@ -1,4 +0,0 @@ -<p id="barangay_buttons"> - <a href="/around?latitude=10.322;longitude=123.907" class="yellow-btn">Bgy. Luz</a> - <a href="/around?latitude=10.288;longitude=123.870" class="yellow-btn">Bgy. Basak San Nicolas</a> -</p> diff --git a/templates/web/fixmybarangay/about/faq-en-gb.html b/templates/web/fixmybarangay/about/faq-en-gb.html deleted file mode 100644 index 6e8893143..000000000 --- a/templates/web/fixmybarangay/about/faq-en-gb.html +++ /dev/null @@ -1,167 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %] - -<div class="sticky-sidebar"> - <aside> - <ul class="plain-list"> - <li><a href="#faq">Frequently Asked Questions</a></li> - <li><a href="#practical">Staff Questions</a></li> - <li><a href="#organisation">Organisation Questions</a></li> - </ul> - </aside> -</div> - -<h1><a name="faq"></a>Frequently Asked Questions</h1> - <dl> - <dt>What is FixMyBarangay?</dt> - <dd>FixMyBarangay is a site to help people report, view, -or discuss local problems they’ve found to the city departments. -The pilot project lets you report the problems by SMS (or dropping -into the barangay center). -</dd> - <dt>What areas are covered?</dt> - <dd> - The pilot project is just running in two barangays in Cebu – - Luz and Basak San Nicolas. - </dd> - <dt>What sort of problems should I report with FixMyBarangay?</dt> - <dd>The FixMyBarangay pilot project is just for potholes (and similar - road surface problems) and broken streetlights. - </dd> - - <dt>What isn’t FixMyBarangay for?</dt> - <dd>FixMyStreet is not a way of getting in touch with Cebu City Hall for other problems - – please use FixMyBarangay only for potholes and streetlights while the pilot - project is running.. - </dd> - - <dt>Staff only: How do I use the site?</dt> - <dd>If you have a staff login, you can view problems already reported in that area, -or report ones of your own simply by clicking on the map at the location of -the problem.</dd> - <dt>How are the problems solved?</dt> - <dd>Problems sent by SMS are initially handled by the barangay staff – they'll - confirm the problem and report it to the relevant department automatically. - Once it's in the department's problem-tracking system, they'll get onto it as - soon as they can.</dd> - <dt>Is it free?</dt> - <dd>The site is free to use, yes. The pilot project has been funded by the World Bank.</dd> - - </dl> - - <h2><a name="practical"></a>Staff questions</h2> - <dl> - <dt>What's my login?</dt> - <dd> - You can use your email address and set a password right away, but your - account won't be enabled as a <em>staff account</em> until one of the - system administrators has checked it. If you're not sure who to contact, try - <a href="mailto:[% c.config.CONTACT_EMAIL %]">[% c.config.CONTACT_EMAIL %]</a>. - </dd> - <dt>I've forgotten my password, what do I do?</dt> - <dd> - No problem — when you log in, if you can't remember your password we'll - send you a confirmation link which lasts for one session, and you can - reset your password once you've clicked on that. - </dd> - <dt>How do I sign out?</dt> - <dd> - Either click on <a href="/auth/sign_out">sign out</a> on the page you're on, - or quit the browser (just closing the window without quitting the browser is not enough). - </dd> - <dt>Reporting</dt> - <dd><p> - To make a new report, start by clicking on the button for either barangay <em>BSN</em> or <em>Luz</em>. - </p> - <ul> - <li> - <strong>To create a standalone report</strong> simply click on the map where the problem is. - </li> - <li> - <strong>To create a report from a text message</strong> log into Message Manager (see below), - then select the message you want to use (click on the radio button). When the message has gone - green, you can click on the map and the message will automatically be used to create the report. - You can edit the text, but that report will be associated with that incoming message. - </li> - </ul> - <p> - Once you've placed the pin, but before you press <em>Submit</em>, you can drag or reposition the pin - if you want to change its position. - </p> - <p> - Choose the category for this report ‐ obviously, this helps FixMyBarangay decide to which - department the report will be sent. - </p> - </dd> - <dt>How do I see the SMS messages people have sent?</dt> - <dd>When you look at the barangay problems, click on <em>Problems via text</em> - (or, if you're viewing a specific report, click <em>Show messages</em>) to see the - currently available messages. You'll need a username and password - for the Message Manager (your manager will have told you what these - are). Note that you can only see messages that have not yet been used to - create a report (and also their replies). - </dd> - <dt>Is my Message Manager username and password the same as the ones I use for FixMyBarangay?</dt> - <dd> - No, it's a separate account (some FMB users don't have any access to the SMS messages). - Your manager will tell you what your login for Message Manager system is, if you have one. - </dd> - <dt>I tried to work with a message but it said "Someone is working with that message right now!" What's up?</dt> - <dd> - This means another staff member has a "lock" on the message. To prevent you both creating - a report, or sending a reply, we use a first-come-first-serve locking mechanism. - Collisions like this are rare, but if they do happen, try again a few minutes later - because the lock may have expired by then. - </dd> - <dt>Can I delete a message?</dt> - <dd> - Yes. Click on the red cross when you hover over it (although really you're only hiding it so - it never gets shown within FixMyBarangay). - You need a manager's account in the Message Manager to be able to see any - messages that have been hidden, so hiding them is as good as deleting them. - </dd> - <dt>It looks like an incoming message is wrongly shown as a reply. Can I fix it?</dt> - <dd> - FixMyBarangay tries to recognise SMS replies, and automatically matches them to the right thread. If it - gets this wrong you can click on the <em>detach</em> button. The message will then be a new "available" - message. If Message Manager got it wrong the other way round, and missed a reply, you can fix this too - but you need to log into Message Manager with a manager's account to do it. - </dd> - <dt>How do the replies get back to the original sender?</dt> - <dd> - Although you're replying from within FixMyBarangay, the replies are sent by SMS. - There may be a delay of a several minutes between the moment you press <strong>reply</strong> - and the message's arrival. - </dd> - <dt>How can I tell the original sender their problem has been fixed?</dt> - <dd> - Go to the report. If the report is marked "this report was submitted by SMS", you can send a reply. - Click on <em>Show Messages</em>. When the messages appear, click on <em>Show messages for - <strong>this</strong> report</em>. Hover over the message you want to send the message to, and - click <em>Reply</em>. - </dd> - - <h2><a name="organisation"></a>Organisation Questions</h2> - <dl> - <dt>Who built FixMyBarangay?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="www.worldbank.org/">World Bank</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.com</a> in the UK. -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:<br> -mySociety<br> -483 Green Lanes<br> -London<br> -N13 4BS<br> -UK</dd> - <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> - <dd> -The software behind this site is open source, and available -to you mainly under the GNU Affero GPL software license. -See <a href="http://fixmystreet.org/">fixmystreet.org</a> for more information about setting up -and running sites like these. -</dd> - </dl> -[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmybarangay/alert/_list.html b/templates/web/fixmybarangay/alert/_list.html deleted file mode 100644 index 8491b4562..000000000 --- a/templates/web/fixmybarangay/alert/_list.html +++ /dev/null @@ -1,45 +0,0 @@ - <input type="hidden" name="type" value="local"> - <input type="hidden" name="pc" value="[% pc | html %]"> - - - <p> - [% loc("Subscribe to an alert based upon what baranagay you’re in:") %] - </p> - - [% INCLUDE 'errors.html' %] - - <div id="rss_list"> - <p><strong> - [% loc('Problems within the boundary of:') %] - </strong></p> - <ul class="plain-list"> - - [% FOREACH option IN options %] - <li[% IF ! (loop.count % 2) %] class="a"[% END %]> - <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label class="inline" for="[% option.id %]">[% option.text %]</label> - <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" -title="[% option.rss_text %]" alt="RSS feed" border="0"></a> - </li> - [% END %] -</ul> - - <p> - <input type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> - <p> - - <p id="alert_or"> - [% loc('or') %] - </p> - - [% UNLESS c.user_exists %] - <p> - [% loc('Your email:') %] <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]" size="30"> - </p> - [% END %] - - <p> - <input type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> - </p> - </div> <!-- ???? --> - diff --git a/templates/web/fixmybarangay/alert/index.html b/templates/web/fixmybarangay/alert/index.html deleted file mode 100644 index c842a7683..000000000 --- a/templates/web/fixmybarangay/alert/index.html +++ /dev/null @@ -1,45 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %] - -<h1>[% loc('Local RSS feeds and email alerts') %]</h1> - -<p> -FixMyBarangay has a RSS feeds and email alerts for local problems. -</p> - -[% IF location_error %] - <div class="error">[% location_error %]</div> -[% ELSE %] - [% INCLUDE 'errors.html' %] -[% END %] - -[% options = [ { - id => 'area:1:Luz', - text => 'Luz', - uri => '/rss/area/Luz' - }, - { - id => 'area:2:Basak_San_Nicolas', - text => 'Basak San Nicolas' - uri => '/rss/area/Basak+San_Nicolas' - } ]; -%] - -<form id="alerts" name="alerts" method="post" action="/alert/subscribe"> - -[% IF photos.size %] -<div id="alert_recent"> - <aside> - <h2>[% loc('Some photos of recent reports') %]</h2> - [% FOREACH p IN photos %] - <a href="/report/[% p.id %]"><img border="0" height="100" - src="[% p.photos.first.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> - [% END %] - </aside> -</div> -[% END %] - -[% INCLUDE 'alert/_list.html' %] - -</form> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmybarangay/around/intro.html b/templates/web/fixmybarangay/around/intro.html deleted file mode 100644 index b876de453..000000000 --- a/templates/web/fixmybarangay/around/intro.html +++ /dev/null @@ -1,2 +0,0 @@ - <h1>View local problems</h1> - <h2>(potholes or street lighting)</h2> diff --git a/templates/web/fixmybarangay/around/tabbed_lists.html b/templates/web/fixmybarangay/around/tabbed_lists.html deleted file mode 100644 index f2f257b03..000000000 --- a/templates/web/fixmybarangay/around/tabbed_lists.html +++ /dev/null @@ -1,18 +0,0 @@ -[% allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_body); - -IF allow_creation %] -<menu id="problems-nav" class="tab-nav"> - <ul> - <li><a href="#current">Problems on the map</a></li> - <li><a href="#message_manager">Problems via text</a></li> - </ul> -</menu> -[% END %] - -<ul id="current" class="item-list item-list--reports tab"> - [% INCLUDE "around/on_map_list_items.html" %] -</ul> - -[% IF allow_creation %] - [% INCLUDE 'report/_message_manager.html' %] -[% END %] diff --git a/templates/web/fixmybarangay/footer.html b/templates/web/fixmybarangay/footer.html deleted file mode 100644 index d1f9203f2..000000000 --- a/templates/web/fixmybarangay/footer.html +++ /dev/null @@ -1,188 +0,0 @@ - </div><!-- .content role=main --> - </div><!-- .container --> - </div><!-- .table-cell --> - - <div class="nav-wrapper"> - <div class="nav-wrapper-2"> - <div id="main-nav" role="navigation"> - <ul class="nav-menu nav-menu--mysoc"> - <li><a id="mysoc-logo" href="http://www.mysociety.org/">mySociety</a></li> - </ul> - - <ul class="nav-menu nav-menu--main"> - <li><a href="/around?latitude=10.322;longitude=123.907" class="fmb-bgy-btn">Luz</a></li> - <li><a href="/around?latitude=10.288;longitude=123.870" class="fmb-bgy-btn">BSN</a></li> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" - >View problems</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END - %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END - %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> - </ul> - </div> - </div> - </div> - -[% IF global.want_fmb_hidden_dialogs %] - <!-- fancybox hidden dialogues for message-manager reply/hide/help --> - <div style="display:none"> - <div id="reply-form-container"> - <form action="#" id="reply-form" onsubmit="event.returnValue = false; return false;" method="post" accept-charset="utf-8"> - <div style="display:none;"> - <input type="hidden" name="_method" value="POST"/> - </div> - <!-- populated by Ajax call --> - <div class="input" id="mm-boilerplate-replies-box"> - <label for="boilerplate-replies">Use preloaded reply:</label> - <select name="boilerplate-replies" id="mm-boilerplate-replies"></select> - </div> - <div class="input text"> - <label for="reply_text">Reply text</label> - <textarea name="reply_text" id="reply_text" cols="32" rows="3"></textarea> - </div> - <input type="hidden" name="message_id" id="reply_to_msg_id"/> - <div class="submit"> - <input id="reply-submit" type="submit" value="Send Reply"/> - </div> - </form> - </div> - </div> - <div style="display:none"> - <div id="hide-form-container"> - <p style="color:#000">Hiding message: <span id="hide-form-message-text"></span></p> - <form action="#" id="hide-form" onsubmit="event.returnValue = false; return false;" method="post" accept-charset="utf-8"> - <div style="display:none;"> - <input type="hidden" name="_method" value="POST"/> - </div> - <!-- populated by Ajax call --> - <div class="input" id="mm-boilerplate-hide-reasons-box"> - <label for="boilerplate-hide-reasons">Use preloaded reason:</label> - <select name="boilerplate-hide-reasons" id="mm-hide-reasons"></select> - </div> - <div class="input textarea"> - <label for="reason_text">Reason for hiding message</label> - <textarea name="reason_text" id="reason_text" cols="32" rows="3"></textarea> - </div> - <input type="hidden" name="msg_id" id="hide_msg_id"/> - <div class="submit"> - <input id="hide-submit" type="submit" value="Hide Message"/> - </div> - </form> - </div> - </div> - <div style="display:none"> - <div id="detach-form-container" class="fancybox-popup"> - <p> - Are you sure you want to detach this message? - </p> - <p> - Message Manager probably thinks this message is a reply because - it came in from a number to which we'd recently sent an outward reply. - </p> - <p> - If you detach the message, it will appear as a new, available message (instead of being a reply). - </p> - <form action="/dummy" id="detach-form" onsubmit="event.returnValue = false; return false;" method="post" accept-charset="utf-8"> - <div style="display:none;"> - <input type="hidden" name="_method" value="POST"> - </div> - <input type="hidden" name="msg_id" id="detach_msg_id"> - <div class="submit"> - <input id="detach-submit" type="submit" value="Detach Message"> - </div> - </form> - </div> - </div> - <div style="display:none"> - <div id="mm-help" style="font-size:90%;"> - <h2> Accessing Message Manager from FixMyBarangay (FMB)</h2> - <h3> - Logging into Message Manager - </h3> - <p> - You'll need a username and password (ask your manager if you haven't already got one). Your Message Manager password - might not be the same as your FMB password. - </p> - <p> - When you've logged in, you'll see the currently available messages (and any replies that have been sent to them). - You <em>only</em> see messages that are waiting to be used to make reports, and which are tagged with the keywords - your login allows you to see (these may mean you only see messages for your own barangay). - If you want to see any other messages, you'll need to have a manager or admin account on Message Manager: click on the - <a href="[% c.config.MESSAGE_MANAGER_URL %]">admin</a> link to get there. - </p> - <p> - [% IF global.is_fmb_creation_page %] - <h3> - Creating a new report from a message - </h3> - <p> - If you want to use a message to create a problem report, you'll need to select it first. Click on the radio button. When the message - is selected, it will go bright green. Now when you click on the map, the report will be used to create the report. - </p> - <p> - To stop two people replying to a message at the same time, if anyone else has just started working on it, you'll see a message - warning you, and you won't be able to select the radio button. Normally, if nobody works with a message, such a lock is released - after about 3 minutes. - </p> - [% ELSE %] - <p> - Click <strong>show messages for this report</strong> to see - the message (or messages) that contributed to this report. Often this will be a single message - if the problem was submitted by SMS. But it will also include any messages that have been - added as updates, as well as any replies that were sent back by barangay staff. - As well as letting you review the background to the report, this also lets you reply (for example, - to notify the original reporter that the problem has been fixed). - </p> - <h3> - Adding a message as an update to this report - </h3> - <p> - If you want to add this message's contents as an update to this report, you'll need to select it first. Click - on the radio button. When the message is selected, it will go bright green. Now when you click on the - <strong>COPY TO UPDATE</strong> button, the message text will be added to this report's update text. - You can edit the text before clicking <strong>POST</strong>. - </p> - [% END %] - <h3> - <span class="demo_detach_btn">detach</span> Detaching a message ("not a reply") - </h3> - <p> - Message Manager tries to notice when an incoming message is a reply. Sometimes it guesses wrong. To detach a - message from its parent — that is, to mark it as <em>not a reply</em>, hover over the message and click - <span class="demo_detach_btn">detach</span>. - </p> - - <h3> - <span class="demo_reply_btn">reply</span> Replying to a message - </h3> - <p> - You can send an SMS back to the original sender: just hover over the message and click <span class="demo_reply_btn">reply</span>. It will usually - take a few minutes for the message to arrive. - </p> - <h3> - <span class="demo_info_btn">i</span> Getting message info - </h3> - <p> - Hover over a message and click on its <span class="demo_info_btn">i</span> button to see when it was sent. - You can also see the sender, although not their - actual number (instead the number is scrambled, but will be the <em>same scrambled number</em> on other messages they've sent). - </p> - <h3> - <span class="demo_hide_btn">X</span> Hiding a message - </h3> - <p> - If a message can't be used to create a report, you can hide it by hovering over it and clicking its <span class="demo_hide_btn">X</span> button. If you're not - going to create a problem report with this message, you might like to reply first, to tell the person who sent the message why not. - When you click the X, give a reason why you're hiding it so other staff (managers in Message Manager) can see why the message was hidden. - </p> - </div> - </div> - -[% END %] - -<!-- [% INCLUDE 'debug_footer.html' %] --> - </div> <!-- .wrapper --> -</body> -</html> diff --git a/templates/web/fixmybarangay/header.html b/templates/web/fixmybarangay/header.html deleted file mode 100644 index 739f4c761..000000000 --- a/templates/web/fixmybarangay/header.html +++ /dev/null @@ -1,79 +0,0 @@ -<!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]--> -<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]--> -<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> - <head> - <meta name="viewport" content="initial-scale=1.0"> - - <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> - <meta name="HandHeldFriendly" content="true"> - <meta name="mobileoptimized" content="0"> - -[% SET start = c.config.ADMIN_BASE_URL IF admin %] - - <link rel="stylesheet" href="[% start %][% version('/cobrands/fixmybarangay/base.css') %]"> - <link rel="stylesheet" href="[% start %][% version('/cobrands/fixmybarangay/layout.css') %]" media="(min-width:48em)"> - [% extra_css %] - <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% start %][% version('/cobrands/fixmybarangay/layout.css') %]"> - <![endif]--> - - <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> - <script src="[% start %][% version('/cobrands/fixmybarangay/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html' js_override = '/cobrands/fixmystreet/fixmystreet.js' %] - [% extra_js %] - - [% allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_body); %] - [% IF allow_creation %] - <link rel="stylesheet" href="[% start %][% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> - <script src="[% start %][% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> - <script src="[% start %][% version('/cobrands/fixmybarangay/message_manager_client.js') %]" charset="utf-8"></script> - <script> - $(document).ready(function() { - - $('#mm_sign_out').click(function(){ - message_manager.sign_out(); - }); - - [% IF c.req.params.external_source_id && problem && problem.external_source_id.match('^\d+$') %] - var mm_msg_id ="[% c.req.params.external_source_id %]"; - var fms_id = "[% problem.id %]"; - if (mm_msg_id && fms_id) { - message_manager.config({url_root: "[% c.config.MESSAGE_MANAGER_URL %]"}); - message_manager.assign_fms_id(mm_msg_id, fms_id); - } - [% END %] - }); - </script> - [% END %] - </head> - <body class="[% bodyclass | html IF bodyclass %]"> - - <div class="wrapper"> - <div class="table-cell"> - <header id="site-header" role="banner"> - <div class="container"> - <a href="/" id="site-logo">FixMyBarangay</a> - <a href="#main-nav" id="nav-link">Main Navigation</a> - </div> - </header> - - <div id="user-meta"> - [% IF c.user_exists %] - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out" id="mm_sign_out">[% loc('sign out') %]</a> - </p> - [% ELSE %] - <!-- <a href="/auth">[% loc('Sign in') %]</a> --> - [% END %] - </div> - - [% pre_container_extra %] - - <div class="container"> - <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> - - <!-- [% INCLUDE 'debug_header.html' %] --> diff --git a/templates/web/fixmybarangay/report/_message_manager.html b/templates/web/fixmybarangay/report/_message_manager.html deleted file mode 100644 index e937066ff..000000000 --- a/templates/web/fixmybarangay/report/_message_manager.html +++ /dev/null @@ -1,312 +0,0 @@ -[% IF c.user && c.user.from_body %] - -[% IF problem.external_source_id && problem.external_source == c.config.MESSAGE_MANAGER_URL %] - <p class="mm-submitted-by-sms"> - [%# OK to link to Message Manager here because (currently) we're only showing this to staff users %] - <a href="[%= problem.external_source %]messages/view/[%= problem.external_source_id %]" - title="view in Message Manager admin"><img - src="/cobrands/fixmybarangay/images/mobile-22x40.png" alt="SMS"></a> - This report was submitted via SMS. - </p> -[% END %] - -[% IF problem.id %] - <div id="mm-container-for-report-btns"> - <input type="button" class="green-btn" value="Show Messages" id="show_messages"> - </div> -[% END %] - -<ul id="message_manager" class="item-list item-list--reports tab" style="display: none"> - <li id="mm-admin-buttons"> - [% IF problem.id %] - <a style="float:left" id="mm-link-to-toggle-archive" href="#" title="show the message(s) associated with this report">show message for <b>this</b> report</a> - [% END %] - <a id="mm-link-to-refresh" href="#" title="update list of messages">refresh</a> - <a id="mm-link-to-admin" href="[% c.config.MESSAGE_MANAGER_URL %]" title="jump to Message Manager admin">admin</a> - <a id="mm-link-to-help" href="#mm-help" title="show help information">help</a> - </li> - <li id="message-control"> - <div id="mm-username-container">username: <span id="mm-received-username"></span></div> - <div id="mm-status-message-container"> - <img id="mm-spinner" src="/cobrands/fixmybarangay/images/fmb-spinner-16x16.gif" alt=""/> - <p id="mm-status-message"></p> - </div> - <div id="mm-login-container"> - <div> - <label for="mm-htauth-username">Username:</label> - <input name="mm-htauth-username" id="mm-htauth-username" type="text"/> - </div> - <div> - <label for="mm-htauth-password">Password:</label> - <input name="mm-htauth-password" id="mm-htauth-password" type="password"/> - </div> - <div class="submit"> - <input id="available-submit" type="submit" value="Get available messages" class="green-btn"/> - </div> - </div> - </li> - <li> - <div id="mm-message-list" style="min-height:1em;"></div> - </li> -</ul> - -<script type="text/javascript"> - -$(document).ready(function() { - var $mm_message_list = $('#mm-message-list'); - var mm_url = "[% c.config.MESSAGE_MANAGER_URL %]"; // from config - - [%# note that the presence of a problem id implies that this is a report view page, not a problem creation page %] - var problem_id = "[% problem.id %]"; - - var dummy_busy = false; - var fms_username = "[% c.user.email | replace('\@.*', '') %]"; - var timeout_id = 0; - var can_refresh = true; // disable refresh - var refresh_period = 60000 * 3; // refresh messages every three minutes - var has_archive_message = false; - - function sanitise_id(css_id) { - return css_id.replace(/\D/g, ""); - } - - // call this to push the auto-refresh timeout off so it's only triggered - // if there's no activity for a while - function reset_timeout() { - if (mm_url && refresh_period && can_refresh) { - if (timeout_id) { - clearTimeout(timeout_id); - } - timeout_id = setTimeout(mm_refresh_messages, refresh_period); - } - } - - var mm_refresh_messages = function() { - $('#mm-link-to-refresh').fadeOut(); - $('#available-submit').click(); - } - - var mm_populate_list = function(data) { - $('#mm-status-message-container').find('p').text("Accessed Message Manager as " + data['username']); - $('input[name=mm_text]').prop('checked', false); // uncheck all - $('#mm-link-to-refresh').delay(2000).fadeIn(); - reset_timeout(); - } - - var mm_selected_message = function(data) { - var msg_text = ""; - var service_id = ""; - $('li.msg-is-active', $mm_message_list).removeClass('msg-is-active'); - if (data['success']) { - // msg_text = $('#form_detail').val( $('input[name=mm_text]:checked').val() ); # == message data - msg_text = data['data']['Message']['message']; - service_id = data['data']['Message']['id']; - $('#msg-' + service_id).addClass('msg-is-active'); - } else { - $('input[name=mm_text]').prop('checked', false); // uncheck all - } - $('#form_detail').val(msg_text); - $('#external_source_id').val(service_id); - } - - var reply_cleanup = function(data) { - reset_timeout(); - $('#reply_text').val(''); - dummy_busy = false; - mm_refresh_messages(); - } - - var hide_cleanup = function(data) { - reset_timeout(); - $('#reason_text').val(''); - dummy_busy = false; - } - - var detach_cleanup = function(data) { - reset_timeout(); - dummy_busy = false; - mm_refresh_messages(); // refresh because detached message now appears in the list - } - - var custom_tooltips; - if (problem_id) { // this page is viewing, not creating - custom_tooltips = {tt_radio: "Select before clicking 'Copy to Update' to add this message as an update"}; - } - message_manager.config({ - url_root: mm_url, - tooltips: custom_tooltips, - want_nice_msgs: true - }); - message_manager.setup_click_listener({callback:mm_selected_message}); - - // problem form hidden input "external_source_id": pass the MM id into FMS, if used - var $problem_form = $('#problem_form').size()? $('#problem_form') : $('#form_update_form'); - $('<input type="hidden"/>').attr({ - 'id': 'external_source_id', - 'name': 'external_source_id', - }).appendTo($problem_form); - - $('#available-submit').click(function(e){ - e.preventDefault(); - reset_timeout(); - message_manager.get_available_messages({ - callback: mm_populate_list, - suggest_username: fms_username, - fms_id: problem_id, - anim_duration: 500 - }); - }); - $('#available-submit').click(); - - $mm_message_list.on('mouseover', 'li.mm-msg', function(e){ - e.stopPropagation(); // because replies are nested - $('.mm-msg-action', $mm_message_list).stop().fadeOut(200); - $(this).find('> .mm-msg-action').stop().show(); - }); - - $('#mm-message-list').on('click', '.mm-info', function(e){ - reset_timeout(); - message_manager.show_info(sanitise_id($(this).parent().attr('id'))); - }); - - $('#mm-hide-reasons').change(function(e){ - $('#reason_text').val($(this).val()); // load reason_text with boilerplate reason - }); - $('#mm-boilerplate-replies').change(function(e){ - var old_txt = $('#reply_text').val(); - var new_txt = $(this).val().replace(/(^\.\.\.|\.\.\.$)/, old_txt); - $('#reply_text').val(new_txt); // load reply_text with boilerplate reason - }); - - $('#reply-submit').click(function(e) { - e.preventDefault(); - // TODO: pending fancybox callbacks working, force dummy_busy here - // this is possibly overly cautious anyway - dummy_busy = false; - if (! dummy_busy) { - dummy_busy = true; - message_manager.reply( - $('#reply_to_msg_id').val(), - $('#reply_text').val(), - {callback:reply_cleanup}); - } - }); - - $('#hide-submit').click(function(e) { - e.preventDefault(); - reset_timeout(); - // TODO: pending fancybox callbacks working, force dummy_busy here - // this is possibly overly cautious anyway - dummy_busy = false; - if (! dummy_busy) { - dummy_busy = true; - message_manager.hide( - $('#hide_msg_id').val(), - $('#reason_text').val(), - {callback:hide_cleanup}); - } - }); - - $('#detach-submit').click(function(e) { - e.preventDefault(); - if (! dummy_busy) { - dummy_busy = true; - message_manager.mark_as_not_a_reply( - $('#detach_msg_id').val(), - {callback:detach_cleanup}); - } - }); - - $("a#reply").fancybox({onClosed: function(){dummy_busy=false;}}); - - // only show on problem display page - if (problem_id) { - $('<input type="button" value="Copy to update"/>').attr({ - 'id': 'copy_to_update', - 'name': 'copy_to_update', - 'class': 'green-btn', - 'title': "add the selected message's text as an update to this report" - }).appendTo($('#mm-container-for-report-btns')); - } - - $('#copy_to_update').click(function(e){ - reset_timeout(); - e.preventDefault(); - $('#mm-message-list input:checked').each( function(index) { - var id = $(this).attr('id'); - id = id.replace('mm_text_',''); - $('#external_source_id').val(id); - $('#form_update').val( $(this).val() ); - $('#form_update_form').on('submit', function(e) { - message_manager.assign_fms_id( $('#external_source_id').val(), problem_id, { 'is_async': false } ); - }); - }); - }); - - $('#show_messages').on('click', function(e) { - $('#message_manager').slideToggle(1000); - if ($('#show_messages').val() == 'Show Messages') { - $('#show_messages').val('Hide Messages'); - $('#copy_to_update').stop(true,true).fadeIn(); - } else { - $('#show_messages').val('Show Messages'); - $('#copy_to_update').stop(true,true).fadeOut(); - } - - }); - - $('#mm-link-to-refresh').on('click', function(e) { - e.preventDefault(); - mm_refresh_messages(); - }); - - // suppress fading control while archive messages are displayed, for now - $('#mm-link-to-toggle-archive').on('click', function(e) { - e.preventDefault(); - $('#mm-link-to-toggle-archive').fadeOut(); - if ($('.mm-current', $mm_message_list).is(':visible')) { - $('#copy_to_update').stop(true,true).fadeOut(); - $('#mm-link-to-refresh').stop(true,true).fadeOut(); - $('.mm-empty', $mm_message_list).stop(true,true).fadeOut(); - $('.mm-current', $mm_message_list).stop(true,true).slideUp(1000, function(){ - if($('.mm-archive', $mm_message_list).find('li').length == 0) { - message_manager.say_status("No messages found for this report,"); - } else { - message_manager.say_status("Messages for this report:"); - }; - $('.mm-archive', $mm_message_list).stop(true,true).slideDown(1000, function(){ - $('#mm-link-to-toggle-archive').html('show all available messages') - .attr('title', 'show all available messages (for adding updates)'); - $('#mm-link-to-toggle-archive').fadeIn(); - can_refresh = false; - }) - }); - } else { - $('.mm-archive', $mm_message_list).stop(true,true).slideUp(1000, function(){ - message_manager.say_status("Available messages:"); - $('.mm-current', $mm_message_list).stop(true,true).slideDown(1000, function(){ - $('#mm-link-to-toggle-archive').html("show message for <b>this</b> report") - .attr('title', 'show the original message(s) for this report'); - $('#copy_to_update').stop(true,true).fadeIn(); - $('#mm-link-to-toggle-archive').stop(true,true).fadeIn(); - $('#mm-link-to-refresh').stop(true,true).fadeIn(); - $('.mm-empty', $mm_message_list).stop(true,true).fadeIn(); - can_refresh = true; - reset_timeout(); - }) - }); - } - }); - - $("a#mm-link-to-help").fancybox(); - - message_manager.populate_boilerplate_strings('hide-reason'); - message_manager.populate_boilerplate_strings('reply'); -}); - -</script> - -[% global.want_fmb_hidden_dialogs = 1 %] -[% global.is_fmb_creation_page = problem.id? 0 : 1 %] - -[% END %] diff --git a/templates/web/fixmybarangay/report/new/councils_text.html b/templates/web/fixmybarangay/report/new/councils_text.html deleted file mode 100644 index 0001b0e68..000000000 --- a/templates/web/fixmybarangay/report/new/councils_text.html +++ /dev/null @@ -1,5 +0,0 @@ -<p> -The information provided here will be displayed publicly on the site as well as being sent to the -relevant authority (DPWH, DEPW, or DPS). -If you select a "bgy. will fix" category, then your report will be emailed to the barangay team. -</p> diff --git a/templates/web/fixmybarangay/report/new/fill_in_details_text.html b/templates/web/fixmybarangay/report/new/fill_in_details_text.html deleted file mode 100644 index 51dc1e3f1..000000000 --- a/templates/web/fixmybarangay/report/new/fill_in_details_text.html +++ /dev/null @@ -1,12 +0,0 @@ -[% - IF area_ids_to_list.size != 0; - loc('Please fill in details of the problem below. Leave as much detail as you can, -and if possible describe the exact location of -the problem (e.g. if there is a streetlight number or road name).'); - IF category_extras; - ' ' _ loc('Some categories may require additional information.'); - END; - ELSE; - loc('Please fill in details of the problem below.'); - END; -%] diff --git a/templates/web/fixmybarangay/report/new/notes.html b/templates/web/fixmybarangay/report/new/notes.html deleted file mode 100644 index c330816b9..000000000 --- a/templates/web/fixmybarangay/report/new/notes.html +++ /dev/null @@ -1,7 +0,0 @@ -<p>[% loc("Please note:") %]</p> - -<ul class="plain-list"> - <li>[% loc("Be sure to choose the right category, because we use that to determine to whom the report is sent.") %]</li> - <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> - <li>[% loc("Remember that, for the pilot project, FixMyBarangay is only for reporting potholes and streetlights in bgy. Luz or Basak San Nicolas.") %]</li> -</ul> diff --git a/templates/web/fixmybarangay/reports/index.html b/templates/web/fixmybarangay/reports/index.html deleted file mode 100755 index 984e0d472..000000000 --- a/templates/web/fixmybarangay/reports/index.html +++ /dev/null @@ -1,42 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Summary reports'), bodyclass => 'fullwidthpage' %] - -<h1>[% loc('All Reports') %]</h1> - -<div class="intro"> -<p> -[% loc('This is a summary of all reports on this site; select a particular barangay to see the reports sent there.') %] - -</p> -</div> - -<table cellpadding="3" cellspacing="1" border="0" class="nicetable"> -<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> -</tr> -</thead> - -<tbody> -[% FOREACH body IN bodies %] -<tr align="center" -[%- IF ! (loop.count % 2) %] class="a" -[%- END %]> -<td class="title"><a href="[% body.url(c) %]">[% body.name %]</a></td> -<td class="data">[% open.${body.id}.new or 0 %]</td> -<td class="data">[% open.${body.id}.older or 0 %]</td> -<td class="data">[% open.${body.id}.unknown or 0 %]</td> -<td class="data">[% fixed.${body.id}.new or 0 %]</td> -<td class="data">[% fixed.${body.id}.old or 0 %]</td> -</tr> -[% TRY %][% PROCESS "reports/_extras.html" %][% CATCH file %][% END %] -[% END %] -</tbody> -</table> - - -[% INCLUDE 'footer.html', pagefooter = 'yes' %] diff --git a/templates/web/fixmybarangay/site-name.html b/templates/web/fixmybarangay/site-name.html deleted file mode 100644 index 075d881b5..000000000 --- a/templates/web/fixmybarangay/site-name.html +++ /dev/null @@ -1 +0,0 @@ -FixMyBarangay diff --git a/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html b/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html deleted file mode 100644 index b36dac3b6..000000000 --- a/templates/web/fixmystreet-uk-councils/report/_item-with-pin.html +++ /dev/null @@ -1,6 +0,0 @@ -<li class="item-list__item item-list__item--with-pin [% 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/fixmystreet-uk-councils/report/new/inline-tips.html b/templates/web/fixmystreet-uk-councils/report/new/inline-tips.html index 12b60beeb..cac01aa3f 100644 --- a/templates/web/fixmystreet-uk-councils/report/new/inline-tips.html +++ b/templates/web/fixmystreet-uk-councils/report/new/inline-tips.html @@ -1,12 +1,12 @@ <div class="description_tips"> - <h4>Tips for successful reports:</h4> + <h4>Tips for successful reports</h4> <ul class="do"> <li>Be polite</li> <li>Use exact locations</li> <li>Say how long the issue’s been present</li> </ul> <ul class="dont"> - <li>Don’t leave abusive or libellous messages</li> + <li>Don’t identify or accuse other people</li> <li>Don’t include private contact details in the description</li> </ul> </div> diff --git a/templates/web/fixmystreet.com/about/council.html b/templates/web/fixmystreet.com/about/council.html index 9a411be5c..3fad765c5 100644 --- a/templates/web/fixmystreet.com/about/council.html +++ b/templates/web/fixmystreet.com/about/council.html @@ -101,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://harrogate.fixmystreet.com/">Harrogate</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 <a href="http://warwickshire.fixmystreet.com/">Warwickshire County Council</a>.</p> + <p>Our UK client councils include <a href="https://fix.angus.gov.uk/">Angus</a>, <a href="http://fixmystreet.stevenage.gov.uk/">Stevenage</a>, <a href="http://fix.bromley.gov.uk/">Bromley</a>, <a href="http://harrogate.fixmystreet.com/">Harrogate</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 <a href="http://warwickshire.fixmystreet.com/">Warwickshire County Council</a>.</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> @@ -122,7 +122,8 @@ --><a href="http://hart.fixmystreet.com/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/hart-logo.png') %]" alt="" /></a><!-- --><a href="http://fixmystreet.oxfordshire.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/oxfordshire-logo.png') %]" alt="" /></a><!-- --><a href="https://www.zueriwieneu.ch/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/zurich-logo.png') %]" alt="" /></a><!-- - --><a href="http://eastsussex.fixmystreet.com/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/east-sussex-logo.png') %]" alt="" /></a> + --><a href="http://eastsussex.fixmystreet.com/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/east-sussex-logo.png') %]" alt="" /></a><!-- + --><a href="https://fix.angus.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/angus-logo.png') %]" alt="" /></a> </div> </div> diff --git a/templates/web/fixmystreet/about/fun.html b/templates/web/fixmystreet.com/about/fun.html index 03d977d44..03d977d44 100644 --- a/templates/web/fixmystreet/about/fun.html +++ b/templates/web/fixmystreet.com/about/fun.html diff --git a/templates/web/fixmystreet.com/front/international_banner.html b/templates/web/fixmystreet.com/front/international_banner.html deleted file mode 100644 index 303d52851..000000000 --- a/templates/web/fixmystreet.com/front/international_banner.html +++ /dev/null @@ -1,11 +0,0 @@ -[% country = c.cobrand.get_country_for_ip_address(c.req.address) -%] -[%- IF country AND country != 'GB' -%] -<div class="top_banner top_banner--country"> - <a href="#" class="top_banner__close">Close</a> - <p> - This site is for reporting <strong>problems in the UK</strong>. There are FixMyStreet sites - <a href="http://www.fixmystreet.org/sites/">all over the world</a>, or you - could set up your own using the <a href="http://www.fixmystreet.org/">FixMyStreet Platform</a>. - </p> -</div> -[%- END -%] diff --git a/templates/web/fixmystreet.com/report/new/after_photo.html b/templates/web/fixmystreet.com/report/new/after_photo.html index 987f6d124..3977d80a6 100644 --- a/templates/web/fixmystreet.com/report/new/after_photo.html +++ b/templates/web/fixmystreet.com/report/new/after_photo.html @@ -1,5 +1,5 @@ <div class="description_tips"> - <h4>Tips for perfect photos:</h4> + <h4>Tips for perfect photos</h4> <ul class="do"> <li>Show what the problem is</li> <li>Show where it’s located</li> @@ -7,4 +7,4 @@ <ul class="dont"> <li>Avoid personal information and vehicle number plates</li> </ul> -</div>
\ No newline at end of file +</div> diff --git a/templates/web/fixmystreet.com/report/new/inline-tips.html b/templates/web/fixmystreet.com/report/new/inline-tips.html index 12b60beeb..de643b61c 100644 --- a/templates/web/fixmystreet.com/report/new/inline-tips.html +++ b/templates/web/fixmystreet.com/report/new/inline-tips.html @@ -1,12 +1,13 @@ <div class="description_tips"> - <h4>Tips for successful reports:</h4> + <h4 class="description_tips__heading--inline">Tips for successful reports</h4> + <small>(please read our <a href="/about/house-rules" target="_blank">House Rules</a>)</small> <ul class="do"> <li>Be polite</li> <li>Use exact locations</li> <li>Say how long the issue’s been present</li> </ul> <ul class="dont"> - <li>Don’t leave abusive or libellous messages</li> + <li>Don’t identify or accuse other people</li> <li>Don’t include private contact details in the description</li> </ul> </div> diff --git a/templates/web/fixmystreet.com/report/new/unresponsive_body.html b/templates/web/fixmystreet.com/report/new/unresponsive_body.html index 2ad3b7992..d0f16d188 100644 --- a/templates/web/fixmystreet.com/report/new/unresponsive_body.html +++ b/templates/web/fixmystreet.com/report/new/unresponsive_body.html @@ -8,5 +8,5 @@ reports from third party reporting sites such as FixMyStreet. </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> + <a href="[% c.cobrand.base_url %]/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/_extras.html b/templates/web/fixmystreet.com/reports/_extras.html index 6768c675a..6435f56fa 100755 --- a/templates/web/fixmystreet.com/reports/_extras.html +++ b/templates/web/fixmystreet.com/reports/_extras.html @@ -1,5 +1,6 @@ [% fms_councils = { + 'Angus Council' = 'fix.angus.gov.uk' 'Bromley Council' = 'fix.bromley.gov.uk' 'East Sussex County Council' = 'eastsussex.fixmystreet.com' 'Harrogate Borough Council' = 'harrogate.fixmystreet.com' @@ -11,6 +12,7 @@ } secure = { 'fix.bromley.gov.uk' = 's' + 'fix.angus.gov.uk' = 's' } site = fms_councils.${body.name} %] diff --git a/templates/web/fixmystreet/alert/updates.html b/templates/web/fixmystreet/alert/updates.html deleted file mode 100644 index 2240844e4..000000000 --- a/templates/web/fixmystreet/alert/updates.html +++ /dev/null @@ -1,32 +0,0 @@ -[% title = loc('Local RSS feeds and email alerts') %] - -[% INCLUDE 'header.html', title => title %] - - -[% INCLUDE 'errors.html' %] - -<p><a href="[% c.uri_for( '/rss', problem_id ) %]"> - <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0" style="float:right"> - </a> -</p> - -<p> -[% loc('Receive email when updates are left on this problem.') %] -</p> - -<form action="/alert/subscribe" method="post"> - <fieldset> - <label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label> - - <div class="form-txt-submit-box"> - <input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" placeholder="[% loc('Your email') %]"> - <input class="green-btn" type="submit" value="[% loc('Subscribe') %]"> - </div> - - <input type="hidden" name="id" value="[% problem_id | html %]"> - <input type="hidden" name="type" value="updates"> - </fieldset> -</form> - - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/around/_main.html b/templates/web/fixmystreet/around/_main.html deleted file mode 100644 index 900dcb6aa..000000000 --- a/templates/web/fixmystreet/around/_main.html +++ /dev/null @@ -1,3 +0,0 @@ -<div class="tablewrapper"> - [% INCLUDE 'around/_error_multiple.html' %] -</div> diff --git a/templates/web/fixmystreet/around/_updates.html b/templates/web/fixmystreet/around/_updates.html deleted file mode 100755 index 458983e8f..000000000 --- a/templates/web/fixmystreet/around/_updates.html +++ /dev/null @@ -1,5 +0,0 @@ -<div class="shadow-wrap"> - <ul id="key-tools" class="singleton"> - <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">[% loc("Get updates") %]</a></li> - </ul> -</div> diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html deleted file mode 100644 index 7626736a0..000000000 --- a/templates/web/fixmystreet/footer.html +++ /dev/null @@ -1,53 +0,0 @@ - [% IF pagefooter %] - <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 class="nav-menu nav-menu--mysoc"> - <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li> - </ul> -[% - SET base = ""; - SET base = c.cobrand.base_url IF admin; -%] - <ul class="nav-menu nav-menu--main"> - <li><[% IF c.req.uri.path == '/' - %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn" - >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' - %]span[% ELSE %]a href="[% base %]/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports' - %]span[% ELSE %]a href="[% base %]/reports"[% END - %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/alert' - %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END - %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/faq' - %]span[% ELSE %]a href="[% base %]/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% - %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' - %]span[% ELSE %]a href="[% base %]/privacy"[% END - %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> - </ul> - </div> - </div> - </div> - -<!-- [% INCLUDE 'debug_footer.html' %] --> - </div> <!-- .wrapper --> - - [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] - -</body> -</html> diff --git a/templates/web/fixmystreet/header_logo.html b/templates/web/fixmystreet/header_logo.html deleted file mode 100644 index 66378235a..000000000 --- a/templates/web/fixmystreet/header_logo.html +++ /dev/null @@ -1,2 +0,0 @@ - <a href="[% c.cobrand.base_url IF admin %]/" id="site-logo">[% site_name %]</a> - <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> diff --git a/templates/web/fixmystreet/reports/_rss.html b/templates/web/fixmystreet/reports/_rss.html deleted file mode 100644 index f2d164bfa..000000000 --- a/templates/web/fixmystreet/reports/_rss.html +++ /dev/null @@ -1,19 +0,0 @@ -<div class="shadow-wrap"> - <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]> - <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% - IF c.cobrand.moniker == 'bromley' AND thing == 'council'; - 'Get updates of reports in Bromley'; - ELSIF c.cobrand.moniker == 'bromley'; - 'Get updates of reports in this ward'; - ELSIF c.cobrand.is_council; - tprintf(loc('Get updates of %s problems'), thing); - ELSE; - tprintf(loc('Get updates of problems in this %s'), thing); - END - %]</a></li> - [% IF children.size %] - <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% ward_text %]</a></li> - [% END %] - </ul> -</div> - diff --git a/templates/web/fixmystreet/reports/_ward-list.html b/templates/web/fixmystreet/reports/_ward-list.html deleted file mode 100755 index b7e19ffc2..000000000 --- a/templates/web/fixmystreet/reports/_ward-list.html +++ /dev/null @@ -1,14 +0,0 @@ -[% IF location == 'after' AND children.size %] -<section id="council_wards" class="hidden-js"> -<h2>[% ward_text %]</h2> - <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> - <ul class="item-list item-list--wards full-width"> - [% FOR child IN children.values.sort('name') %] - <li class="item-list__item item-list--wards__item"> - <a href="[% child.url %]">[% child.name %]</a> - </li> - [% END %] - </ul> -</section> -[% END %] - diff --git a/templates/web/greenwich/reports/_list-entry.html b/templates/web/greenwich/reports/_list-entry.html index b24ef2260..43d3d6265 100644 --- a/templates/web/greenwich/reports/_list-entry.html +++ b/templates/web/greenwich/reports/_list-entry.html @@ -1 +1,4 @@ -[% INCLUDE 'report/_item-with-pin.html' %] +[% INCLUDE 'report/_item.html' + no_fixed = 1 + item_extra_class = 'item-list__item--with-pin ' _ c.cobrand.pin_colour(problem) +%] diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html index bd319e250..451832dda 100644 --- a/templates/web/harrogate/header.html +++ b/templates/web/harrogate/header.html @@ -24,7 +24,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html' %] [% extra_js %] [% IF c.req.uri.host == 'osm.fixmystreet.com' %] diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html index b7b4fefcc..6337aad64 100644 --- a/templates/web/hart/header.html +++ b/templates/web/hart/header.html @@ -25,7 +25,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html' %] [% extra_js %] <script type="text/javascript"> $(function(){ diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index b4244a51b..e69757dad 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -22,7 +22,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/oxfordshire/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html' %] [% extra_js %] [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/oxfordshire/report/_council_sent_info.html b/templates/web/oxfordshire/report/_council_sent_info.html index 499fd4637..52b20a0af 100644 --- a/templates/web/oxfordshire/report/_council_sent_info.html +++ b/templates/web/oxfordshire/report/_council_sent_info.html @@ -10,7 +10,12 @@ </h3> [% END %] - [% IF c.cobrand.problem_response_days(problem) > 0 %] + [% IF c.cobrand.problem_response_days(problem) == 'emergency' %] + <p> + Thank you for contacting Oxfordshire County Council [% problem.category %], unfortunately we are currently only available to respond to emergency situations which may have an impact on the health and safety of members of the public, these will be dealt with within a 24 hour period.<br /> + Reported faults will continue to be registered on our management system and these will be tackled in coming months. + </p> + [% ELSIF c.cobrand.problem_response_days(problem) > 0 %] <p> Problems in the [% problem.category %] diff --git a/templates/web/oxfordshire/report/_main.html b/templates/web/oxfordshire/report/_main.html index 3bb786141..a4cb3e20b 100644 --- a/templates/web/oxfordshire/report/_main.html +++ b/templates/web/oxfordshire/report/_main.html @@ -54,7 +54,7 @@ <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 %] + [%- IF !problem.used_map %]; <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> diff --git a/templates/web/oxfordshire/report/new/inline-tips.html b/templates/web/oxfordshire/report/new/inline-tips.html index 810c04363..1194595a1 100644 --- a/templates/web/oxfordshire/report/new/inline-tips.html +++ b/templates/web/oxfordshire/report/new/inline-tips.html @@ -1,12 +1,12 @@ <div class="description_tips"> - <h4>Tips for successful reports:</h4> + <h4>Tips for successful reports</h4> <ul class="do"> <li>Be polite</li> <li>Use exact locations (e.g. carriageway)</li> <li>Say how long the issue’s been present</li> </ul> <ul class="dont"> - <li>Don’t leave abusive or libellous messages</li> + <li>Don’t identify or accuse other people</li> <li>Don’t include private contact details in the description</li> </ul> </div> diff --git a/templates/web/oxfordshire/reports/_list-entry.html b/templates/web/oxfordshire/reports/_list-entry.html index b24ef2260..43d3d6265 100644 --- a/templates/web/oxfordshire/reports/_list-entry.html +++ b/templates/web/oxfordshire/reports/_list-entry.html @@ -1 +1,4 @@ -[% INCLUDE 'report/_item-with-pin.html' %] +[% INCLUDE 'report/_item.html' + no_fixed = 1 + item_extra_class = 'item-list__item--with-pin ' _ c.cobrand.pin_colour(problem) +%] diff --git a/templates/web/seesomething/front/tips.html b/templates/web/seesomething/front/tips.html index 34712656d..9043ee4bd 100644 --- a/templates/web/seesomething/front/tips.html +++ b/templates/web/seesomething/front/tips.html @@ -1,3 +1,5 @@ <p> - If you are unsure about where the incident took place as you where on a moving train or bus then use the location of the start of your journey and mention which bus or train you where on in your report. + If you are unsure about where the incident took place as you were on a + moving train or bus, then use the location of the start of your journey + and mention which bus or train you were on in your report. </p> diff --git a/templates/web/seesomething/report/new/fill_in_details_form.html b/templates/web/seesomething/report/new/fill_in_details_form.html index 659fadd04..728b27e41 100644 --- a/templates/web/seesomething/report/new/fill_in_details_form.html +++ b/templates/web/seesomething/report/new/fill_in_details_form.html @@ -49,24 +49,24 @@ </div> [% IF c.cobrand.allow_photo_upload %] + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> <label for="form_photo">[% loc('Photo') %]</label> - [% 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 %] - [% IF field_errors.photo %] <p class='form-error'>[% field_errors.photo %]</p> [% END %] - <input type="file" name="photo" id="form_photo"> + <div id="form_photos"> + [% IF upload_fileid %] + <p>[% loc('You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p> + [% FOREACH id IN upload_fileid.split(',') %] + <img align="right" src="/photo/temp.[% id %]" alt=""> + [% END %] + [% END %] + <input type="file" name="photo1" id="form_photo"> + <label for="form_photo2">[% loc('Photo') %]</label> + <input type="file" name="photo2" id="form_photo2"> + <label for="form_photo3">[% loc('Photo') %]</label> + <input type="file" name="photo3" id="form_photo3"> + </div> [% END %] <h2>Personal Details:</h2> diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index 87fb0d90d..11e362612 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -20,7 +20,7 @@ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html' %] [% extra_js %] [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html index 35baeacd7..c6d2bc048 100644 --- a/templates/web/warwickshire/header.html +++ b/templates/web/warwickshire/header.html @@ -29,7 +29,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html' %] [% extra_js %] [% PROCESS 'header_extra.html' %] diff --git a/templates/web/zerotb/about/faq-en-gb.html b/templates/web/zerotb/about/faq-en-gb.html deleted file mode 100644 index b2607f769..000000000 --- a/templates/web/zerotb/about/faq-en-gb.html +++ /dev/null @@ -1,124 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Frequently Asked Questions') %] - -<h1>Frequently Asked Questions</h1> - <dl> - <dt>What is this website?</dt> - <dd>This site was created to help people report anti-tuberculosis drug stockouts in Delhi. It was created in response to the ongoing stockouts reported in India last year (see here). The information will be used to encourage the government to address stockouts as they arise.</dd> - <dt>What is FixMyStreet?</dt> - <dd>FixMyStreet is a site to help people report, view, or discuss local problems they’ve found by simply locating them on a map. It launched in early February 2007.</dd> - <dt>How do I get in touch with FixMyStreet?</dt> - <dd>Here’s our <a href="[% c.uri_for( '/contact' ) %]">contact page</a>.</dd> - <dt>What sort of problems should I report with this site?</dt> - <dd>This site is primarily for reporting barriers to TB treatment clinics such as drug stockouts.</dd> - <dt>How do I use the site?</dt> - <dd>You can either enter a location in Delhi or choose a specific clinic name. If you enter a location, you will be presented with a map of that area. You can then search for a TB clinic in that area to report a stockout.</dd> - <dt>How are the problems solved?</dt> - <dd>They are anonymously reported to the District TB Officer by email. They are also shared with local activists and media to generate awareness of the issue and encourage the government to take action. We respect your privacy: your name and email will NOT be given to any of these groups without your written permission.</dd> - <dt>Is it free?</dt> - <dd>The site is free to use, yes. FixMyStreet is run -by a registered charity, though, so if you want to make a contribution, <a -href="https://secure.mysociety.org/donate/">please do</a>.</dd> - - <dt>Can I use the site on my mobile?</dt> - <dd> - <p>The website will already work on your mobile phone, adapting to - the size of your screen automatically. - </dd> - </dl> - - <h2>Practical Questions</h2> - <dl> - <dt>I work with a TB clinic, where do you send the reports?</dt> - <dd>You can contact us to find out where reports go at the moment. Also contact us to update the address or addresses we use.</dd> - <dt>Do you remove silly or illegal content?</dt> - <dd>FixMyStreet is not responsible for the content and accuracy -of material submitted by its users. We reserve the right to edit or remove any -problems or updates which we consider to be inappropriate upon being informed -by a user of the site.</dd> - - <dt>Why can’t I zoom out more on the reporting map?</dt> - <dd>We want to keep the site locally focused, so restrict the ability to - move radically between areas.</dd> - - <dt>This site is great – why aren’t you better publicised?</dt> - <dd>As a tiny charity we simply don’t have a publicity budget, and we - rely on word of mouth to advertise the site. We have a whole <a - href="posters/">array of posters, flyers and badges</a> if you’d like - to publicise us on the web or in your local area, and why not write to your - local paper to let them know about us?</dd> </dl> - - <h2><a name="privacy"></a>Privacy Questions</h2> - <dl> - <dt>Who gets to see my name and email address?</dt> - <dd> - Due to the sensitive nature of the stockout situation, if you submit a report, we will NOT share your name or email with anyone unless you give us permission. We may, however, send other information from your report (such as the clinic name and any description you write about the stockouts) to the TB officers with the government or activists in order to raise awareness issue. - The only people who will be able to see your name and email address will be the FixMyStreet administrators and team members, and they will never use it for anything other than to help administer FixMyStreet. We will never give or sell your email address to anyone else, unless we are obliged to by law. Your name, given in the name field, will not be published anywhere unless you specifically give us permission to. - </dd> - <dt>Will you send nasty, brutish spam to my email address?</dt> - <dd>Never. We will email you if someone leaves an update on a -problem you’ve reported, and send you a questionnaire email four weeks -after you submit a problem, asking for a status update; we’ll only ever -send you emails in relation to your problem.</dd> - </dl> - <h2>Organisation Questions</h2> - <dl> - <dt>Who built FixMyStreet?</dt> - <dd>This site 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.com</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. Our first project -was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your -elected representatives, for free. 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, UK.</dd> - <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> - <dd>FixMyStreet was originally paid for via the Department for - Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial - work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> - <dt>Do you need any help with the project?</dt> - <dd>Yes, we can use help in all sorts of ways, technical or -non-technical. Please see our <a -href="http://www.mysociety.org/helpus/">Get Involved page</a>.</dd> - <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> - <dd> -The software behind this site is open source, and available -to you mainly under the GNU Affero GPL software license. You can <a -href="http://github.com/mysociety/fixmystreet">download the -source code</a> and help us 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> -<dt>I’d prefer code in a different language?</dt> -<dd> -VisibleGovernment.ca wrote their own code for -<a href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a>, which is -written in GeoDjango and available under an MIT licence at <a -href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. -Or <a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> is written in -Drupal. -</p> -</dd> - <dt>People build things, not organisations. Who <em>actually</em> built it?</dt> - <dd>Matthew Somerville and Francis Irving wrote the site, -Chris Lightfoot wrote the tileserver and map cutter, Richard Pope created -our pins, Deborah Kerr keeps things up-to-date and does user support, -Ayesha Garrett designed our posters, and Tom Steinberg managed it all. - -Thanks also to -<a href="http://www.ordnancesurvey.co.uk">Ordnance Survey</a> (for the maps, -UK postcodes, and UK addresses – data © Crown copyright, all -rights reserved, Ministry of Justice 100037819 2008), -Yahoo! for their BSD-licensed JavaScript libraries, the entire free software -community (this particular project was brought to you by Perl, PostgreSQL, -and the number 161.290) and <a -href="http://www.bytemark.co.uk/">Bytemark</a> (who kindly host all -our servers). - -Let us know if we’ve missed anyone.</dd> - </dl> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/zerotb/around/_updates.html b/templates/web/zerotb/around/_updates.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/zerotb/around/_updates.html +++ /dev/null diff --git a/templates/web/zerotb/around/intro.html b/templates/web/zerotb/around/intro.html deleted file mode 100644 index 07d018f57..000000000 --- a/templates/web/zerotb/around/intro.html +++ /dev/null @@ -1 +0,0 @@ -<h2>[% loc('If a hospital, clinic or other health facility near you is experiencing <b>stockouts of tuberculosis drugs</b> you can use this form to report it') %]</h2> diff --git a/templates/web/zerotb/around/location_error.html b/templates/web/zerotb/around/location_error.html deleted file mode 100644 index 45428e723..000000000 --- a/templates/web/zerotb/around/location_error.html +++ /dev/null @@ -1,8 +0,0 @@ -<p class="form-error"> -[% IF location_error_no_areas %] - [% loc('This location seems to be outside the Dehli area.') %] -[% ELSE %] - [% location_error %] -[% END %] -</p> - diff --git a/templates/web/zerotb/around/on_map_list_items.html b/templates/web/zerotb/around/on_map_list_items.html deleted file mode 100644 index 5c7822b48..000000000 --- a/templates/web/zerotb/around/on_map_list_items.html +++ /dev/null @@ -1,14 +0,0 @@ -[% all_reports = on_map.merge(around_map) %] -[% IF all_reports.size %] - [% FOREACH problem IN all_reports %] - [% UNLESS problem.title; - dist = tprintf("%.1f", (problem.distance || 0) ); - problem = problem.problem; - END %] - [% INCLUDE 'report/_item.html' %] - [% END %] -[% ELSE %] - <li class="item-list__item item-list__item--empty"> - <p>[% loc('No clinics found.') %]</p> - </li> -[% END %] diff --git a/templates/web/zerotb/around/postcode_form.html b/templates/web/zerotb/around/postcode_form.html deleted file mode 100644 index 484f41c5c..000000000 --- a/templates/web/zerotb/around/postcode_form.html +++ /dev/null @@ -1,36 +0,0 @@ -<div id="front-main"> - <div id="front-main-container"> - [% INCLUDE 'around/intro.html' %] - - [% - question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); - %] - - <div id="postcodeForm"> - <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm"> - <label for="pc">[% question %]:</label> - <div> - <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> - <input type="submit" value="[% loc('Go') %]" id="sub"> - </div> - - [% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> - [% END %] - - </form> - <form action="[% c.uri_for( '/report' ) %]/" method="get" name="clinicForm"> - <label for="clinic">[% loc('... or select a clinic by name' ) %]</label> - <div> - <select id="clinic" name="clinic"> - [% FOR clinic IN c.cobrand.get_clinic_list %] - <option value="[% clinic.id %]">[% clinic.title %]</option> - [% END %] - </select> - <input class="green-btn" type="submit" value="[% loc('Go') %]" id="show_report"> - </div> - </form> - </div> - - </div> -</div> diff --git a/templates/web/zerotb/around/tabbed_lists.html b/templates/web/zerotb/around/tabbed_lists.html deleted file mode 100644 index 090f03be0..000000000 --- a/templates/web/zerotb/around/tabbed_lists.html +++ /dev/null @@ -1,3 +0,0 @@ -<ul id="current" class="item-list item-list--reports tab"> - [% INCLUDE "around/on_map_list_items.html" %] -</ul> diff --git a/templates/web/zerotb/footer.html b/templates/web/zerotb/footer.html deleted file mode 100644 index cef009484..000000000 --- a/templates/web/zerotb/footer.html +++ /dev/null @@ -1,22 +0,0 @@ - - </div><!-- .content role=main --> - </div><!-- .container --> - </div><!-- .table-cell --> - - <div class="nav-wrapper"> - <div class="nav-wrapper-2"> - <div id="main-nav" role="navigation"> - <ul class="nav-menu nav-menu--main"> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" - >[% loc("Report a Stockout") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> - </ul> - </div> - </div> - </div> - -<!-- [% INCLUDE 'debug_footer.html' %] --> - </div> <!-- .wrapper --> -</body> -</html> diff --git a/templates/web/zerotb/header_extra.html b/templates/web/zerotb/header_extra.html deleted file mode 100644 index 23f061799..000000000 --- a/templates/web/zerotb/header_extra.html +++ /dev/null @@ -1,18 +0,0 @@ -<link rel="stylesheet" href="[% start %][% version('/js/select2/select2.css') %]" /> -<script type="text/javascript" src="[% start %][% version('/js/select2/select2.min.js') %]"></script> - -<script> -$(document).ready(function() { - $("#clinic").select2({ - placeholder: '[% loc('Enter a clinic name') %]', - allowClear: true, - }); - $('#show_report').click( - function() { - var report = $('#clinic').select2('val'); - document.location = '[% c.uri_for( '/report' ) %]/' + report; - return false; - } - ); -}); -</script> diff --git a/templates/web/zerotb/header_logo.html b/templates/web/zerotb/header_logo.html deleted file mode 100644 index bcc690d97..000000000 --- a/templates/web/zerotb/header_logo.html +++ /dev/null @@ -1,6 +0,0 @@ - <div id="site-logo"> - <p><a href="/">[% loc('<span class="orange">Report</span> Delhi TB drug <b>stockouts</b>') %]</a></p> - [% IF c.req.uri.path == '/' %] - <p id="brought-to-you">Brought to you by <a href="http://www.fixmystreet.org" id="fms-logo-small">FixMyStreet</a></p> - [% END %] - </div> diff --git a/templates/web/zerotb/header_opengraph.html b/templates/web/zerotb/header_opengraph.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/zerotb/header_opengraph.html +++ /dev/null diff --git a/templates/web/zerotb/header_rss.html b/templates/web/zerotb/header_rss.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/zerotb/header_rss.html +++ /dev/null diff --git a/templates/web/zerotb/index-steps.html b/templates/web/zerotb/index-steps.html deleted file mode 100644 index 2d49b8f28..000000000 --- a/templates/web/zerotb/index-steps.html +++ /dev/null @@ -1,8 +0,0 @@ -<h2>[% loc('How to report a stockout') %]</h2> - -<ol class="big-numbers"> - <li>[% loc('Enter a Delhi chest clinic or street name and area') %]</li> - <li>[% loc('Locate the clinic on a map of the area') %]</li> - <li>[% loc('Enter details of the problem (optional)') %]</li> - <li>[% loc('We will send your stockout report to the district TB officer and to local activists to ensure action is taken') %]</li> -</ol> diff --git a/templates/web/zerotb/index.html b/templates/web/zerotb/index.html deleted file mode 100644 index 4d0d6555c..000000000 --- a/templates/web/zerotb/index.html +++ /dev/null @@ -1,45 +0,0 @@ -[%# Assumes fixmystreet cobrand is using FMS map template - for bonus points preload all the right map elements. %] -[% map_js = BLOCK %] -<script> -yepnope.addPrefix( 'preload', function ( resource ) { - resource.noexec = true; - return resource; -}); -Modernizr.load({ - load: [ - "preload![% version('/js/OpenLayers.fixmystreet.js') %]", - "preload![% version('/js/map-OpenLayers.js') %]", - "preload![% version('/js/map-OpenStreetMap.js') %]", - "preload![% version('/js/jquery.ba-hashchange.min.js') %]" - ] -}); -</script> -[% END %] - -[% pre_container_extra = PROCESS 'around/postcode_form.html' %] -[% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %] - -[% IF error %] - <p class="form-error">[% error %]</p> -[% END %] - -<div class="tablewrapper"> - <div id="front-howto"> - [% INCLUDE 'index-steps.html' %] - </div> - - <div id="front-recently"> - <h2> - [% loc('About stockouts') %] - </h2> - - <section class="full-width"> - <p> - [% loc('In 2013 India faced stockouts of anti-tuberculosis medicines, threatening to leave many patients across the country without access to life-saving treatment. Some government officials have denied that these drug stockouts exist. There is no simple mechanism for gathering drug shortage data, making accountability and transparency impossible. We aim to change this by enabling anyone in Delhi to report stockouts through this website.') %] - </p> - </section> - - </div> -</div> - -[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/zerotb/report/_item.html b/templates/web/zerotb/report/_item.html deleted file mode 100644 index e12c9e1fa..000000000 --- a/templates/web/zerotb/report/_item.html +++ /dev/null @@ -1,5 +0,0 @@ -<li class="item-list__item item-list--reports__item"> -<a href="[% c.uri_for('/report', problem.id ) %]"> - <h4>[% problem.title | html %]</h4> -</a> -</li> diff --git a/templates/web/zerotb/report/_main.html b/templates/web/zerotb/report/_main.html deleted file mode 100644 index 189b4eeb5..000000000 --- a/templates/web/zerotb/report/_main.html +++ /dev/null @@ -1,6 +0,0 @@ -<div class="problem-header cf"> - <h1>[% problem.title | html %]</h1> - - [% add_links( problem.detail ) | html_para %] - -</div> diff --git a/templates/web/zerotb/report/display.html b/templates/web/zerotb/report/display.html deleted file mode 100644 index 9848c89db..000000000 --- a/templates/web/zerotb/report/display.html +++ /dev/null @@ -1,28 +0,0 @@ -[% - PROCESS "report/photo-js.html"; - PROCESS "maps/${map.type}.html"; - - problem_title = problem.title_safe _ ' - ' _ loc('Viewing a Clinic'); - INCLUDE 'header.html' - title = problem_title - robots = 'index, nofollow' - bodyclass = 'mappage'; -%] - -[% map_html %] - -</div> - -[% INCLUDE 'report/banner.html' %] - -[% 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 => latitude, lon => longitude } ) %]">[% loc( 'Clinics nearby' ) %]</a></li> - </ul> - -</div> - -[% INCLUDE 'report/update-form.html' %] -[% INCLUDE 'footer.html' %] diff --git a/templates/web/zerotb/report/update-form.html b/templates/web/zerotb/report/update-form.html deleted file mode 100644 index cb8ba24e4..000000000 --- a/templates/web/zerotb/report/update-form.html +++ /dev/null @@ -1,64 +0,0 @@ -<div id="update_form"> - <h2>[% loc( 'Report a stockout') %]</h2> - - <div class="general-notes"> - [% INCLUDE 'report/updates-sidebar-notes.html' %] - </div> - - [% INCLUDE 'errors.html' %] - - <form method="post" action="[% c.uri_for( '/report/update' ) %]" id="form_update_form" name="updateForm" class="validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> - <fieldset> - <input type="hidden" name="submit_update" value="1"> - <input type="hidden" name="id" value="[% problem.id | html %]"> - - <label for="form_update">[% loc( 'Details' ) %]</label> - [% IF field_errors.update %] - <div class='form-error'>[% field_errors.update %]</div> - [% END %] - <textarea rows="7" cols="30" name="update" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea> - - [% IF c.user_exists %] - - [% INCLUDE name %] - - <input class="final-submit green-btn" type="submit" id="update_post" value="[% loc('Post') %]"> - - - [% ELSE %] - - <label for="form_rznvy">[% loc('Email' ) %]</label> - - <div class="general-notes"> - <p>[% loc('We never show your email or name') %]</p> - </div> - - [% IF field_errors.email %] - <p class='form-error'>[% field_errors.email %]</p> - [% END %] - <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" placeholder="[% loc('Your email address' ) %]" required> - - <div id="form_sign_in"> - <div id="form_sign_in_no"> - [% INCLUDE name %] - - <div class="form-txt-submit-box"> - <input class="green-btn" type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]"> - </div> - </div> - </div> - - [% END %] - </fieldset> - </form> -</div> - -[% BLOCK name %] - [% 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" [% IF problem.bodies_str == '2482' %]class="validName" [% END %]name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]"> - -[% END %] diff --git a/templates/web/zerotb/report/updates-sidebar-notes.html b/templates/web/zerotb/report/updates-sidebar-notes.html deleted file mode 100644 index 28de7d4fa..000000000 --- a/templates/web/zerotb/report/updates-sidebar-notes.html +++ /dev/null @@ -1,3 +0,0 @@ - <p> - [% loc( 'Please note that reports are sent to the clinic.' ) %] - [% loc( 'Your information will only be used in accordance with our <a href="/privacy">privacy policy</a>' ) %]</p> diff --git a/templates/web/zerotb/site-name.html b/templates/web/zerotb/site-name.html deleted file mode 100644 index b2c01ff85..000000000 --- a/templates/web/zerotb/site-name.html +++ /dev/null @@ -1 +0,0 @@ -ZeroTB diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html index 7e88f3f0f..ee00b851c 100644 --- a/templates/web/zurich/header.html +++ b/templates/web/zurich/header.html @@ -24,7 +24,7 @@ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html' %] [% extra_js %] <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js" charset="utf-8"></script> diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html index a4d274a8e..560cbac51 100644 --- a/templates/web/zurich/report/_item.html +++ b/templates/web/zurich/report/_item.html @@ -4,9 +4,9 @@ <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt=""> [% END %] [% IF problem.state != 'unconfirmed' %] - <h4>[% problem.title | html %]</h4> + <h3 class="item-list__heading">[% problem.title | html %]</h3> [% ELSE %] - <h4><em>[% loc('Awaiting moderation') %]</em></h4> + <h3 class="item-list__heading"><em>[% loc('Awaiting moderation') %]</em></h3> [% END %] <small>[% prettify_dt( problem.created, 'zurich' ) %] [%- IF dist %], [% dist %]km[% END %] 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 7628bf23f..1e9db6b31 100644 --- a/templates/web/zurich/report/new/fill_in_details_form.html +++ b/templates/web/zurich/report/new/fill_in_details_form.html @@ -54,7 +54,7 @@ [% IF upload_fileid %] <p>[% loc('You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p> [% FOREACH id IN upload_fileid.split(',') %] - <img align="right" src="/photo/[% id %].temp.jpeg" alt=""> + <img align="right" src="/photo/temp.[% id %]" alt=""> [% END %] [% END %] <input type="file" name="photo1" id="form_photo"> diff --git a/web/cobrands/angus/_colours.scss b/web/cobrands/angus/_colours.scss new file mode 100644 index 000000000..fa4305715 --- /dev/null +++ b/web/cobrands/angus/_colours.scss @@ -0,0 +1,31 @@ +/* COLOURS */ + +$angus_green: #008672; +$angus_light_green: lighten($angus_green, 3%); +$angus_dark_green: #006d5c; +$angus_blue: #114a97; +$angus_dark_blue: #0c3469; +$angus_light_grey: #eee; +$angus_grey: #717171; +$angus_dark_grey: #424242; +$angus_grey_link: #c7c7c7; + + +$primary: $angus_green; +$primary_b: #000000; +$primary_text: #222222; + +$base_bg: #fff; +$base_fg: #000; + +$map_nav_bg: $angus_green; +$nav_fg: #fff; +$nav_fg_hover: transparent; + +$col_big_numbers: $primary; + +$col_click_map: $angus_green; +$col_click_map_dark: darken($col_click_map, 10%); + +$col_fixed_label: $angus_green; +$col_fixed_label_dark: darken($col_click_map, 10%); diff --git a/web/cobrands/angus/_fonts.scss b/web/cobrands/angus/_fonts.scss new file mode 100644 index 000000000..56fb5a7b2 --- /dev/null +++ b/web/cobrands/angus/_fonts.scss @@ -0,0 +1,51 @@ +@font-face { + font-family: angusgov; + src: url(/cobrands/angus/third_party/fonts/angusgov.eot?-q16et6); + src: url(/cobrands/angus/third_party/fonts/angusgov.eot?#iefix-q16et6) format("embedded-opentype"), + url(/cobrands/angus/third_party/fonts/angusgov.woff?-q16et6) format("woff"), + url(/cobrands/angus/third_party/fonts/angusgov.ttf?-q16et6) format("truetype"), + url(/cobrands/angus/third_party/fonts/angusgov.svg?-q16et6#angusgov) format("svg"); + font-weight: 400; + font-style:normal +} +@font-face { + font-family: 'PT Sans'; + font-style: normal; + font-weight: 400; + src: local('PT Sans'), local('PTSans-Regular'), url(https://themes.googleusercontent.com/static/fonts/ptsans/v6/7YGmE4Ls5b94ct65u07hVQLUuEpTyoUstqEm5AMlJo4.woff) format('woff'); +} +@font-face { + font-family: 'PT Sans'; + font-style: normal; + font-weight: 700; + src: local('PT Sans Bold'), local('PTSans-Bold'), url(https://themes.googleusercontent.com/static/fonts/ptsans/v6/0XxGQsSc1g4rdRdjJKZrNL3hpw3pgy2gAi-Ip7WPMi0.woff) format('woff'); +} +@font-face { + font-family: 'PT Sans'; + font-style: italic; + font-weight: 400; + src: local('PT Sans Italic'), local('PTSans-Italic'), url(https://themes.googleusercontent.com/static/fonts/ptsans/v6/PIPMHY90P7jtyjpXuZ2cLLO3LdcAZYWl9Si6vvxL-qU.woff) format('woff'); +} +@font-face { + font-family: 'PT Sans'; + font-style: italic; + font-weight: 700; + src: local('PT Sans Bold Italic'), local('PTSans-BoldItalic'), url(https://themes.googleusercontent.com/static/fonts/ptsans/v6/lILlYDvubYemzYzN7GbLkKRDOzjiPcYnFooOUGCOsRk.woff) format('woff'); +} +@font-face { + font-family: 'Sintony'; + font-style: normal; + font-weight: 400; + src: local('Sintony'), url(https://themes.googleusercontent.com/static/fonts/sintony/v2/cu1c4tOdDXpghDFFDdv7MgLUuEpTyoUstqEm5AMlJo4.woff) format('woff'); +} +@font-face { + font-family: 'Sintony'; + font-style: normal; + font-weight: 700; + src: local('Sintony Bold'), local('Sintony-Bold'), url(https://themes.googleusercontent.com/static/fonts/sintony/v2/TiXPkS2VjL9yF_daQZv9Ir3hpw3pgy2gAi-Ip7WPMi0.woff) format('woff'); +} + + +$heading-font: 'PT Sans', sans-serif; +$body-font: Sintony, sans-serif; +$meta-font: $heading-font; diff --git a/web/cobrands/angus/base.scss b/web/cobrands/angus/base.scss new file mode 100644 index 000000000..54e9b25b3 --- /dev/null +++ b/web/cobrands/angus/base.scss @@ -0,0 +1,64 @@ +@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/angus/third_party/css_img/angus-logo-header.png") 0 0 no-repeat; + background-size: contain; + width: 82px; + height: 40px; + top: 8px; + left: 4px; +} + +#site-header { + background: $angus_green; + + form.form__search { + display: none; + } +} + +.item-list--reports__item, #user-meta p, #front-main #postcodeForm { +// background-color: $greenwich_light_grey; +} + +label[for=pc] { + color: $nav_fg; +} + +#front-howto #front_stats { + color: $nav_fg; +} + + +.nav-menu--mysoc { + display: none; +} + +.angus_nav, .wrapper__main_menu { + display: none; +} + +.nav-menu--breadcrumb { + display: none; +} + +.streetlight-spot:before { + content: ""; + display: inline-block; + width: 10px; + height: 10px; + border: 2px solid #000; + background-color: #ffff00; + margin: 0 0.3em 0 0.2em; + border-radius: 100%; + vertical-align: -2px; +}
\ No newline at end of file diff --git a/web/cobrands/barnet/config.rb b/web/cobrands/angus/config.rb index cab97b18f..cab97b18f 100644 --- a/web/cobrands/barnet/config.rb +++ b/web/cobrands/angus/config.rb diff --git a/web/cobrands/angus/layout.scss b/web/cobrands/angus/layout.scss new file mode 100644 index 000000000..cb358679d --- /dev/null +++ b/web/cobrands/angus/layout.scss @@ -0,0 +1,462 @@ +@import "_colours"; +@import "_fonts"; +@import "../sass/layout"; + +$max_page_width: 1200px; + +#site-logo, +.ie6 #site-logo, +body.frontpage #site-logo, +.ie6 body.frontpage #site-logo, +body.twothirdswidthpage #site-logo, +.ie6 body.twothirdswidthpage #site-logo +{ + position: relative; + top: 13px; + left: 20px; + margin: 0; + padding: 0; + background: url("/cobrands/angus/third_party/css_img/angus-logo-header.png") 0 0 no-repeat; + background-size: contain; + width: 165px; + height: 66px; + display: inline-block; +} + +#site-header { + background-color: $angus_green; + border-bottom: solid 8px $angus_dark_green; + box-shadow: 0 5px 5px rgba(0, 0, 0, .075); + + .container { + position: relative; + min-height: 5em; + } + + form.form__search { + display: block; + clear: right; + margin: .65em 0 .25em; + padding: 0; + text-align: right; + width: 75%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + position: absolute; + bottom: 0; + right: 0; + + .field { + min-width: 13em; + position: relative; + z-index: 100; + width: 41.66667%; + display: inline; + + border: 1px solid rgba(0,0,0,.6); + box-shadow: inset 0 3px 5px rgba(0,0,0,0.15); + font-family: $body-font; + font-size: .9em; + height: 2.5em; + margin: 0; + padding: .55em .5em; + vertical-align: top; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + line-height: 1.5em; + border-radius: 0; + + } + + // input placeholders, these need to be on separate lines as if the browser + // can't understand a selector it will invalidate the whole line. + ::-webkit-input-placeholder { + color: $angus_grey; + font: { + style: normal; + size: 1em; + } + } + :-moz-placeholder { + color: $angus_grey; + font: { + style: normal; + size: 1em; + } + } + :-ms-placeholder { + color: $angus_grey; + font: { + style: normal; + size: 1em; + } + } + + .button { + padding-left: 20px; + padding-right: 20px; + margin: 0; + position: relative; + z-index: 100; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + display: inline; + background: #114a97; + border-bottom-color: #0c3469!important; + -webkit-appearance: none; + border: 0 none; + border-bottom: 2px solid; + border-radius: 4px; + color: #fff; + cursor: pointer; + font-family: Sintony,sans-serif; + font-size: .9em; + font-weight: 400; + min-height: 2.5em; + line-height: 1.6; + padding: .55em 1em .45em; + text-align: center; + text-decoration: none; + text-shadow: 0 -1px 0 rgba(0,0,0,.5); + text-transform: lowercase; + vertical-align: top; + } + } +} + +body.fullwidthpage, body.twothirdswidthpage, body.authpage, body.frontpage { + #site-header { + height: 91px; + } +} + +#front-main { + background: transparent; + + #front-main-container { + background-color: $angus_light_grey; + width: 100%; + max-width: $max_page_width; + padding-top: 1em; + padding-bottom: 1em; + } +} + +body.fullwidthpage, body.twothirdswidthpage, body.authpage { + .container { + max-width: $max_page_width; + width: 100%; + + .content { + background: $angus_light_grey; + background-color: $angus_light_grey; + + } + } +} + +body.frontpage { + .container { + .content { + background: $base_bg; + background-color: $base_bg; + } + } + #user-meta p { + right: -119px; + top: -93px; + margin: 0; + padding: 0; + color: $base_bg; + + a { + position: static; + } + } +} + +body.twothirdswidthpage .content .sticky-sidebar { + z-index: 0; + left: 43em; + + aside { + top: 15em; + } +} + + +label[for=pc] { + color: $primary_b; +} + +[class*=" icon-"]:before,[class^=icon-]:before +{ + -moz-osx-font-smoothing:grayscale; + -webkit-font-smoothing:antialiased; + font-family:angusgov; + font-style:normal; + font-variant:normal; + font-weight:400; + line-height:1; + speak:none; + text-transform:none; +} + +.icon-facebook:before +{ + content:"\e61c"; +} + +.icon-twitter:before +{ + content:"\e61d"; +} + +.icon-youtube:before +{ + content:"\e61e"; +} + +footer p.social +{ + overflow:hidden; +} + +footer p.social a +{ + -moz-transition:.15s color ease-in,.15s background-color ease-in; + -webkit-transition:.15s color ease-in,.15s background-color ease-in; + background-color:#3c3c3c; + border-radius:1em; + float:left; + font-size:2.25rem; + height:1em; + margin:0 .25em 0 0; + text-indent:-20000px; + transition:.15s color ease-in,.15s background-color ease-in; + width:1em; +} + +footer p.social a:before +{ + float:left; + font-size:1.25rem; + line-height:1.8; + text-align:center; + text-indent:0; + width:100%; +} + +.lt-ie9 footer p.social a:before +{ + font-size:1.25em; +} + +footer p.social a:active,footer p.social a:focus,footer p.social a:hover +{ + background-color:#353535; + text-decoration:none; +} + +.ie6, .ie7, .ie8 { + footer p.social a { + font-size:2.25em; + } +} + +.ie6, .ie7 { + footer p.social a { + font-size:1.2em!important; + height:1.5em; + text-indent:0; + width:auto; + } +} + +.angus_nav { + display: block; + border-bottom: 1px solid $angus_grey_link; + + .container { + display: block; + font-size: 0.9em; + padding: 1em 20px .75em 20px; + + ul { + margin: 0; + padding: 0; + list-style: none; + + li { + display: inline; + + &::before { + content: ">"; + padding: 0 10px; + } + &:first-child::before { + content: ""; + } + + a { + color: $angus_dark_blue; + } + } + } + } +} + +.nav-menu--main { + display: none; +} + + +.nav-menu--breadcrumb { + display: block; + font-size: 0.75em; + float: left; + + a { + color: $angus_dark_blue; + } + span { + color: $angus_green; + } +} + +.nav-menu--main { + a { + color: $angus_light_grey; + } + + a:hover { + text-decoration: underline; + } + + a.report-a-problem-btn { + color: $angus_light_grey; + background-color: $angus_light_green; + } + + span { + color: white; + } +} + +body.mappage { + .nav-menu--main { + display: block; + } + .nav-menu--breadcrumb { + display: none; + } + + .angus_nav { + display: none; + } + + #site-logo { + height: 54px; + width: 111px; + top: 7px; + left: 7px; + } + + #site-header { + border-bottom: 0; + box-shadow: none; + + form.form__search { + display: none; + } + + .container { + min-height: 4em; + } + } + + #user-meta { + p { + color: $primary_text; + } + + & ~ .container .content { + padding-top: 3.5em; // make room for user menu! + } + } + + #category_meta h4 { + display: none; + } + + #category_meta_message { + padding-top: 0.5em; + font-size: 0.9em; + text-align: center; + } +} + +#user-meta p { + top: 6em; + left: -6em; + color: $angus_light_grey; +} + +.angus_footer { + border-top: solid 8px $angus_grey; + background: $angus_dark_grey; + + footer { + font-size: 0.8em; + max-width: $max_page_width; + margin: 0 auto; + padding-top: 3em; + padding-left: 3em; + + .tablewrapper, .tablewrapper.bordered { + border-top: none; + width: 100%; + color: white; + padding-bottom: 1em; + + a { + color: $angus_grey_link; + } + + ul { + margin: 0; + padding: 1em 0; + + li { + display: inline-block; + margin: 0 .75em .25em 0; + padding: 0; + position: relative; + list-style: none; + + &::after { + margin-left: -2px; + content: ","; + } + &:last-child::after { + content: "."; + } + + a { + color: $angus_grey_link; + &:hover { + color: $angus_light_grey; + } + } + } + } + } + } +} + +.big-green-banner { + display: block; +} diff --git a/web/cobrands/angus/position_map.js b/web/cobrands/angus/position_map.js new file mode 100644 index 000000000..36f572f93 --- /dev/null +++ b/web/cobrands/angus/position_map.js @@ -0,0 +1,357 @@ +// Wrap custom functionality up in a closure to keep scopes tidy +var add_streetlights = (function() { + var wfs_url = "https://data.angus.gov.uk/geoserver/services/wfs"; + var wfs_feature = "lighting_column_v"; + var wfs_fault_feature = "lighting_faults_v"; + var streetlight_category = "Street lighting"; + var max_resolution = 2.388657133579254; + var min_resolution = 0.5971642833948135; + + var streetlight_layer = null; + var streetlight_fault_layer = null; + var select_feature_control; + var hover_feature_control; + var selected_feature = null; + var fault_popup = null; + + function close_fault_popup() { + if (!!fault_popup) { + fixmystreet.map.removePopup(fault_popup); + fault_popup.destroy(); + fault_popup = null; + } + } + + function streetlight_selected(e) { + close_fault_popup(); + var lonlat = e.feature.geometry.getBounds().getCenterLonLat(); + + // Check if there is a known fault with the light that's been clicked, + // and disallow selection if so. + var fault_feature = find_matching_feature(e.feature, streetlight_fault_layer); + if (!!fault_feature) { + fault_popup = new OpenLayers.Popup.FramedCloud("popup", + e.feature.geometry.getBounds().getCenterLonLat(), + null, + "This fault (" + e.feature.attributes.n + ")<br />has been reported.", + { size: new OpenLayers.Size(0, 0), offset: new OpenLayers.Pixel(0, 0) }, + true, close_fault_popup); + fixmystreet.map.addPopup(fault_popup); + select_feature_control.unselect(e.feature); + return; + } + + // Set the 'column id' extra field to the value of the light that was clicked + var column_id = e.feature.attributes.n; + $("#form_column_id").val(column_id); + + // Hide the normal markers layer to keep things simple, but + // move the green marker to the point of the click to stop + // it jumping around unexpectedly if the user deselects street light. + fixmystreet.markers.setVisibility(false); + fixmystreet.markers.features[0].move(lonlat); + + // Need to ensure the correct coords are used for the report + // We can't call fixmystreet_update_pin because that refreshes the category list, + // clobbering the value we stored in the #form_column_id field. + lonlat.transform( + fixmystreet.map.getProjectionObject(), + new OpenLayers.Projection("EPSG:4326") + ); + document.getElementById('fixmystreet.latitude').value = lonlat.lat || lonlat.y; + document.getElementById('fixmystreet.longitude').value = lonlat.lon || lonlat.x; + + // Make sure the marker that was clicked is drawn on top of its neighbours + var layer = e.feature.layer; + var feature = e.feature; + layer.eraseFeatures([feature]); + layer.drawFeature(feature); + + // Keep track of selection in case layer is reloaded or hidden etc. + selected_feature = feature.clone(); + } + + function streetlight_unselected(e) { + fixmystreet.markers.setVisibility(true); + $("#form_column_id").val(""); + selected_feature = null; + } + + function find_matching_feature(feature, layer) { + // When the WFS layer is reloaded the same features might be visible + // but they'll be different instances of the class so we can't use + // object identity comparisons. + // This function will find the best matching feature based on its + // attributes and distance from the original feature. + var threshold = 1; // metres + for (var i = 0; i < layer.features.length; i++) { + var candidate = layer.features[i]; + var distance = candidate.geometry.distanceTo(feature.geometry); + if (candidate.attributes.n == feature.attributes.n && distance <= threshold) { + return candidate; + } + } + } + + function check_zoom_message_visiblity() { + var category = $("#problem_form select#form_category").val(); + if (category == streetlight_category) { + var $p = $("#category_meta_message"); + + if ($p.length === 0) { + $p = $("<p>").prop("id", "category_meta_message"); + // #category_meta might not be here yet, but that's OK as the + // element simply won't be added to the DOM. + $p.insertAfter("#category_meta"); + } + + if (streetlight_layer.getVisibility() && streetlight_layer.inRange) { + $p.html('Or pick a <b class="streetlight-spot">street light</b> from the map »'); + } else { + $p.html('Or zoom in and pick a street light from the map'); + } + + } else { + $("#category_meta_message").remove(); + } + } + + function layer_visibilitychanged() { + check_zoom_message_visiblity(); + select_nearest_streetlight(); + } + + function zoom_to_streetlights() { + // This function is called when the street lighting category is + // selected, and will zoom the map in to the first level that + // makes the street light layer visible if it's not already shown. + if (!streetlight_layer.inRange) { + var firstVisibleResolution = streetlight_layer.resolutions[0]; + var zoomLevel = fixmystreet.map.getZoomForResolution(firstVisibleResolution); + fixmystreet.map.zoomTo(zoomLevel); + } + } + + function select_nearest_streetlight() { + // The user's green marker might be on the map the first time we show the + // streetlights, so snap it to the closest streetlight marker if so. + if (!fixmystreet.markers.getVisibility() || !(streetlight_layer.getVisibility() && streetlight_layer.inRange)) { + return; + } + var threshold = 50; // metres + var marker = fixmystreet.markers.features[0]; + if (marker === undefined) { + // No marker to be found so bail out + return; + } + var closest_feature; + var closest_distance = null; + for (var i = 0; i < streetlight_layer.features.length; i++) { + var candidate = streetlight_layer.features[i]; + var distance = candidate.geometry.distanceTo(marker.geometry); + if (closest_distance === null || distance < closest_distance) { + closest_feature = candidate; + closest_distance = distance; + } + } + if (closest_distance <= threshold && !!closest_feature) { + select_feature_control.select(closest_feature); + } + } + + function layer_loadend(e) { + select_nearest_streetlight(); + // Preserve the selected marker when panning/zooming, if it's still on the map + if (selected_feature !== null && !(selected_feature in this.selectedFeatures)) { + var replacement_feature = find_matching_feature(selected_feature, streetlight_layer); + if (!!replacement_feature) { + select_feature_control.select(replacement_feature); + } + } + } + + function get_streetlight_stylemap() { + return new OpenLayers.StyleMap({ + 'default': new OpenLayers.Style({ + fillColor: "#FFFF00", + fillOpacity: 0.6, + strokeColor: "#000000", + strokeOpacity: 0.8, + strokeWidth: 2, + pointRadius: 6 + }), + 'select': new OpenLayers.Style({ + externalGraphic: fixmystreet.pin_prefix + "pin-spot.png", + graphicWidth: 48, + graphicHeight: 64, + graphicXOffset: -24, + graphicYOffset: -56, + backgroundGraphic: fixmystreet.pin_prefix + "pin-shadow.png", + backgroundWidth: 60, + backgroundHeight: 30, + backgroundXOffset: -7, + backgroundYOffset: -22, + popupYOffset: -40, + graphicOpacity: 1.0 + }), + 'temporary': new OpenLayers.Style({ + fillColor: "#55BB00", + fillOpacity: 0.8, + strokeColor: "#000000", + strokeOpacity: 1, + strokeWidth: 2, + pointRadius: 8, + cursor: 'pointer' + }) + }); + } + + function get_fault_stylemap() { + return new OpenLayers.StyleMap({ + 'default': new OpenLayers.Style({ + fillColor: "#FF6600", + fillOpacity: 1, + strokeColor: "#FF6600", + strokeOpacity: 1, + strokeWidth: 1.25, + pointRadius: 8 + }) + }); + } + + function add_streetlights() { + if (streetlight_layer !== null) { + // Layer has already been added + return; + } + if (window.fixmystreet === undefined) { + // We're on a page without a map, yet somehow still got called... + // Nothing to do. + return; + } + if (fixmystreet.map === undefined) { + // Map's not loaded yet, let's try again soon... + setTimeout(add_streetlights, 250); + return; + } + if (fixmystreet.page != 'new' && fixmystreet.page != 'around') { + // We only want to show light markers when making a new report + return; + } + + // An interactive layer for selecting a street light + var protocol = new OpenLayers.Protocol.WFS({ + version: "1.1.0", + url: wfs_url, + featureType: wfs_feature, + geometryName: "g" + }); + streetlight_layer = new OpenLayers.Layer.Vector("WFS", { + strategies: [new OpenLayers.Strategy.BBOX()], + protocol: protocol, + visibility: false, + maxResolution: max_resolution, + minResolution: min_resolution, + styleMap: get_streetlight_stylemap() + }); + fixmystreet.streetlight_layer = streetlight_layer; + + // A non-interactive layer to display existing street light faults + var fault_protocol = new OpenLayers.Protocol.WFS({ + version: "1.1.0", + url: wfs_url, + featureType: wfs_fault_feature, + geometryName: "g" + }); + streetlight_fault_layer = new OpenLayers.Layer.Vector("WFS", { + strategies: [new OpenLayers.Strategy.BBOX()], + protocol: fault_protocol, + visibility: false, + maxResolution: max_resolution, + minResolution: min_resolution, + styleMap: get_fault_stylemap() + }); + + // Set up handlers for selecting/unselecting markers and panning/zooming the map + select_feature_control = new OpenLayers.Control.SelectFeature( streetlight_layer ); + streetlight_layer.events.register( 'featureselected', streetlight_layer, streetlight_selected); + streetlight_layer.events.register( 'featureunselected', streetlight_layer, streetlight_unselected); + streetlight_layer.events.register( 'loadend', streetlight_layer, layer_loadend); + streetlight_layer.events.register( 'visibilitychanged', streetlight_layer, layer_visibilitychanged); + fixmystreet.map.events.register( 'zoomend', streetlight_layer, check_zoom_message_visiblity); + // Set up handlers for simply hovering over a street light marker + hover_feature_control = new OpenLayers.Control.SelectFeature( + streetlight_layer, + { + hover: true, + highlightOnly: true, + renderIntent: 'temporary' + } + ); + hover_feature_control.events.register('beforefeaturehighlighted', null, function(e) { + // Don't let marker go from selected->hover state, + // as it causes some mad flickering effect. + if (e.feature.renderIntent == 'select') { + return false; + } + }); + + fixmystreet.map.addLayer(streetlight_layer); + fixmystreet.map.addLayer(streetlight_fault_layer); + fixmystreet.map.addControl( hover_feature_control ); + hover_feature_control.activate(); + fixmystreet.map.addControl( select_feature_control ); + select_feature_control.activate(); + + // Make sure the fault markers always appear beneath the street lights + streetlight_fault_layer.setZIndex(streetlight_layer.getZIndex()-1); + + // Show/hide the streetlight layer when the category is chosen + $("#problem_form").on("change.category", "select#form_category", function(){ + var category = $(this).val(); + if (category == streetlight_category) { + streetlight_layer.setVisibility(true); + streetlight_fault_layer.setVisibility(true); + zoom_to_streetlights(); + } else { + streetlight_layer.setVisibility(false); + streetlight_fault_layer.setVisibility(false); + } + }); + + // Make sure the streetlights get hidden if the back button is pressed + $(window).on('hashchange', function() { + if (location.hash === '') { + streetlight_layer.setVisibility(false); + streetlight_fault_layer.setVisibility(false); + fixmystreet.markers.setVisibility(true); + fixmystreet.bbox_strategy.activate(); + fixmystreet.markers.refresh( { force: true } ); + } + }); + } + return add_streetlights; +})(); + +function position_map_box() { + var $html = $('html'); + 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 { + $('#map_box').prependTo('body').css({ + zIndex: 0, position: 'fixed', + top: 0, left: 0, right: 0, bottom: 0, + width: '100%', height: '100%', + margin: 0 + }); + } + add_streetlights(); +} + +function map_fix() {} +var slide_wards_down = 0; diff --git a/web/cobrands/angus/tab-red.png b/web/cobrands/angus/tab-red.png Binary files differnew file mode 100644 index 000000000..f3ef9d084 --- /dev/null +++ b/web/cobrands/angus/tab-red.png diff --git a/web/cobrands/angus/third_party/css/css.css b/web/cobrands/angus/third_party/css/css.css new file mode 100644 index 000000000..3ca6c8f5b --- /dev/null +++ b/web/cobrands/angus/third_party/css/css.css @@ -0,0 +1,36 @@ +@font-face { + font-family: 'PT Sans'; + font-style: normal; + font-weight: 400; + src: local('PT Sans'), local('PTSans-Regular'), url(http://themes.googleusercontent.com/static/fonts/ptsans/v6/7YGmE4Ls5b94ct65u07hVQLUuEpTyoUstqEm5AMlJo4.woff) format('woff'); +} +@font-face { + font-family: 'PT Sans'; + font-style: normal; + font-weight: 700; + src: local('PT Sans Bold'), local('PTSans-Bold'), url(http://themes.googleusercontent.com/static/fonts/ptsans/v6/0XxGQsSc1g4rdRdjJKZrNL3hpw3pgy2gAi-Ip7WPMi0.woff) format('woff'); +} +@font-face { + font-family: 'PT Sans'; + font-style: italic; + font-weight: 400; + src: local('PT Sans Italic'), local('PTSans-Italic'), url(http://themes.googleusercontent.com/static/fonts/ptsans/v6/PIPMHY90P7jtyjpXuZ2cLLO3LdcAZYWl9Si6vvxL-qU.woff) format('woff'); +} +@font-face { + font-family: 'PT Sans'; + font-style: italic; + font-weight: 700; + src: local('PT Sans Bold Italic'), local('PTSans-BoldItalic'), url(http://themes.googleusercontent.com/static/fonts/ptsans/v6/lILlYDvubYemzYzN7GbLkKRDOzjiPcYnFooOUGCOsRk.woff) format('woff'); +} +@font-face { + font-family: 'Sintony'; + font-style: normal; + font-weight: 400; + src: local('Sintony'), url(http://themes.googleusercontent.com/static/fonts/sintony/v2/cu1c4tOdDXpghDFFDdv7MgLUuEpTyoUstqEm5AMlJo4.woff) format('woff'); +} +@font-face { + font-family: 'Sintony'; + font-style: normal; + font-weight: 700; + src: local('Sintony Bold'), local('Sintony-Bold'), url(http://themes.googleusercontent.com/static/fonts/sintony/v2/TiXPkS2VjL9yF_daQZv9Ir3hpw3pgy2gAi-Ip7WPMi0.woff) format('woff'); +} diff --git a/web/cobrands/angus/third_party/css/standard-ie8.css b/web/cobrands/angus/third_party/css/standard-ie8.css new file mode 100644 index 000000000..57211378b --- /dev/null +++ b/web/cobrands/angus/third_party/css/standard-ie8.css @@ -0,0 +1 @@ +@charset "UTF-8";@font-face{font-family:angusgov;src:url(../fonts/angusgov.eot?-q16et6);src:url(../fonts/angusgov.eot?#iefix-q16et6) format("embedded-opentype"),url(../fonts/angusgov.woff?-q16et6) format("woff"),url(../fonts/angusgov.ttf?-q16et6) format("truetype"),url(../fonts/angusgov.svg?-q16et6#angusgov) format("svg");font-weight:400;font-style:normal}[class*=" icon-"]:before,[class^=icon-]:before{font-family:angusgov;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-alert:before{content:"\e600"}.icon-briefcase:before{content:"\e601"}.icon-time:before{content:"\e602"}.icon-payment:before{content:"\e603"}.icon-position:before{content:"\e604"}.icon-picture:before{content:"\e605"}.icon-direction:before{content:"\e606"}.icon-bin:before{content:"\e607"}.icon-education:before{content:"\e608"}.icon-tennis:before{content:"\e609"}.icon-football:before{content:"\e60a"}.icon-roads:before{content:"\e60b"}.icon-repair:before{content:"\e60c"}.icon-identity:before{content:"\e60d"}.icon-regenerate:before{content:"\e60e"}.icon-transport:before{content:"\e60f"}.icon-traffic:before{content:"\e610"}.icon-health:before{content:"\e611"}.icon-clipboard:before{content:"\e612"}.icon-number:before{content:"\e63e"}.icon-number2:before{content:"\e63f"}.icon-number3:before{content:"\e640"}.icon-number4:before{content:"\e641"}.icon-number5:before{content:"\e642"}.icon-number6:before{content:"\e643"}.icon-number7:before{content:"\e644"}.icon-number8:before{content:"\e645"}.icon-number9:before{content:"\e646"}.icon-number10:before{content:"\e647"}.icon-number11:before{content:"\e648"}.icon-number12:before{content:"\e649"}.icon-number13:before{content:"\e64a"}.icon-number14:before{content:"\e64b"}.icon-number15:before{content:"\e64c"}.icon-number16:before{content:"\e64d"}.icon-number17:before{content:"\e64e"}.icon-number18:before{content:"\e64f"}.icon-number19:before{content:"\e650"}.icon-number20:before{content:"\e651"}.icon-quote:before{content:"\e652"}.icon-quote2:before{content:"\e653"}.icon-tag:before{content:"\e654"}.icon-tag2:before{content:"\e655"}.icon-link:before{content:"\e656"}.icon-link2:before{content:"\e657"}.icon-cabinet:before{content:"\e658"}.icon-cabinet2:before{content:"\e659"}.icon-calendar:before{content:"\e65a"}.icon-calendar2:before{content:"\e65b"}.icon-calendar3:before{content:"\e65c"}.icon-file:before{content:"\e65d"}.icon-file2:before{content:"\e65e"}.icon-file3:before{content:"\e65f"}.icon-files:before{content:"\e660"}.icon-phone:before{content:"\e661"}.icon-tablet:before{content:"\e662"}.icon-window:before{content:"\e663"}.icon-monitor:before{content:"\e664"}.icon-ipod:before{content:"\e665"}.icon-tv:before{content:"\e666"}.icon-camera:before{content:"\e667"}.icon-camera2:before{content:"\e668"}.icon-camera3:before{content:"\e669"}.icon-film:before{content:"\e66a"}.icon-film2:before{content:"\e66b"}.icon-film3:before{content:"\e66c"}.icon-microphone:before{content:"\e66d"}.icon-microphone2:before{content:"\e66e"}.icon-microphone3:before{content:"\e66f"}.icon-drink:before{content:"\e670"}.icon-drink2:before{content:"\e671"}.icon-drink3:before{content:"\e672"}.icon-drink4:before{content:"\e673"}.icon-coffee:before{content:"\e674"}.icon-mug:before{content:"\e675"}.icon-icecream:before{content:"\e676"}.icon-cake:before{content:"\e677"}.icon-inbox:before{content:"\e678"}.icon-download:before{content:"\e679"}.icon-upload:before{content:"\e67a"}.icon-inbox2:before{content:"\e67b"}.icon-checkmark:before{content:"\e67c"}.icon-checkmark2:before{content:"\e67d"}.icon-cancel:before{content:"\e67e"}.icon-cancel2:before{content:"\e67f"}.icon-plus:before{content:"\e680"}.icon-plus2:before{content:"\e681"}.icon-minus:before{content:"\e682"}.icon-minus2:before{content:"\e683"}.icon-notice:before{content:"\e684"}.icon-alert2:before{content:"\e61f"}.icon-cog:before{content:"\e685"}.icon-cogs:before{content:"\e686"}.icon-cog2:before{content:"\e687"}.icon-warning:before{content:"\e688"}.icon-health2:before{content:"\e689"}.icon-suitcase:before{content:"\e68a"}.icon-suitcase2:before{content:"\e68b"}.icon-briefcase2:before{content:"\e620"}.icon-picture2:before{content:"\e68c"}.icon-pictures:before{content:"\e68d"}.icon-pictures2:before{content:"\e68e"}.icon-android:before{content:"\e68f"}.icon-marvin:before{content:"\e690"}.icon-pacman:before{content:"\e691"}.icon-cassette:before{content:"\e692"}.icon-watch:before{content:"\e693"}.icon-chronometer:before{content:"\e694"}.icon-time2:before{content:"\e621"}.icon-alarmclock:before{content:"\e695"}.icon-time3:before{content:"\e696"}.icon-time4:before{content:"\e697"}.icon-headphones:before{content:"\e698"}.icon-payment2:before{content:"\e622"}.icon-checkmark3:before{content:"\e699"}.icon-cancel3:before{content:"\e69a"}.icon-eye:before{content:"\e69b"}.icon-position2:before{content:"\e623"}.icon-sitemap:before{content:"\e69c"}.icon-sitemap2:before{content:"\e69d"}.icon-cloud:before{content:"\e69e"}.icon-upload2:before{content:"\e69f"}.icon-chart:before{content:"\e6a0"}.icon-chart2:before{content:"\e6a1"}.icon-chart3:before{content:"\e6a2"}.icon-chart4:before{content:"\e6a3"}.icon-chart5:before{content:"\e6a4"}.icon-chart6:before{content:"\e6a5"}.icon-location:before{content:"\e6a6"}.icon-download2:before{content:"\e6a7"}.icon-basket:before{content:"\e6a8"}.icon-folder:before{content:"\e6a9"}.icon-gamepad:before{content:"\e6aa"}.icon-alarm:before{content:"\e6ab"}.icon-alarm-cancel:before{content:"\e6ac"}.icon-phone2:before{content:"\e6ad"}.icon-phone3:before{content:"\e6ae"}.icon-picture3:before{content:"\e624"}.icon-open:before{content:"\e6af"}.icon-sale:before{content:"\e6b0"}.icon-direction2:before{content:"\e625"}.icon-map:before{content:"\e6b1"}.icon-bin2:before{content:"\e626"}.icon-vote:before{content:"\e6b2"}.icon-education2:before{content:"\e627"}.icon-lab:before{content:"\e6b3"}.icon-tie:before{content:"\e6b4"}.icon-football2:before{content:"\e6b5"}.icon-eightball:before{content:"\e6b6"}.icon-bowling:before{content:"\e6b7"}.icon-bowlingpin:before{content:"\e6b8"}.icon-tennis2:before{content:"\e628"}.icon-football3:before{content:"\e629"}.icon-dglasses:before{content:"\e6b9"}.icon-microwave:before{content:"\e6ba"}.icon-refrigerator:before{content:"\e6bb"}.icon-oven:before{content:"\e6bc"}.icon-washingmachine:before{content:"\e6bd"}.icon-mouse:before{content:"\e6be"}.icon-smiley:before{content:"\e6bf"}.icon-sad:before{content:"\e6c0"}.icon-mute:before{content:"\e6c1"}.icon-hand:before{content:"\e6c2"}.icon-radio:before{content:"\e6c3"}.icon-satellite:before{content:"\e6c4"}.icon-medal:before{content:"\e6c5"}.icon-medal2:before{content:"\e6c6"}.icon-switch:before{content:"\e6c7"}.icon-key:before{content:"\e6c8"}.icon-cord:before{content:"\e6c9"}.icon-locked:before{content:"\e6ca"}.icon-unlocked:before{content:"\e6cb"}.icon-locked2:before{content:"\e6cc"}.icon-unlocked2:before{content:"\e6cd"}.icon-magnifier:before{content:"\e6ce"}.icon-zoomin:before{content:"\e6cf"}.icon-zoomout:before{content:"\e6d0"}.icon-stack:before{content:"\e6d1"}.icon-stack2:before{content:"\e6d2"}.icon-stack3:before{content:"\e6d3"}.icon-davidstar:before{content:"\e6d4"}.icon-cross:before{content:"\e6d5"}.icon-moonandstar:before{content:"\e6d6"}.icon-transformers:before{content:"\e6d7"}.icon-batman:before{content:"\e6d8"}.icon-spaceinvaders:before{content:"\e6d9"}.icon-skeletor:before{content:"\e6da"}.icon-lamp:before{content:"\e6db"}.icon-lamp2:before{content:"\e6dc"}.icon-umbrella:before{content:"\e6dd"}.icon-roads2:before{content:"\e62a"}.icon-bomb:before{content:"\e6de"}.icon-archive:before{content:"\e6df"}.icon-battery:before{content:"\e6e0"}.icon-battery2:before{content:"\e6e1"}.icon-battery3:before{content:"\e6e2"}.icon-battery4:before{content:"\e6e3"}.icon-battery5:before{content:"\e6e4"}.icon-megaphone:before{content:"\e6e5"}.icon-megaphone2:before{content:"\e6e6"}.icon-patch:before{content:"\e6e7"}.icon-pil:before{content:"\e6e8"}.icon-injection:before{content:"\e6e9"}.icon-thermometer:before{content:"\e6ea"}.icon-lamp3:before{content:"\e6eb"}.icon-lamp4:before{content:"\e6ec"}.icon-lamp5:before{content:"\e6ed"}.icon-cube:before{content:"\e6ee"}.icon-box:before{content:"\e6ef"}.icon-box2:before{content:"\e6f0"}.icon-diamond:before{content:"\e6f1"}.icon-bag:before{content:"\e6f2"}.icon-moneybag:before{content:"\e6f3"}.icon-grid:before{content:"\e6f4"}.icon-grid2:before{content:"\e6f5"}.icon-list:before{content:"\e6f6"}.icon-list2:before{content:"\e6f7"}.icon-ruler:before{content:"\e6f8"}.icon-ruler2:before{content:"\e6f9"}.icon-layout:before{content:"\e6fa"}.icon-layout2:before{content:"\e6fb"}.icon-layout3:before{content:"\e6fc"}.icon-layout4:before{content:"\e6fd"}.icon-layout5:before{content:"\e6fe"}.icon-layout6:before{content:"\e6ff"}.icon-layout7:before{content:"\e700"}.icon-layout8:before{content:"\e701"}.icon-layout9:before{content:"\e702"}.icon-layout10:before{content:"\e703"}.icon-layout11:before{content:"\e704"}.icon-layout12:before{content:"\e705"}.icon-layout13:before{content:"\e706"}.icon-layout14:before{content:"\e707"}.icon-tools:before{content:"\e708"}.icon-repair2:before{content:"\e62b"}.icon-paint:before{content:"\e709"}.icon-hammer:before{content:"\e70a"}.icon-brush:before{content:"\e70b"}.icon-pen:before{content:"\e70c"}.icon-chat:before{content:"\e70d"}.icon-comments:before{content:"\e70e"}.icon-chat2:before{content:"\e70f"}.icon-chat3:before{content:"\e710"}.icon-volume:before{content:"\e711"}.icon-volume2:before{content:"\e712"}.icon-volume3:before{content:"\e713"}.icon-equalizer:before{content:"\e714"}.icon-resize:before{content:"\e715"}.icon-resize2:before{content:"\e716"}.icon-stretch:before{content:"\e717"}.icon-narrow:before{content:"\e718"}.icon-resize3:before{content:"\e719"}.icon-download3:before{content:"\e71a"}.icon-calculator:before{content:"\e71b"}.icon-library:before{content:"\e71c"}.icon-auction:before{content:"\e71d"}.icon-justice:before{content:"\e71e"}.icon-stats:before{content:"\e71f"}.icon-stats2:before{content:"\e720"}.icon-attachment:before{content:"\e721"}.icon-hourglass:before{content:"\e722"}.icon-abacus:before{content:"\e723"}.icon-pencil:before{content:"\e724"}.icon-pen2:before{content:"\e725"}.icon-pin:before{content:"\e726"}.icon-pin2:before{content:"\e727"}.icon-discout:before{content:"\e728"}.icon-edit:before{content:"\e729"}.icon-scissors:before{content:"\e72a"}.icon-identity2:before{content:"\e62c"}.icon-profile:before{content:"\e72b"}.icon-profile2:before{content:"\e72c"}.icon-rotate:before{content:"\e72d"}.icon-regenerate2:before{content:"\e62d"}.icon-reply:before{content:"\e72e"}.icon-forward:before{content:"\e72f"}.icon-retweet:before{content:"\e730"}.icon-shuffle:before{content:"\e731"}.icon-loop:before{content:"\e732"}.icon-crop:before{content:"\e733"}.icon-square:before{content:"\e734"}.icon-square2:before{content:"\e735"}.icon-circle:before{content:"\e736"}.icon-dollar:before{content:"\e737"}.icon-dollar2:before{content:"\e738"}.icon-coins:before{content:"\e739"}.icon-pig:before{content:"\e73a"}.icon-bookmark:before{content:"\e73b"}.icon-bookmark2:before{content:"\e73c"}.icon-addressbook:before{content:"\e73d"}.icon-addressbook2:before{content:"\e73e"}.icon-safe:before{content:"\e73f"}.icon-envelope:before{content:"\e740"}.icon-envelope2:before{content:"\e741"}.icon-radioactive:before{content:"\e742"}.icon-music:before{content:"\e743"}.icon-presentation:before{content:"\e744"}.icon-male:before{content:"\e745"}.icon-female:before{content:"\e746"}.icon-aids:before{content:"\e747"}.icon-heart:before{content:"\e748"}.icon-info:before{content:"\e749"}.icon-info2:before{content:"\e74a"}.icon-piano:before{content:"\e74b"}.icon-rain:before{content:"\e74c"}.icon-snow:before{content:"\e74d"}.icon-lightning:before{content:"\e74e"}.icon-sun:before{content:"\e74f"}.icon-moon:before{content:"\e750"}.icon-cloudy:before{content:"\e751"}.icon-cloudy2:before{content:"\e752"}.icon-car:before{content:"\e753"}.icon-bike:before{content:"\e754"}.icon-truck:before{content:"\e755"}.icon-transport2:before{content:"\e62e"}.icon-bike2:before{content:"\e756"}.icon-plane:before{content:"\e757"}.icon-paperplane:before{content:"\e758"}.icon-rocket:before{content:"\e759"}.icon-book:before{content:"\e75a"}.icon-book2:before{content:"\e75b"}.icon-barcode:before{content:"\e75c"}.icon-barcode2:before{content:"\e75d"}.icon-expand:before{content:"\e75e"}.icon-collapse:before{content:"\e75f"}.icon-popout:before{content:"\e760"}.icon-popin:before{content:"\e761"}.icon-target:before{content:"\e762"}.icon-badge:before{content:"\e763"}.icon-badge2:before{content:"\e764"}.icon-ticket:before{content:"\e765"}.icon-ticket2:before{content:"\e766"}.icon-ticket3:before{content:"\e767"}.icon-microphone4:before{content:"\e768"}.icon-traffic2:before{content:"\e62f"}.icon-blocked:before{content:"\e769"}.icon-stop:before{content:"\e76a"}.icon-keyboard:before{content:"\e76b"}.icon-keyboard2:before{content:"\e76c"}.icon-radio2:before{content:"\e76d"}.icon-printer:before{content:"\e76e"}.icon-checked:before{content:"\e76f"}.icon-error:before{content:"\e770"}.icon-add:before{content:"\e771"}.icon-minus3:before{content:"\e772"}.icon-alert3:before{content:"\e773"}.icon-pictures3:before{content:"\e774"}.icon-atom:before{content:"\e775"}.icon-eyedropper:before{content:"\e776"}.icon-globe:before{content:"\e777"}.icon-globe2:before{content:"\e778"}.icon-shipping:before{content:"\e779"}.icon-yingyang:before{content:"\e77a"}.icon-compass:before{content:"\e77b"}.icon-zip:before{content:"\e77c"}.icon-zip2:before{content:"\e77d"}.icon-anchor:before{content:"\e77e"}.icon-lockedheart:before{content:"\e77f"}.icon-magnet:before{content:"\e780"}.icon-navigation:before{content:"\e781"}.icon-tags:before{content:"\e782"}.icon-health3:before{content:"\e630"}.icon-heart2:before{content:"\e783"}.icon-usb:before{content:"\e784"}.icon-clipboard2:before{content:"\e785"}.icon-clipboard3:before{content:"\e631"}.icon-clipboard4:before{content:"\e786"}.icon-switch2:before{content:"\e787"}.icon-ruler3:before{content:"\e788"}.icon-house:before{content:"\e613"}.icon-buildings:before{content:"\e614"}.icon-books:before{content:"\e615"}.icon-museum:before{content:"\e616"}.icon-map2:before{content:"\e617"}.icon-people:before{content:"\e618"}.icon-leaf:before{content:"\e619"}.icon-live:before{content:"\e61a"}.icon-community:before{content:"\e61b"}.icon-facebook:before{content:"\e61c"}.icon-twitter:before{content:"\e61d"}.icon-youtube:before{content:"\e61e"}.icon-house2:before{content:"\e632"}.icon-home:before{content:"\e789"}.icon-home2:before{content:"\e78a"}.icon-buildings2:before{content:"\e633"}.icon-newspaper:before{content:"\e78b"}.icon-pencil2:before{content:"\e78c"}.icon-pencil3:before{content:"\e78d"}.icon-quill:before{content:"\e78e"}.icon-pen3:before{content:"\e78f"}.icon-blog:before{content:"\e790"}.icon-droplet:before{content:"\e791"}.icon-paint-format:before{content:"\e792"}.icon-image:before{content:"\e793"}.icon-image2:before{content:"\e794"}.icon-images:before{content:"\e795"}.icon-camera4:before{content:"\e796"}.icon-music2:before{content:"\e797"}.icon-headphones2:before{content:"\e798"}.icon-play:before{content:"\e799"}.icon-film4:before{content:"\e79a"}.icon-camera5:before{content:"\e79b"}.icon-dice:before{content:"\e79c"}.icon-pacman2:before{content:"\e79d"}.icon-spades:before{content:"\e79e"}.icon-clubs:before{content:"\e79f"}.icon-diamonds:before{content:"\e7a0"}.icon-pawn:before{content:"\e7a1"}.icon-bullhorn:before{content:"\e7a2"}.icon-connection:before{content:"\e7a3"}.icon-podcast:before{content:"\e7a4"}.icon-feed:before{content:"\e7a5"}.icon-book3:before{content:"\e7a6"}.icon-books2:before{content:"\e634"}.icon-museum2:before{content:"\e635"}.icon-file4:before{content:"\e7a7"}.icon-profile3:before{content:"\e7a8"}.icon-file5:before{content:"\e7a9"}.icon-file6:before{content:"\e7aa"}.icon-file7:before{content:"\e7ab"}.icon-copy:before{content:"\e7ac"}.icon-copy2:before{content:"\e7ad"}.icon-copy3:before{content:"\e7ae"}.icon-paste:before{content:"\e7af"}.icon-paste2:before{content:"\e7b0"}.icon-paste3:before{content:"\e7b1"}.icon-stack4:before{content:"\e7b2"}.icon-folder2:before{content:"\e7b3"}.icon-folder-open:before{content:"\e7b4"}.icon-tag3:before{content:"\e7b5"}.icon-tags2:before{content:"\e7b6"}.icon-barcode3:before{content:"\e7b7"}.icon-qrcode:before{content:"\e7b8"}.icon-ticket4:before{content:"\e7b9"}.icon-cart:before{content:"\e7ba"}.icon-cart2:before{content:"\e7bb"}.icon-cart3:before{content:"\e7bc"}.icon-coin:before{content:"\e7bd"}.icon-credit:before{content:"\e7be"}.icon-calculate:before{content:"\e7bf"}.icon-support:before{content:"\e7c0"}.icon-phone4:before{content:"\e7c1"}.icon-phone-hang-up:before{content:"\e7c2"}.icon-address-book:before{content:"\e7c3"}.icon-notebook:before{content:"\e7c4"}.icon-envelope3:before{content:"\e7c5"}.icon-pushpin:before{content:"\e7c6"}.icon-location2:before{content:"\e7c7"}.icon-location3:before{content:"\e7c8"}.icon-compass2:before{content:"\e7c9"}.icon-map3:before{content:"\e636"}.icon-map4:before{content:"\e7ca"}.icon-history:before{content:"\e7cb"}.icon-clock:before{content:"\e7cc"}.icon-clock2:before{content:"\e7cd"}.icon-alarm2:before{content:"\e7ce"}.icon-alarm3:before{content:"\e7cf"}.icon-bell:before{content:"\e7d0"}.icon-stopwatch:before{content:"\e7d1"}.icon-calendar4:before{content:"\e7d2"}.icon-calendar5:before{content:"\e7d3"}.icon-print:before{content:"\e7d4"}.icon-keyboard3:before{content:"\e7d5"}.icon-screen:before{content:"\e7d6"}.icon-laptop:before{content:"\e7d7"}.icon-mobile:before{content:"\e7d8"}.icon-mobile2:before{content:"\e7d9"}.icon-tablet2:before{content:"\e7da"}.icon-tv2:before{content:"\e7db"}.icon-cabinet3:before{content:"\e7dc"}.icon-drawer:before{content:"\e7dd"}.icon-drawer2:before{content:"\e7de"}.icon-drawer3:before{content:"\e7df"}.icon-box-add:before{content:"\e7e0"}.icon-box-remove:before{content:"\e7e1"}.icon-download4:before{content:"\e7e2"}.icon-upload3:before{content:"\e7e3"}.icon-disk:before{content:"\e7e4"}.icon-storage:before{content:"\e7e5"}.icon-undo:before{content:"\e7e6"}.icon-redo:before{content:"\e7e7"}.icon-flip:before{content:"\e7e8"}.icon-flip2:before{content:"\e7e9"}.icon-undo2:before{content:"\e7ea"}.icon-redo2:before{content:"\e7eb"}.icon-forward2:before{content:"\e7ec"}.icon-reply2:before{content:"\e7ed"}.icon-bubble:before{content:"\e7ee"}.icon-bubbles:before{content:"\e7ef"}.icon-bubbles2:before{content:"\e7f0"}.icon-bubble2:before{content:"\e7f1"}.icon-bubbles3:before{content:"\e7f2"}.icon-bubbles4:before{content:"\e7f3"}.icon-user:before{content:"\e7f4"}.icon-people2:before{content:"\e637"}.icon-user2:before{content:"\e7f5"}.icon-users:before{content:"\e7f6"}.icon-user3:before{content:"\e7f7"}.icon-user4:before{content:"\e7f8"}.icon-quotes-left:before{content:"\e7f9"}.icon-busy:before{content:"\e7fa"}.icon-spinner:before{content:"\e7fb"}.icon-spinner2:before{content:"\e7fc"}.icon-spinner3:before{content:"\e7fd"}.icon-spinner4:before{content:"\e7fe"}.icon-spinner5:before{content:"\e7ff"}.icon-spinner6:before{content:"\e800"}.icon-binoculars:before{content:"\e801"}.icon-search:before{content:"\e802"}.icon-zoomin2:before{content:"\e803"}.icon-zoomout2:before{content:"\e804"}.icon-expand2:before{content:"\e805"}.icon-contract:before{content:"\e806"}.icon-expand3:before{content:"\e807"}.icon-contract2:before{content:"\e808"}.icon-key2:before{content:"\e809"}.icon-key3:before{content:"\e80a"}.icon-lock:before{content:"\e80b"}.icon-lock2:before{content:"\e80c"}.icon-unlocked3:before{content:"\e80d"}.icon-wrench:before{content:"\e80e"}.icon-settings:before{content:"\e80f"}.icon-equalizer2:before{content:"\e810"}.icon-cog3:before{content:"\e811"}.icon-cogs2:before{content:"\e812"}.icon-cog4:before{content:"\e813"}.icon-hammer2:before{content:"\e814"}.icon-wand:before{content:"\e815"}.icon-aid:before{content:"\e816"}.icon-bug:before{content:"\e817"}.icon-pie:before{content:"\e818"}.icon-stats3:before{content:"\e819"}.icon-bars:before{content:"\e81a"}.icon-bars2:before{content:"\e81b"}.icon-gift:before{content:"\e81c"}.icon-trophy:before{content:"\e81d"}.icon-glass:before{content:"\e81e"}.icon-mug2:before{content:"\e81f"}.icon-food:before{content:"\e820"}.icon-leaf2:before{content:"\e638"}.icon-rocket2:before{content:"\e821"}.icon-meter:before{content:"\e822"}.icon-meter2:before{content:"\e823"}.icon-dashboard:before{content:"\e824"}.icon-hammer3:before{content:"\e825"}.icon-fire:before{content:"\e826"}.icon-lab2:before{content:"\e827"}.icon-magnet2:before{content:"\e828"}.icon-remove:before{content:"\e829"}.icon-remove2:before{content:"\e82a"}.icon-briefcase3:before{content:"\e82b"}.icon-airplane:before{content:"\e82c"}.icon-truck2:before{content:"\e82d"}.icon-road:before{content:"\e82e"}.icon-accessibility:before{content:"\e82f"}.icon-target2:before{content:"\e830"}.icon-shield:before{content:"\e831"}.icon-live2:before{content:"\e639"}.icon-switch3:before{content:"\e832"}.icon-powercord:before{content:"\e833"}.icon-signup:before{content:"\e834"}.icon-list3:before{content:"\e835"}.icon-list4:before{content:"\e836"}.icon-numbered-list:before{content:"\e837"}.icon-menu:before{content:"\e838"}.icon-menu2:before{content:"\e839"}.icon-tree:before{content:"\e83a"}.icon-cloud2:before{content:"\e83b"}.icon-cloud-download:before{content:"\e83c"}.icon-cloud-upload:before{content:"\e83d"}.icon-download5:before{content:"\e83e"}.icon-upload4:before{content:"\e83f"}.icon-download6:before{content:"\e840"}.icon-upload5:before{content:"\e841"}.icon-globe3:before{content:"\e842"}.icon-earth:before{content:"\e843"}.icon-link3:before{content:"\e844"}.icon-flag:before{content:"\e845"}.icon-attachment2:before{content:"\e846"}.icon-community2:before{content:"\e63a"}.icon-eye-blocked:before{content:"\e847"}.icon-eye2:before{content:"\e848"}.icon-bookmark3:before{content:"\e849"}.icon-bookmarks:before{content:"\e84a"}.icon-brightness-medium:before{content:"\e84b"}.icon-brightness-contrast:before{content:"\e84c"}.icon-contrast:before{content:"\e84d"}.icon-star:before{content:"\e84e"}.icon-star2:before{content:"\e84f"}.icon-star3:before{content:"\e850"}.icon-heart3:before{content:"\e851"}.icon-heart4:before{content:"\e852"}.icon-heart-broken:before{content:"\e853"}.icon-thumbs-up:before{content:"\e854"}.icon-thumbs-up2:before{content:"\e855"}.icon-happy:before{content:"\e856"}.icon-happy2:before{content:"\e857"}.icon-smiley2:before{content:"\e858"}.icon-smiley3:before{content:"\e859"}.icon-tongue:before{content:"\e85a"}.icon-tongue2:before{content:"\e85b"}.icon-sad2:before{content:"\e85c"}.icon-sad3:before{content:"\e85d"}.icon-wink:before{content:"\e85e"}.icon-wink2:before{content:"\e85f"}.icon-grin:before{content:"\e860"}.icon-grin2:before{content:"\e861"}.icon-cool:before{content:"\e862"}.icon-cool2:before{content:"\e863"}.icon-angry:before{content:"\e864"}.icon-angry2:before{content:"\e865"}.icon-evil:before{content:"\e866"}.icon-evil2:before{content:"\e867"}.icon-shocked:before{content:"\e868"}.icon-shocked2:before{content:"\e869"}.icon-confused:before{content:"\e86a"}.icon-confused2:before{content:"\e86b"}.icon-neutral:before{content:"\e86c"}.icon-neutral2:before{content:"\e86d"}.icon-wondering:before{content:"\e86e"}.icon-wondering2:before{content:"\e86f"}.icon-point-up:before{content:"\e870"}.icon-point-right:before{content:"\e871"}.icon-point-down:before{content:"\e872"}.icon-point-left:before{content:"\e873"}.icon-warning2:before{content:"\e874"}.icon-notification:before{content:"\e875"}.icon-question:before{content:"\e876"}.icon-info3:before{content:"\e877"}.icon-info4:before{content:"\e878"}.icon-blocked2:before{content:"\e879"}.icon-cancel-circle:before{content:"\e87a"}.icon-checkmark-circle:before{content:"\e87b"}.icon-spam:before{content:"\e87c"}.icon-close:before{content:"\e87d"}.icon-checkmark4:before{content:"\e87e"}.icon-checkmark5:before{content:"\e87f"}.icon-spell-check:before{content:"\e880"}.icon-minus4:before{content:"\e881"}.icon-plus3:before{content:"\e882"}.icon-enter:before{content:"\e883"}.icon-exit:before{content:"\e884"}.icon-play2:before{content:"\e885"}.icon-pause:before{content:"\e886"}.icon-stop2:before{content:"\e887"}.icon-backward:before{content:"\e888"}.icon-forward3:before{content:"\e889"}.icon-play3:before{content:"\e88a"}.icon-pause2:before{content:"\e88b"}.icon-stop3:before{content:"\e88c"}.icon-backward2:before{content:"\e88d"}.icon-forward4:before{content:"\e88e"}.icon-first:before{content:"\e88f"}.icon-last:before{content:"\e890"}.icon-previous:before{content:"\e891"}.icon-next:before{content:"\e892"}.icon-eject:before{content:"\e893"}.icon-volume-high:before{content:"\e894"}.icon-volume-medium:before{content:"\e895"}.icon-volume-low:before{content:"\e896"}.icon-volume-mute:before{content:"\e897"}.icon-volume-mute2:before{content:"\e898"}.icon-volume-increase:before{content:"\e899"}.icon-volume-decrease:before{content:"\e89a"}.icon-loop2:before{content:"\e89b"}.icon-loop3:before{content:"\e89c"}.icon-loop4:before{content:"\e89d"}.icon-shuffle2:before{content:"\e89e"}.icon-arrow-up-left:before{content:"\e89f"}.icon-arrow-up:before{content:"\e8a0"}.icon-arrow-up-right:before{content:"\e8a1"}.icon-arrow-right:before{content:"\e8a2"}.icon-arrow-down-right:before{content:"\e8a3"}.icon-arrow-down:before{content:"\e8a4"}.icon-arrow-down-left:before{content:"\e8a5"}.icon-arrow-left:before{content:"\e8a6"}.icon-arrow-up-left2:before{content:"\e8a7"}.icon-arrow-up2:before{content:"\e8a8"}.icon-arrow-up-right2:before{content:"\e8a9"}.icon-arrow-right2:before{content:"\e8aa"}.icon-arrow-down-right2:before{content:"\e8ab"}.icon-arrow-down2:before{content:"\e8ac"}.icon-arrow-down-left2:before{content:"\e8ad"}.icon-arrow-left2:before{content:"\e8ae"}.icon-arrow-up-left3:before{content:"\e8af"}.icon-arrow-up3:before{content:"\e8b0"}.icon-arrow-up-right3:before{content:"\e8b1"}.icon-arrow-right3:before{content:"\e8b2"}.icon-arrow-down-right3:before{content:"\e8b3"}.icon-arrow-down3:before{content:"\e8b4"}.icon-arrow-down-left3:before{content:"\e8b5"}.icon-arrow-left3:before{content:"\e8b6"}.icon-tab:before{content:"\e8b7"}.icon-checkbox-checked:before{content:"\e8b8"}.icon-checkbox-unchecked:before{content:"\e8b9"}.icon-checkbox-partial:before{content:"\e8ba"}.icon-radio-checked:before{content:"\e8bb"}.icon-radio-unchecked:before{content:"\e8bc"}.icon-crop2:before{content:"\e8bd"}.icon-scissors2:before{content:"\e8be"}.icon-filter:before{content:"\e8bf"}.icon-filter2:before{content:"\e8c0"}.icon-font:before{content:"\e8c1"}.icon-text-height:before{content:"\e8c2"}.icon-text-width:before{content:"\e8c3"}.icon-bold:before{content:"\e8c4"}.icon-underline:before{content:"\e8c5"}.icon-italic:before{content:"\e8c6"}.icon-strikethrough:before{content:"\e8c7"}.icon-omega:before{content:"\e8c8"}.icon-sigma:before{content:"\e8c9"}.icon-table:before{content:"\e8ca"}.icon-table2:before{content:"\e8cb"}.icon-insert-template:before{content:"\e8cc"}.icon-pilcrow:before{content:"\e8cd"}.icon-lefttoright:before{content:"\e8ce"}.icon-righttoleft:before{content:"\e8cf"}.icon-paragraph-left:before{content:"\e8d0"}.icon-paragraph-center:before{content:"\e8d1"}.icon-paragraph-right:before{content:"\e8d2"}.icon-paragraph-justify:before{content:"\e8d3"}.icon-paragraph-left2:before{content:"\e8d4"}.icon-paragraph-center2:before{content:"\e8d5"}.icon-paragraph-right2:before{content:"\e8d6"}.icon-paragraph-justify2:before{content:"\e8d7"}.icon-indent-increase:before{content:"\e8d8"}.icon-indent-decrease:before{content:"\e8d9"}.icon-newtab:before{content:"\e8da"}.icon-embed:before{content:"\e8db"}.icon-code:before{content:"\e8dc"}.icon-console:before{content:"\e8dd"}.icon-share:before{content:"\e8de"}.icon-mail:before{content:"\e8df"}.icon-mail2:before{content:"\e8e0"}.icon-mail3:before{content:"\e8e1"}.icon-mail4:before{content:"\e8e2"}.icon-google:before{content:"\e8e3"}.icon-googleplus:before{content:"\e8e4"}.icon-googleplus2:before{content:"\e8e5"}.icon-googleplus3:before{content:"\e8e6"}.icon-googleplus4:before{content:"\e8e7"}.icon-google-drive:before{content:"\e8e8"}.icon-facebook2:before{content:"\e63b"}.icon-facebook3:before{content:"\e8e9"}.icon-facebook4:before{content:"\e8ea"}.icon-instagram:before{content:"\e8eb"}.icon-twitter2:before{content:"\e63c"}.icon-twitter3:before{content:"\e8ec"}.icon-twitter4:before{content:"\e8ed"}.icon-feed2:before{content:"\e8ee"}.icon-feed3:before{content:"\e8ef"}.icon-feed4:before{content:"\e8f0"}.icon-youtube2:before{content:"\e63d"}.icon-youtube3:before{content:"\e8f1"}.icon-vimeo:before{content:"\e8f2"}.icon-vimeo2:before{content:"\e8f3"}.icon-vimeo3:before{content:"\e8f4"}.icon-lanyrd:before{content:"\e8f5"}.icon-flickr:before{content:"\e8f6"}.icon-flickr2:before{content:"\e8f7"}.icon-flickr3:before{content:"\e8f8"}.icon-flickr4:before{content:"\e8f9"}.icon-picassa:before{content:"\e8fa"}.icon-picassa2:before{content:"\e8fb"}.icon-dribbble:before{content:"\e8fc"}.icon-dribbble2:before{content:"\e8fd"}.icon-dribbble3:before{content:"\e8fe"}.icon-forrst:before{content:"\e8ff"}.icon-forrst2:before{content:"\e900"}.icon-deviantart:before{content:"\e901"}.icon-deviantart2:before{content:"\e902"}.icon-steam:before{content:"\e903"}.icon-steam2:before{content:"\e904"}.icon-github:before{content:"\e905"}.icon-github2:before{content:"\e906"}.icon-github3:before{content:"\e907"}.icon-github4:before{content:"\e908"}.icon-github5:before{content:"\e909"}.icon-wordpress:before{content:"\e90a"}.icon-wordpress2:before{content:"\e90b"}.icon-joomla:before{content:"\e90c"}.icon-blogger:before{content:"\e90d"}.icon-blogger2:before{content:"\e90e"}.icon-tumblr:before{content:"\e90f"}.icon-tumblr2:before{content:"\e910"}.icon-yahoo:before{content:"\e911"}.icon-tux:before{content:"\e912"}.icon-apple:before{content:"\e913"}.icon-finder:before{content:"\e914"}.icon-android2:before{content:"\e915"}.icon-windows:before{content:"\e916"}.icon-windows8:before{content:"\e917"}.icon-soundcloud:before{content:"\e918"}.icon-soundcloud2:before{content:"\e919"}.icon-skype:before{content:"\e91a"}.icon-reddit:before{content:"\e91b"}.icon-linkedin:before{content:"\e91c"}.icon-lastfm:before{content:"\e91d"}.icon-lastfm2:before{content:"\e91e"}.icon-delicious:before{content:"\e91f"}.icon-stumbleupon:before{content:"\e920"}.icon-stumbleupon2:before{content:"\e921"}.icon-stackoverflow:before{content:"\e922"}.icon-pinterest:before{content:"\e923"}.icon-pinterest2:before{content:"\e924"}.icon-xing:before{content:"\e925"}.icon-xing2:before{content:"\e926"}.icon-flattr:before{content:"\e927"}.icon-foursquare:before{content:"\e928"}.icon-foursquare2:before{content:"\e929"}.icon-paypal:before{content:"\e92a"}.icon-paypal2:before{content:"\e92b"}.icon-paypal3:before{content:"\e92c"}.icon-yelp:before{content:"\e92d"}.icon-libreoffice:before{content:"\e92e"}.icon-file-pdf:before{content:"\e92f"}.icon-file-openoffice:before{content:"\e930"}.icon-file-word:before{content:"\e931"}.icon-file-excel:before{content:"\e932"}.icon-file-zip:before{content:"\e933"}.icon-file-powerpoint:before{content:"\e934"}.icon-file-xml:before{content:"\e935"}.icon-file-css:before{content:"\e936"}.icon-html5:before{content:"\e937"}.icon-html52:before{content:"\e938"}.icon-css3:before{content:"\e939"}.icon-chrome:before{content:"\e93a"}.icon-firefox:before{content:"\e93b"}.icon-IE:before{content:"\e93c"}.icon-opera:before{content:"\e93d"}.icon-safari:before{content:"\e93e"}.icon-IcoMoon:before{content:"\e93f"}/*! normalize.css v1.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}blockquote{margin:1em 40px}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}p,pre{margin:1em 0}code,kbd,pre,samp{font-family:monospace,serif;font-family:'courier new',monospace}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}q{quotes:none}q:after,q:before{content:'';content:none}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dl,menu,ol,ul{margin:1em 0}dd{margin:0 0 0 40px}menu,ol,ul{padding:0 0 0 40px}nav ol,nav ul{list-style:none;list-style-image:none}img{border:0;-ms-interpolation-mode:bicubic}svg:not(:root){overflow:hidden}figure,form{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0;white-space:normal;*margin-left:-7px}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer;*overflow:visible}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0;*height:13px;*width:13px}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto}table{border-collapse:collapse;border-spacing:0}input{font-family:Sintony,sans-serif}.visually-hidden{display:none!important}.hidden{position:absolute;left:-999999px;top:-99999px}.float-left{float:left}.float-right{float:right}.border-box{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.show-grid:nth-child(2n+1) div{background:#fac8f0}.show-grid:nth-child(3n+1) div{background:#c8faf0}.show-grid div{height:200px;background:#b4c8f0}.container{width:100%;max-width:1200px;padding:0 20px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:auto;display:block;margin-bottom:1.2em;clear:both;overflow:hidden}.grid-master{position:absolute;z-index:999;text-align:center;overflow:auto;width:100%}.grid-overlay{height:2000px}.grid-overlay div{height:2000px;background:rgba(255,0,0,.1)!important}.column{margin-right:1.66667%;display:block;float:left}.column:last-child{margin-right:0}@media (max-width:480px){.column{width:100%!important;margin-right:0;margin-left:0!important;float:none;clear:both}}body{background:#424242;font-size:.8em;font-size:1em}.oneCol .content{width:100%;padding:0}@media screen and (max-width:380px){.container{padding:0 10px}}.skip-links{font-size:.9em;margin:0;padding:0;position:absolute;top:0;z-index:300000;left:20px;width:12.5%;width:8.33333%}.skip-links li{list-style:none;margin:0;padding:0}.skip-links a{background-color:#c7c7c7;border-radius:0 0 .5em .5em;color:#222;margin-top:-5em;padding:.75em 10px;position:absolute;text-align:center;-webkit-transition:.15s margin ease-in;-moz-transition:.15s margin ease-in;transition:.15s margin ease-in;width:100%}.skip-links a:focus{margin-top:0}.site-header{background-color:#008672;border-bottom:.5em solid #006d5c;box-shadow:0 5px 5px rgba(0,0,0,.075);overflow:hidden;position:relative;z-index:20000}.site-header .container{position:relative;z-index:90;padding:10px 20px;margin:0 auto;width:100%}.site-header .item-list{color:#cce6e2;float:right;text-align:right;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;font-size:.8em;margin:.25em 0 0;width:auto;padding-left:0}.site-header .item-list li{margin:0}.site-header .item-list li a{color:#fff;padding:.125em .5em;margin:0}.site-header .item-list li a:active,.site-header .item-list li a:focus,.site-header .item-list li a:hover{color:#fff}.site-header .item-list li a:last-child{padding-right:0}.site-header .form__search{clear:right;float:right;margin:.65em 0 .25em;padding:0;text-align:right;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:61.10833%}.site-header .form__search .field{border-color:rgba(0,0,0,.6);min-width:13em;position:relative;z-index:100;width:41.66667%}.site-header .form__search .button,.site-header .form__search input[type=submit]{margin:0;position:relative;z-index:100;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.site-header .form__search .button:active,.site-header .form__search input[type=submit]:active{margin-top:.1em;min-height:2.8em}.site-header .form__search .button,.site-header .form__search input[type=submit]{padding-left:20px;padding-right:20px}.home .site-header{box-shadow:0 5px 5px rgba(0,0,0,.05)}.alert.announcement{margin:0;padding:.75em 0 .25em;text-align:center;text-align:left}.alert.announcement .container{margin-bottom:0}.alert.announcement h2,.alert.announcement p{display:inline-block;margin:0 20px 0 0}.alert.announcement h2{line-height:1.8;clear:both;clear:none}.alert.announcement h2:before{float:left;margin:0 10px 0 0;font-size:2.5rem}.lt-ie9 .alert.announcement h2:before{font-size:2.5em}.alert.announcement h2:before{display:block}.alert.announcement p{line-height:2.95;padding:0}.alert.announcement .button,.alert.announcement input[type=submit]{display:inline-block;margin:.1em 0 0 10px;float:right}.alert.announcement .button:active,.alert.announcement input[type=submit]:active{min-height:2.65em}.logo{color:#c7c7c7;float:left;margin:.2em 0 0;text-decoration:none}.logo img{display:block;width:56px;width:130px;width:165px}.site-main{background:#fff;border-bottom:.5em solid #717171;overflow:hidden;position:relative;z-index:90}.site-main .outer-container{background-image:-ms-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f5f5f5),color-stop(0.3,#fff),color-stop(1,#f5f5f5));background-image:-webkit-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#fff 30%,#f5f5f5 100%);*zoom:1}.site-main .outer-container:after,.site-main .outer-container:before{content:' ';display:table}.site-main .outer-container:after{clear:both}.site-main .outer-container>.container{overflow:visible;*zoom:1}.site-main .outer-container>.container:after,.site-main .outer-container>.container:before{content:' ';display:table}.site-main .outer-container>.container:after{clear:both}.site-main:focus{outline:0}.home .site-main{box-shadow:inset 0 -2px 5px rgba(0,0,0,.3)}h1{margin:1em 0 0;padding:0 0 .5em}.top-strip{background-color:#424242;height:auto;overflow:hidden;padding:2em 0;position:relative}.top-strip .top-image{background-position:center 70%;background-repeat:no-repeat;background-size:100% auto;-webkit-filter:blur(3px);-moz-filter:blur(3px);-o-filter:blur(3px);-ms-filter:blur(3px);filter:blur(3px);filter:url(css_img/blur.svg#blur);height:97%;left:0;overflow:hidden;position:absolute;top:1.5%;width:100%}.top-strip .container{overflow:visible}.top-strip h1,.top-strip p{clear:left;color:#fff;float:left;margin:0 0 0 -20px;position:relative;z-index:10;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;max-width:50%}.top-strip h1:before,.top-strip p:before{content:' ';display:block;height:100%;left:-1000%;position:absolute;top:0;width:1000%;z-index:10}.top-strip h1{background-color:#008672;border-bottom:.15em solid #006d5c;padding:.25em 20px}.top-strip h1:before{background-color:#008672;border-bottom:.15em solid #006d5c}.top-strip p{background-color:rgba(255,255,255,.8);color:#222;margin-top:.875em;font-size:1.17em;padding:.5em 20px}.top-strip p:before{background-color:rgba(255,255,255,.8)}.no-top-image .top-strip{background-color:#eee;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7}.content{float:left;margin:1.25em 0 .75em;padding-right:20px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:66.66667%}.content h2:first-child{margin-top:0}.landing .content{display:block}.site-az,.widget-az{background-color:#114a97}.site-az .container,.widget-az .container{margin-bottom:0}.site-az .button,.site-az input[type=submit],.widget-az .button,.widget-az input[type=submit]{margin:1.3em auto;width:66.66667%;width:50%;display:none}.site-az .button:active,.site-az input[type=submit]:active,.widget-az .button:active,.widget-az input[type=submit]:active{margin-top:1.4em;min-height:2.7em}.site-az .az-list,.widget-az .az-list{display:block;margin:.5em 0}.site-az .az-list li,.widget-az .az-list li{padding:.25em 0;margin:0}.site-az .az-list a,.widget-az .az-list a{color:#fff;padding:.5em 0;text-align:center;text-decoration:none}.site-az .az-list a:active,.site-az .az-list a:focus,.site-az .az-list a:hover,.widget-az .az-list a:active,.widget-az .az-list a:focus,.widget-az .az-list a:hover{background-color:#0e3f80;border-radius:4px;box-shadow:inset 0 3px 5px rgba(0,0,0,.2);text-decoration:none}.site-az .az-list span,.widget-az .az-list span{color:#999;padding:.5em 0;text-align:center;text-decoration:none;text-transform:uppercase;display:block}.home .site-az{box-shadow:0 5px 5px rgba(0,0,0,.2)}.site-footer{overflow:hidden;padding:.5em 0}.site-footer .footer-copy .container{color:#fff;margin:1.75em auto 1.5em;padding:0 10px;padding:0 20px;font-size:.8em}.site-footer .footer-copy .container .item-list__inline,.site-footer .footer-copy .container p{line-height:1.75;margin:0 0 1em}.site-footer .footer-copy .container .item-list__inline{margin-bottom:.75em}.site-footer .footer-copy .container .item-list__inline li{display:inline-block;margin:0 .75em .25em 0;padding:0;position:relative}.site-footer .footer-copy .container .item-list__inline li:before{bottom:0;content:',';display:block;position:absolute;right:-.3em}.site-footer .footer-copy .container .item-list__inline li:last-child:before{content:'.'}.site-footer .footer-copy .container a{color:#c7c7c7;text-decoration:none;-webkit-transition:.15s color ease-in;-moz-transition:.15s color ease-in;transition:.15s color ease-in}.site-footer .footer-copy .container a:active,.site-footer .footer-copy .container a:focus,.site-footer .footer-copy .container a:hover{color:#fff;text-decoration:underline}.site-footer .footer-copy .container p{width:50%}.site-footer .footer-copy .container p.social{overflow:hidden}.site-footer .footer-copy .container p.social a{background-color:#3c3c3c;border-radius:1em;font-size:2.25rem;float:left;height:1em;margin:0 .25em 0 0;text-indent:-20000px;-webkit-transition:.15s color ease-in,.15s background-color ease-in;-moz-transition:.15s color ease-in,.15s background-color ease-in;transition:.15s color ease-in,.15s background-color ease-in;width:1em}.site-footer .footer-copy .container p.social a:before{float:left;font-size:1.25rem;line-height:1.8;text-align:center;text-indent:0;width:100%}.lt-ie9 .site-footer .footer-copy .container p.social a:before{font-size:1.25em}.site-footer .footer-copy .container p.social a:active,.site-footer .footer-copy .container p.social a:focus,.site-footer .footer-copy .container p.social a:hover{background-color:#353535;text-decoration:none}.lt-ie9 .site-footer .footer-copy .container p.social a{font-size:2.25em}.site-footer .footer-copy .container p:last-child{margin-bottom:0}.site-footer .footer-copy .container p:last-child span{display:inline-block;margin:0 .5em 0 0}div.main_image,img.main_image{width:30%;max-width:30%;float:left;margin:1em 1em 1em 0;display:block}.float_left{float:left}.float_right{float:right}.image_centre{display:block;margin:1em auto;text-align:center}.figcaption,.imageCaption{max-width:100%}.figcaption p,.imageCaption p{margin-top:5px;text-align:left;font-style:italic;font-size:.8em;margin-bottom:0}.byEditor{overflow:auto}.byEditor .imageCaption.float_left,.byEditor img.float_left{margin:1em 1em 1em 0}.byEditor .imageCaption.float_right,.byEditor img.float_right{margin:1em 0 1em 1em}.byEditor p.date{margin-top:0}.byEditor .indent{padding-left:1em}.byEditor .indent2{padding-left:2em}.byEditor .strikethrough_text{text-decoration:line-through}.byEditor .underline_text{text-decoration:underline}.byEditor table{width:100%;margin:1em 0}.byEditor table caption{font-weight:700;text-align:left;padding:.5em}.byEditor table thead tr:nth-child(odd){background:0 0}.byEditor table tr:nth-child(odd){background:#EEE}.byEditor table th{text-align:left;padding:.5em;vertical-align:top}.byEditor table td{padding:.5em;vertical-align:top}.byEditor .text_align_center{text-align:center}.byEditor .text_align_right{text-align:right}.download_box{padding:10px 10px 0;margin:1em 0;border:1px solid #C7C7C7}.download_box h3{margin-top:0}.gallery_box{overflow:hidden}.gallery_box h3{margin:0 0 .5em}.gallery_box p{margin-top:.5em}.gallery_box a.galImg{width:15%;display:block;float:left;text-align:center;padding:5px;margin:0 1em 1em 0}.gallery_box a.galImg img{display:block;margin:0 auto}.gallery_info,.podcast_info{float:right;margin-top:0;width:100%;width:25%;clear:none}.gallery_info #gallery_near_items,.podcast_info #gallery_near_items{padding:0}.gallery_info #gallery_near_items li,.podcast_info #gallery_near_items li{width:50%;display:inline-block;margin-right:-4px;list-style:none;padding:5px;vertical-align:top;text-align:center;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.gallery_info #gallery_near_items li a,.podcast_info #gallery_near_items li a{display:block}.gallery_info #gallery_near_items li a img,.podcast_info #gallery_near_items li a img{display:block;margin:0 auto;border:1px solid #114A97;padding:5px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.gallery_info #gallery_near_items li a img:hover,.podcast_info #gallery_near_items li a img:hover{opacity:.6}#gallery_item,#podcast_multimedia{padding-right:20px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;width:66.6667%;margin:1.25em 0 .75em}#gallery_item img.img_gallery,#podcast_multimedia img.img_gallery{display:block;margin:0 auto}#gallery_item object,#podcast_multimedia object{display:block;margin:0 auto;max-width:100%}.vcard div.photo,.vcard img.photo{display:block;float:right;width:auto!important;margin:0 0 1em 1em;max-width:30%}.googleMap{width:100%!important}.googleMap img,.mapContainer img{max-width:none}td.record a{-ms-word-break:break-all;word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;hyphens:auto}@media print{*{background:transparent!important;box-shadow:none!important;color:#000!important;text-shadow:none!important;position:relative!important;overflow:hidden!important;float:none!important}body{background:#fff!important}.announcement,.site-header,footer,site-header{display:none}main a,main a:visited{text-decoration:underline}main a[href]:after{content:" (" attr(href) ")"}main abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,main .widget a[href]:after,main a[href^="javascript:"]:after,main a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}table,td,th{border-collapse:collapse;border:1px solid #000}img,tr{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}}html{font-family:Sintony,sans-serif}p{line-height:1.6}p.date{font-size:.8em}a{color:#114a97;text-decoration:none}a:active,a:focus,a:hover{text-decoration:underline}.lt-ie9 .site-header .item-list li.ie-last-child{padding-right:0}.lt-ie9 .complexViewer{width:800px!important}.lt-ie9 .complexViewer .map_content{width:58%!important}.lt-ie9 .complexViewer .content{width:40%}.lt-ie9 .site-footer .footer-copy .container .item-list__inline li.ie-last-child:before{content:'.'}.lt-ie9 .site-footer .footer-copy .container .tel span.ie-first-child{margin-right:.5em}.lt-ie9 .site-footer .footer-copy .container .tel span.ie-first-child:before{content:' – ';float:right;padding-left:.5em}.lt-ie9 .site-footer .footer-copy .container p.ie-last-child{margin-bottom:0}.lt-ie9 .site-footer .footer-copy .container p.ie-last-child span{display:inline-block;margin:0 .5em 0 0}.lt-ie9 .home .widget-row.ie-first-child{background-color:#424242;color:#fff;text-shadow:0 1px 1px rgba(0,0,0,.5);background-image:-ms-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-moz-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-o-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-webkit-gradient(radial,center top,0,center top,477,color-stop(0,#969696),color-stop(0.4,#575757),color-stop(0.8,#424242));background-image:-webkit-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:radial-gradient(circle farthest-side at center top,#969696 0,#575757 40%,#424242 80%);background-position:center -60px;background-size:80% 150%}.lt-ie9 .home .widget-row.ie-nth-chd-2{background-color:#008672;box-shadow:0 -2px 5px rgba(0,0,0,.1);color:#fff;text-shadow:0 1px 1px rgba(0,0,0,.5)}.lt-ie9 .home .widget-row.ie-nth-chd-3{background:#114A97}.lt-ie9 .home .widget-row.ie-last-child{background-image:-ms-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f5f5f5),color-stop(0.3,#fff),color-stop(1,#f5f5f5));background-image:-webkit-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#fff 30%,#f5f5f5 100%)}.lt-ie9 .widget__featured-services .featured-services-list li a{overflow:visible;padding-bottom:.5em}.lt-ie9 .widget__featured-services li:after,.lt-ie9 .widget__featured-services li:before{display:none!important}.lt-ie9 .widget__featured-services li.ie-nth-chd-odd{padding-right:5px}.lt-ie9 .widget__featured-services li.ie-nth-chd-even{padding-left:5px}.lt-ie9 .widget__featured-services li.ie-last-child,.lt-ie9 .widget__featured-services li.ie-nth-last-chd-2{margin-bottom:0;padding-bottom:0}.lt-ie9 .widget__featured-services li.ie-first-child a,.lt-ie9 .widget__featured-services li.ie-nth-chd-2 a{padding-top:.5em}.lt-ie9 .widget__featured-services li.ie-nth-chd-odd{clear:both}.lt-ie9 .widget__featured-services li.ie-nth-chd-even{float:right}.lt-ie9 .widget__featured-services li.ie-last-child{margin-bottom:1em}.lt-ie9 .widget__more-services-and-search .more-services-list .category.ie-nth-chd-3np1{clear:left}.lt-ie9 .widget__latest-news a.ie-last-child{border-bottom:0 none}.lt-ie9 .widget__middle-adverts .advert.ie-last-child{margin-top:.5em;margin-top:0}.lt-ie9 .widget-style__2.ie-last-child .widget{margin-bottom:0}.lt-ie9 .widget-style__2.ie-nth-chd-odd a{margin-left:0;margin-right:0}.lt-ie9 .widget-style__2.ie-nth-chd-even a{margin-right:0;margin-left:0}.lt-ie9 .widget-style__2.ie-nth-last-chd-2 .widget{margin-bottom:0}.lt-ie9 .logo{width:165px}.lt-ie9 .button,.lt-ie9 input[type=submit]{min-height:1em}.lt-ie9 .button.active,.lt-ie9 .button:active,.lt-ie9 input.active[type=submit],.lt-ie9 input[type=submit].active,.lt-ie9 input[type=submit]:active{min-height:.9em}.lt-ie9 .top-strip p{background-color:#fff}.lt-ie9 .widget-row .container{padding-left:20px;padding-right:20px}.lt-ie9 table td.record{min-width:50%}.lt-ie8 .az-list li{width:3.6%}.lt-ie8 .breadcrumb ol li{padding-right:20px!important}.lt-ie8 .widget-width{float:left!important;padding-left:0!important;padding-right:0!important}.lt-ie8 .widgetPadding{padding-left:10px;padding-right:10px}.lt-ie8 .widget__middle-adverts .advert{float:left!important;width:45%}.lt-ie8 .widget__more-services-and-search .more-services-list .category{padding-left:0;padding-right:0;width:33%}.lt-ie8 .widget__more-services-and-search .form label{position:absolute!important;left:-999999px!important;top:-999999px!important}.lt-ie8 .widget__featured-services .featured-services-list li.ie-nth-chd-even{clear:right!important}.lt-ie8 .complexViewer .map_content{width:56%!important}.lt-ie8 #content .az-list li{float:left!important;display:block!important}.lt-ie8 input.field{height:1.5em}.lt-ie8 .site-footer .footer-copy .container p.social a{width:auto;text-indent:0;font-size:1.2em!important;height:1.5em}.lt-ie8 .site-footer .footer-copy .container .item-list__inline li{display:block!important;float:left!important}.alert{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:.5em 0;position:relative;margin:1em 0;border-bottom-style:solid;border-bottom-width:4px;border-bottom-color:#008672}.alert__success{background:#c6edcc;border-color:#36b14a}.alert__success h2{color:#2a8a3a}.alert__success p{color:#1e6329}.alert__danger{background:#edc6c6;border-color:#b13636}.alert__danger h2{color:#8a2a2a}.alert__danger p{color:#631e1e}.alert__info{background:#c6d2ed;border-color:#365cb1}.alert__info h2{color:#2a488a}.alert__info p{color:#1e3363}.alert__warning{background:#d0b32c;border-color:#917d1f}.alert__warning h2,.alert__warning p{color:#7c6b1a}.quote{font-size:1em;font-weight:600;background:#00b99d;color:#424242;padding:10px;font-style:italic}.quote__pullquote,.quote__pullquote-right{width:80%;margin-left:0;display:block}.quote__pullquote-right{margin-left:auto;margin-right:0}.breadcrumb{background-color:#fff;border-bottom:1px solid #c7c7c7;color:#222;font-size:.9em;width:100%}.breadcrumb .container{margin:0 auto;padding-bottom:.75em;padding-top:1em}.breadcrumb ol{padding:0;margin:0}.breadcrumb ol li{list-style:none;display:inline}.breadcrumb ol li:first-child:before{display:none}.breadcrumb ol li:before{content:'>';padding:0 10px}.breadcrumb a{color:#114a97}.landing .breadcrumb{border-bottom:0 none}.button,input[type=submit]{-webkit-appearance:none;border:0 none;border-bottom:2px solid;border-radius:4px;color:#fff;cursor:pointer;display:block;font-family:Sintony,sans-serif;font-size:.9em;font-weight:400;min-height:2.5em;line-height:1.6;margin:.5em 0;padding:.55em 1em .45em;text-align:center;text-decoration:none;text-shadow:0 -1px 0 rgba(0,0,0,.5);text-transform:lowercase;vertical-align:top;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.button.active,.button:active,input.active[type=submit],input[type=submit]:active{border-bottom:0 none;box-shadow:inset 0 3px 5px rgba(0,0,0,.2);margin-top:.65em;min-height:2.2em}.button:active,.button:focus,.button:hover,input[type=submit]:active,input[type=submit]:focus,input[type=submit]:hover{text-decoration:none}.button,.button__primary,input[type=submit]{background:#114a97;border-bottom-color:#0c3469!important}.button:focus,.button:hover,.button__primary:focus,.button__primary:hover,input[type=submit]:focus,input[type=submit]:hover{background:#285ca1}.button__secondary{background:#424242;border-bottom-color:#292929!important}.button__secondary:focus,.button__secondary:hover{background:#545454}.button__info{background:#008672;border-bottom-color:#005347!important}.button__info:focus,.button__info:hover{background:#199280}.button__warning{background:#dec96b;border-bottom-color:#a68f23!important;color:#7c6b1a;text-shadow:0 1px 0 rgba(255,255,255,.3)}.button__warning:focus,.button__warning:hover{background:#e2d180}.button__muted{background:#b3b3b3;border-bottom-color:#666!important;color:#222;text-shadow:0 1px 0 rgba(255,255,255,.3)}.button__muted:focus,.button__muted:hover{background:#c2c2c2}.button__muted.active,.button__muted:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.3)}.calendar{width:100%;border-collapse:collapse;border-radius:4px}.calendar th{background:#008672;border:1px solid #000;margin:0;padding:4px}.calendar td{padding:4px;border:1px solid #000;margin:-4px;text-align:center}.calendar a{background:#008672;padding:0 .3em}#calendarcontainer{background:#eee;padding:10px;margin:0 -10px 2em}#calendarcontainer table{width:100%;display:table}#calendarcontainer table td,#calendarcontainer table th{text-align:center;padding:5px 0}#calendarcontainer table td.today{background:#e1e1e1}.callout{padding:.25em 1em;margin:1em 0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-radius:4px}.callout__success{background:#edf9ef}.callout__success p{color:#1e6329}.callout__success h2{color:#2a8a3a}.callout__warning{background:#fff}.callout__warning p{color:#7c6b1a}.callout__warning h2{color:#a68f23}.callout__danger{background:#f9eded}.callout__danger p{color:#631e1e}.callout__danger h2{color:#8a2a2a}.callout__info{background:#edf1f9}.callout__info p{color:#1e3363}.callout__info h2{color:#2a488a}.callout__disabled{background:#ccc;cursor:none}.callout__disabled p{color:#999}.callout__disabled h2{color:#b3b3b3}.callout__muted{background:#b3b3b3}.callout__muted p{color:gray}.callout__muted h2{color:#999}.callout__feature{background:#e6e6e6}.callout__feature p{color:#b3b3b3}::-webkit-input-placeholder{color:#999}:-moz-placeholder{color:#999}::-moz-placeholder{color:#999}:-ms-input-placeholder{color:#999}.placeholdersjs{color:#999}.form{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:1em}.form strong{margin-top:0;margin-bottom:1em;display:block}.form label{margin:.5em 0}.checkbox input,.radio input{display:inline;margin-right:.5em}input.field,input.text,input[type=search].field,textarea{-webkit-appearance:none;border:1px solid rgba(0,0,0,.35);box-shadow:inset 0 3px 5px rgba(0,0,0,.15);font-family:Sintony,sans-serif;font-size:.9em;height:2.5em;margin:0;padding:.55em .5em;vertical-align:top;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input.field:focus,input.text:focus,input[type=search].field:focus,textarea:focus{background-color:#faf7e9}.field__disabled{background-color:#ccc}textarea{resize:none}input:focus{outline:0}.form__inline label,.form__search label{display:none}.form__inline .button,.form__inline .field,.form__inline input[type=submit],.form__inline select,.form__search .button,.form__search .field,.form__search input[type=submit],.form__search select{display:inline}.form__block label{display:block;min-width:50%}.form__block .button,.form__block .field,.form__block input[type=submit],.form__block select{display:block}.form__append{margin:1em 0;overflow:auto}.form__append .field{border-radius:0;font-size:1em;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;float:left}h2.warning{color:#b13636}.basic_form p{margin:1.7em 0}.basic_form div.center{min-height:50px;display:block;overflow:hidden}.basic_form div.center input.button,.basic_form div.center input[type=submit]{float:right;margin-left:1em}.basic_form div.center input.button__muted{float:left;margin-left:0}.basic_form p.final{min-height:60px;display:block;overflow:hidden}.basic_form .label,.basic_form label{display:block;clear:both;margin:0 0 .5em}.basic_form .label strong,.basic_form label strong{color:#b13636}.basic_form input[type=password],.basic_form input[type=text],.basic_form textarea{width:24em;max-width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.basic_form input.button:active,.basic_form input[type=submit]:active{margin-top:.6em;min-height:2.8em}.basic_form textarea{height:auto}.basic_form select{padding:.4em;border:1px solid rgba(0,0,0,.35);-webkit-appearance:menulist-button;height:35px}.basic_form .help{font-size:.8em;color:#999;display:block;clear:both;margin:0 0 .5em}.basic_form input.checkbox,.basic_form input.radio{margin:0 10px 0 0}.basic_form table{width:100%}.basic_form table td{padding:10px}.basic_form ol.dateOfBirth,.basic_form ul.list_check{list-style:none;padding:0}.basic_form ol.dateOfBirth li{display:inline-block;margin-right:-4px;padding:0 20px 0 0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:20%}.box_standout,.form__standout{padding:10px;background:#eee;margin:2em 0}.box_standout h3,.form__standout h3{margin:0 0 .5em}.box_standout p,.form__standout p{margin:0}.box_standout p span,.form__standout p span{padding-top:10px;display:block}.box_standout label,.form__standout label{margin:0}.box_standout #search_results ul ul,.form__standout #search_results ul ul{list-style:none;margin:2em 0}.form_select p{margin-top:0;min-height:5em}.form_select input[type=submit]{display:inline-block;margin:0}.form_select select{max-width:68%;height:40px}.form_select input.button:active,.form_select input[type=submit]:active{margin-top:.1em;min-height:2.8em}.userTextPref{padding:0}.userTextPref label{display:block;clear:both}.userTextPref li{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:33%;display:inline-block;margin:0 -4px 10px 0;padding:0 1em}.userTextPref select{width:100%}.userSettings{padding:0}.userSettings label{padding:5px;display:block}.userSettings label input{margin-right:5px}.userSettings li{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:50%;display:inline-block;margin:0 -4px 10px 0;padding:0 1em}.form_404 input.field{width:70%;display:inline}.form_404 input[type=submit]{margin:0;display:inline}p.user_final{text-align:center}p.user_final input{display:inline-block}.prefContrast label{background:#000;color:#ff0}.prefCream label{background:#FFF9D2;color:#010066}.prefBlue label{background:#9FCFFF;color:#010066}#preview_box{padding:1em;margin-top:1em}#preview_box img{float:right;margin:0 0 1em 1em}.form_user .button,.form_user input[type=submit]{margin-bottom:10px}form .list-check li{margin-bottom:0}form li.form_text label{width:80%}h1,h2,h3,h4{font-family:'PT Sans',sans-serif;font-weight:400}h1{font-size:2.25em}h2{font-size:1.45em}h3{font-size:1.4em;font-weight:700}img{max-width:100%}ul{padding-left:2em}li{padding-bottom:.5em}li:last-child{padding-bottom:0}.item-list,.widget-width .list{margin:0;padding:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.item-list li,.widget-width .list li{list-style:none;margin-bottom:.5em;padding-bottom:.5em}.item-list li:last-child,.widget-width .list li:last-child{margin-bottom:0;padding-bottom:0}.widget-width .list li{border-bottom:1px solid #C7C7C7}.widget-width .list li:last-child{border-bottom:none}.item-list__inline li{display:inline;margin-right:1.8em}.item-list__striped{padding:0}.item-list__striped li{list-style:none;padding:.3em .5em;background:#fff;border:none}.item-list__striped li:nth-child(odd){background:#e1e1e1}.az-list{overflow:auto;padding:0;text-align:center}.az-list li{float:left;margin:.35em 0;width:11.11%;width:7.69%;width:3.84%}.az-list li a{display:block;text-transform:uppercase}#content .az-list li{display:inline-block;float:none;margin:0 5px 9px 0;width:auto;padding:0}#content .az-list a,#content .az-list span{text-transform:uppercase;padding:10px 5px;width:35px;text-align:center;border-radius:4px;display:block;font-size:1.1em}#content .az-list a{background:#114A97;color:#fff}#content .az-list a:hover{background:#285CA1;text-decoration:none}#content .az-list span{background:#eee;color:#999}ul.list_contact{list-style:none;padding:0}ul.list_contact li{margin-bottom:1em;padding:10px;border:1px solid #C7C7C7}ul.list_contact li h3{margin:0 0 .2em}ul.list_contact li p{margin:0}ul.list_contact_main li{border:none;background:#eee}ul.list_article{padding:0}ul.list_article li{overflow:hidden;list-style:none}ul.list_article li h2,ul.list_article li h3{margin-bottom:.3em}ul.list_article li p{margin:.5em 0}ul.list_article li img{width:25%;float:left;margin:0 1em 1em 0}ul.list_article li a.button{display:inline-block}ul.list_gallery{list-style:none;padding:0}ul.list_gallery li{display:inline-block;margin-right:-4px;vertical-align:top;padding:0 .5em 1em;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:20%}ul.list_gallery li a{text-align:center;display:block}ul.list_gallery li a img{display:block;margin:0 auto;padding:5px;border:1px solid #114a97;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.list_gallery li a span{position:absolute;left:-999999px;top:-99999px}ul.list_gallery li a:hover{opacity:.6}ul.list_faq{padding:0;list-style:none}ul.list_faq p.faq{font-weight:700;margin:.2em 0}ul.list_person{padding:0;list-style:none}ul.list_person li{display:inline-block;margin-right:-4px;vertical-align:top;padding-bottom:2em;width:100%;width:50%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.list_person li h3{margin:0 0 .5em}ul.list_person li div{width:60%;float:right;padding-right:5%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.list_person li img{float:left;width:35%}ul.list_person li p,ul.list_polls h2{margin:0}ul.list_polls .progressbar,ul.list_polls p{margin:5px 0}ul#keyList{margin:0;padding:0}ul#keyList li{list-style:none}ul#keyList li img{display:inline;vertical-align:top;margin:0 5px 5px 0;max-width:3%}ul.list_long a{-ms-word-break:break-all;word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;hyphens:auto}ol.list_results{margin:0;padding:0}ol.list_results li{list-style:none}ol.list_results li .icon img{float:left;margin:0 10px 5px 0;max-width:5%}ol.list_results li h3{margin:0 0 5px}ol.list_results li p{margin:0 0 5px;display:inline}ol.list_results li p.url{font-size:.8em;display:block;clear:both;color:#006D5C}ul.list-pages{list-style:decimal;background:#eee;padding:15px 20px}ul.list-pages li{border-bottom:0;width:100%;padding:5px 0;margin-left:2em}.sociable ul{padding:0}.sociable ul li{padding:0 10px 0 0;list-style:none;display:inline-block;margin:0 0 20px}.sociable ul li a{display:inline-block;text-indent:-20000px;width:20px}.sociable ul li.digg a{background:url(css_img/bm16pxdigg.gif) no-repeat left center}.sociable ul li.delicious a{background:url(css_img/bm16pxdelicious.gif) no-repeat left center}.sociable ul li.stumbleupon a{background:url(css_img/bm16pxstumble.gif) no-repeat left center}.sociable ul li.reddit a{background:url(css_img/bm16pxreddit.gif) no-repeat left center}.sociable ul li.facebook a{background:url(css_img/bm16pxfacebook.gif) no-repeat left center}.sociable ul li.google a{background:url(css_img/bm16pxgoogle.gif) no-repeat left center}.sociable ul li.linkedin a{background:url(css_img/bm16pxlinkedin.gif) no-repeat left center}.sociable ul li.live a{background:url(css_img/bm16pxlive.gif) no-repeat left center}.sociable ul li.newsvine a{background:url(css_img/bm16pxnewsvine.gif) no-repeat left center}.complexViewer{width:100%!important;height:100%!important;margin-bottom:1em;overflow:hidden;border:0!important}.complexViewer .content{width:100%;float:left}.complexViewer .map_content{width:100%!important;float:left;top:51px!important}#mapControlTools{border:0!important}#page-search{width:100%!important;height:100%!important}@media screen and (min-width:900px){.complexViewer .map_content{width:58%!important}.complexViewer .content{width:40%}}.pagePagination{overflow:hidden;padding:0;margin:2em 0;min-height:60px}.pagePagination li{list-style:none}#progressbar,.progressbar{margin-bottom:1em;border:1px solid #008672}.progress-bar{background:#008672;width:100%;height:20px}.progress-bar .progress-indicator{background:#b3b3b3;padding:10px 0}.progress-bar__success .progress-indicator{background:#36b14a}.progress-bar__danger .progress-indicator{background:#b13636}.progress-bar__info .progress-indicator{background:#365cb1}.sidebar__primary{margin:1.25em 0;clear:none;float:right;margin-top:0;width:25%}.sidebar__primary aside,.sidebar__primary nav{margin-bottom:2em;*zoom:1}.sidebar__primary aside:after,.sidebar__primary aside:before,.sidebar__primary nav:after,.sidebar__primary nav:before{content:' ';display:table}.sidebar__primary aside:after,.sidebar__primary nav:after{clear:both}.sidebar__primary :last-child{margin-bottom:0}.sidebar__primary .supplement{margin:0 0 2em}.sidebar__primary .related-items h2{margin-top:0}.sidebar__primary .related-items ul{overflow:hidden}.sidebar__primary .site-navigation{background-color:#424242;overflow:hidden;padding:.5em 10px 1em;margin:0 -10px 2em}.sidebar__primary .site-navigation li{margin:0 0 3px;padding:0;float:left;clear:both;width:100%}.sidebar__primary .site-navigation li a{border-bottom:.25em solid #353535;color:#fff;display:block;font-size:.9em;margin:0 10px;-webkit-transition:.15s border-color ease-in;-moz-transition:.15s border-color ease-in;transition:.15s border-color ease-in;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.sidebar__primary .site-navigation li a:active,.sidebar__primary .site-navigation li a:focus,.sidebar__primary .site-navigation li a:hover{border-color:#008672;color:#fff;text-decoration:none}.sidebar__primary .site-navigation li:nth-child(2n+1){clear:left}.sidebar__primary .site-navigation li a{padding:.75em 10px}.sidebar__primary .site-navigation li:nth-child(even) a,.sidebar__primary .site-navigation li:nth-child(odd) a{margin:0}.sidebar__primary aside{clear:both;padding:0 10px}.sidebar__primary aside li{padding-bottom:0;float:left;width:50%;width:100%}.sidebar__primary aside li a{border-bottom:1px solid #c7c7c7;display:block;font-size:.9em;margin:0 -10px .5em;padding:0 10px .5em}.sidebar__primary aside li:nth-child(2n+1){clear:left}.sidebar__primary aside li:last-child a{border-bottom:0 none;padding-bottom:0}.sidebar__primary aside li:nth-child(odd) a{margin-right:-10px}.sidebar__primary aside li:nth-child(even) a{margin-left:-10px}.sidebar__primary aside li:nth-last-child(-n+2){margin-bottom:.5em}.landing .sidebar__primary{margin-top:-9.65em;position:relative;z-index:10}.landing.no-top-image .sidebar__primary{margin-top:-6em}.landing .sidebar__primary.no-categories{margin-top:3.5em}.supplement{margin:2em 0;overflow:hidden;padding:10px;background:#fff;border:1px solid #A4A9B2}.supplement h3{margin-top:0}.supplement ul{list-style:none;padding:0}.supplement ul li{padding:0}.supplement ul li a{border-bottom:1px solid #C7C7C7;display:block;font-size:.9em;padding:.5em 0}.supplement ul li:last-child a{border-bottom:0}.supplement.vcard{background:#DBE3EF;padding:10px}.supplement.vcard h2,.supplement.vcard h3{margin-top:0;font-size:1.45em}.supplement a.email{-ms-word-break:break-all;word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;hyphens:auto}.sidebar__primary .supplement img{margin:0 auto 10px;display:block}#content .supplement.vcard img{width:30%;float:right;margin:0 0 10px 20px}table{overflow-x:scroll;overflow-x:visible;display:table;width:100%;margin:0 0 2em}table tr{vertical-align:top}table th{padding:.5em 1em;text-align:left;max-width:40%}table td{padding:.5em 1em}table td :first-child{margin-top:0}table td.record{min-width:60%}table td.record .googleMap{min-width:200px}table td.record img{width:100%}.data-table__compact td,.data-table__compact th{padding:.5em}.data-table__striped tr{background:#fff}.data-table__striped tr:nth-child(odd){background:#eee}.data-table__bordered{border:1px solid #000}.data-table__bordered th{border-bottom:1px solid #000}.data-table__bordered td{border:1px solid #000}.data-table__bordered td+td,.data-table__bordered th+th{border-left:1px solid #000}.data-table__horizontal th{padding-left:0}.widget-row{margin:0 -10px;*zoom:1}.widget-row:after,.widget-row:before{content:' ';display:table}.widget-row:after{clear:both}.widget-row .container{margin-bottom:0;max-width:1180px;overflow:visible;padding:0}.home .widget-row:first-child{background-color:#424242;color:#fff;text-shadow:0 1px 1px rgba(0,0,0,.5);background-image:-ms-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-moz-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-o-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-webkit-gradient(radial,center top,0,center top,477,color-stop(0,#969696),color-stop(0.4,#575757),color-stop(0.8,#424242));background-image:-webkit-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:radial-gradient(circle farthest-side at center top,#969696 0,#575757 40%,#424242 80%);background-position:center -60px;background-size:80% 150%}.home .widget-row:nth-child(2){background-color:#008672;box-shadow:0 -2px 5px rgba(0,0,0,.1);color:#fff;text-shadow:0 1px 1px rgba(0,0,0,.5)}.home .widget-row:nth-child(3){background:#114A97}.home .widget-row:last-child{background-image:-ms-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f5f5f5),color-stop(0.3,#fff),color-stop(1,#f5f5f5));background-image:-webkit-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#fff 30%,#f5f5f5 100%)}.widget-width{float:left;padding:0 10px;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.myAreaWidget{background:#EEE;padding:20px;margin-bottom:10px}.myAreaWidget a{font-weight:400}.myAreaWidget input[type=text]{width:60%}.myAreaWidget input[type=submit]{margin:0 0 0 5px;display:inline-block}#myMap{width:80%!important;max-width:600px!important}.byEditor .snippet iframe{overflow:auto;max-width:600px}.home .widget-width.width33{width:33.3333%}.home .widget-width.width67{width:66.6666%}.widget__featured-services{position:relative;padding:.5em 0}.widget__featured-services h2{display:none}.widget__featured-services ul{list-style:none;padding:0;overflow:hidden;margin:0}.widget__featured-services ul.service-links{display:block;margin:1em -10px 0;clear:both}.widget__featured-services .featured-services-list li{clear:none;float:left;-webkit-transition:.3s color ease-in,.3s border-color ease-in;-moz-transition:.3s color ease-in,.3s border-color ease-in;transition:.3s color ease-in,.3s border-color ease-in;margin:0 0 .5em;display:inline;margin-bottom:.75em;margin-top:.25em;padding:0;position:relative;width:25%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;font-size:1.05em}.widget__featured-services .featured-services-list li a{border-color:#424242;color:#c7c7c7;text-decoration:none;-webkit-transition:.3s color ease-in,.3s border-color ease-in;-moz-transition:.3s color ease-in,.3s border-color ease-in;transition:.3s color ease-in,.3s border-color ease-in;vertical-align:middle}.widget__featured-services .featured-services-list li a:focus,.widget__featured-services .featured-services-list li a:focus:before,.widget__featured-services .featured-services-list li a:hover,.widget__featured-services .featured-services-list li a:hover:before{border-color:#008672;color:#fff}.widget__featured-services .featured-services-list li.active a{border-color:#008672;color:#fff}.widget__featured-services .featured-services-list li a:before{background-color:rgba(0,0,0,.1);border-radius:1em;color:#c7c7c7;height:1.75em;float:left;font-weight:400;line-height:1.75;padding:0;text-align:center;-webkit-transition:.3s color ease-in,.3s border-color ease-in;-moz-transition:.3s color ease-in,.3s border-color ease-in;transition:.3s color ease-in,.3s border-color ease-in;vertical-align:middle;width:1.75em;font-size:2rem}.lt-ie9 .widget__featured-services .featured-services-list li a:before{background-color:#3B3B3B;font-size:2em}.widget__featured-services .featured-services-list li.active a:before{border-color:#fff;color:#fff}.widget__featured-services .featured-services-list li:nth-child(odd){padding-right:5px}.widget__featured-services .featured-services-list li:last-child,.widget__featured-services .featured-services-list li:nth-last-child(2){margin-bottom:0;padding-bottom:0}.widget__featured-services .featured-services-list li a:before{display:inline-block}.widget__featured-services .featured-services-list li:first-child a,.widget__featured-services .featured-services-list li:nth-child(2) a{padding-top:.5em}.widget__featured-services .featured-services-list li a{border-bottom:5px solid #424242;display:block;float:none;line-height:2.5;overflow:hidden;padding:.55em 10px 0 70px;text-overflow:ellipsis;white-space:nowrap;z-index:90}.widget__featured-services .featured-services-list li a:before{margin:-.3em 10px .15em -60px}.widget__featured-services .featured-services-list li:after,.widget__featured-services .featured-services-list li:before{border-style:solid;bottom:0;content:'';display:block;height:0;position:absolute;-webkit-transition:.3s border-color ease-in;-moz-transition:.3s border-color ease-in;transition:.3s border-color ease-in;width:0}.widget__featured-services .featured-services-list li:before{z-index:20}.widget__featured-services .featured-services-list li:after{width:4px;z-index:10}.widget__featured-services .featured-services-list li:nth-child(odd){clear:both}.widget__featured-services .featured-services-list li:nth-child(odd):before{border-color:transparent transparent #5e5e5e;border-width:0 0 12px 12px;right:0}.widget__featured-services .featured-services-list li:nth-child(odd):after{border-color:transparent transparent #424242;border-width:0 0 5px 5px;right:7px}.widget__featured-services .featured-services-list li.active:nth-child(odd):before{border-color:transparent transparent #3fa495}.widget__featured-services .featured-services-list li:nth-child(even){float:right;padding:0}.widget__featured-services .featured-services-list li:nth-child(even) a{padding:.55em 70px 0 10px}.widget__featured-services .featured-services-list li:nth-child(even) a:before{float:right;margin:-.3em -60px .15em 10px}.widget__featured-services .featured-services-list li:nth-child(even):before{border-color:transparent transparent transparent #5e5e5e;border-width:12px 0 0 12px;left:0}.widget__featured-services .featured-services-list li:nth-child(even):after{border-color:transparent transparent #424242;border-width:0 0 5px 5px;left:7px;-webkit-transform:rotateY(180deg);-moz-transform:rotateY(180deg);-ms-transform:rotateY(180deg);transform:rotateY(180deg)}.widget__featured-services .featured-services-list li.active:nth-child(even):before{border-color:transparent transparent transparent #3fa495}.widget__featured-services .featured-services-list li:last-child{margin-bottom:1em}.widget__featured-services .featured-service-preview{display:block;position:absolute;text-align:center;top:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;left:33.33333%;width:33.33333%;padding:0 20px}.widget__featured-services .featured-service-preview:before{color:#fff;display:block;float:left;height:1em;line-height:1;margin-bottom:.125em;text-align:center;text-shadow:0 1px 0 rgba(0,0,0,.5),0 -1px 0 rgba(255,255,255,.15);width:100%;font-size:8rem}.lt-ie9 .widget__featured-services .featured-service-preview:before{font-size:8em}.widget__featured-services .featured-service-preview.icon-direction:before{font-size:8rem;font-size:9.5rem}.lt-ie9 .widget__featured-services .featured-service-preview.icon-direction:before{font-size:9.5em}.widget__featured-services .featured-service-preview h2{background:0 0;display:block;line-height:1.25;margin:.75em 0 .5em;padding-bottom:0}.widget__featured-services .featured-service-preview h2 strong{clear:left;float:left;font-size:1.15em;margin-bottom:.5em;width:100%}.widget__featured-services .featured-service-preview p{color:#c7c7c7;font-size:.9em;margin-top:0}.widget__featured-services .featured-service-preview .service-links li{color:#c7c7c7;display:inline-block;font-size:.9em;line-height:1.5;margin:0 .5em 0 0;padding:0;position:relative}.widget__featured-services .featured-service-preview .service-links li a{color:#fff}.widget__featured-services .featured-service-preview .service-links li:before{bottom:0;content:', ';position:absolute;right:-.25em!important}.widget__featured-services .featured-service-preview .service-links li:last-child:before{content:'.'}.no-js .widget__featured-services .featured-services-list li a:before{display:none}.no-js .widget__featured-services .featured-services-list li:nth-child(odd){padding-right:0}.no-js .widget__featured-services .featured-services-list li a,.no-js .widget__featured-services .featured-services-list li:nth-child(even),.no-js .widget__featured-services .featured-services-list li:nth-child(odd){padding-left:10px}.no-js .widget__featured-services .featured-services-list li:after,.no-js .widget__featured-services .featured-services-list li:before{display:none}.no-js .widget__featured-services .featured-services-list li:nth-child(even),.no-js .widget__featured-services .featured-services-list li:nth-child(odd){padding-left:0}.no-js .widget__featured-services .featured-services-list li:nth-child(odd) a{padding-left:10px}.no-js .widget__featured-services .featured-services-list li:nth-child(even) a{padding-right:10px}.widget__more-services-and-search{padding:0 0 1em;text-align:center;*zoom:1;padding-top:.5em}.widget__more-services-and-search:after,.widget__more-services-and-search:before{content:' ';display:table}.widget__more-services-and-search:after{clear:both}.widget__more-services-and-search .form,.widget__more-services-and-search h2{margin:1em 0 .25em}.widget__more-services-and-search h2{line-height:1.35;float:left;margin-bottom:.15em;text-align:left;margin-top:.75em;width:29.16667%;font-size:1.25em}.widget__more-services-and-search .form{float:right;padding:0;position:relative;text-align:right;width:25%;display:block;margin-top:1em}.widget__more-services-and-search .form div{clear:right;float:right;position:relative;width:100%;width:90%}.widget__more-services-and-search .form div #loading{background:#fff;position:absolute;right:8px;top:11px}.widget__more-services-and-search .form label{color:#c7c7c7;display:block;position:absolute;overflow:hidden;right:.5em;text-indent:-20000px;text-shadow:none;top:.25em;width:1em}.widget__more-services-and-search .form label:before{float:right;text-indent:0;width:1em}.widget__more-services-and-search .form label.pulse{color:#114a97}.widget__more-services-and-search .form .field{border-color:rgba(0,0,0,.6);padding-right:2em;width:100%}.widget__more-services-and-search .form #search_results{background-color:#008672;margin:0 -10px;padding:0 10px;position:absolute;right:0;top:2.5em;z-index:100}.widget__more-services-and-search .form .item-list,.widget__more-services-and-search .form .list{padding:.5em 0;text-align:left}.widget__more-services-and-search .form .item-list li,.widget__more-services-and-search .form .list li{margin-bottom:0;border-bottom:0;padding:0}.widget__more-services-and-search .form .item-list a,.widget__more-services-and-search .form .list a{border-bottom:.25em solid rgba(66,66,66,.25);color:#fff;display:block;font-size:.9em;margin:0;padding:.75em .5em;-webkit-transition:.15s border-color ease-in;-moz-transition:.15s border-color ease-in;transition:.15s border-color ease-in;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.widget__more-services-and-search .form .item-list a:active,.widget__more-services-and-search .form .item-list a:focus,.widget__more-services-and-search .form .item-list a:hover,.widget__more-services-and-search .form .list a:active,.widget__more-services-and-search .form .list a:focus,.widget__more-services-and-search .form .list a:hover{border-color:#114a97;color:#fff;text-decoration:none}.widget__more-services-and-search .button,.widget__more-services-and-search input[type=submit]{clear:none;display:inline-block;float:none;margin:1.1em 0 0 -4.16667%;width:25%}.widget__more-services-and-search .button.active,.widget__more-services-and-search .button:active,.widget__more-services-and-search input.active[type=submit],.widget__more-services-and-search input[type=submit]:active{margin-top:1.2em}.widget__more-services-and-search #more-services-list{display:none}.widget__more-services-and-search .no-js #more-services-list{display:block}.widget__more-services-and-search .more-services-list{clear:both;list-style:none;margin:1em -20px 0;overflow:hidden;padding:0}.widget__more-services-and-search .more-services-list .category{display:inline;float:left;padding:0 20px .5em;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;text-align:center;width:33.33333%}.widget__more-services-and-search .more-services-list .category:nth-child(3n+1){clear:left}.widget__more-services-and-search .more-services-list .category h3{margin:1em 0 .5em;padding-left:3.25rem;padding-left:3.85rem;padding-left:0;padding-top:6em;position:relative}.widget__more-services-and-search .more-services-list .category h3:before{background-color:rgba(0,0,0,.1);border-radius:1em;display:block;font-weight:400;position:absolute;text-align:center;font-size:4.2rem;height:1.75em;left:50%;line-height:1.75;margin-left:-.875em;top:0;width:1.75em}.lt-ie9 .widget__more-services-and-search .more-services-list .category h3:before{background-color:#007866;font-size:4.2em}.widget__more-services-and-search .more-services-list .category h3 a{color:#fff}.widget__more-services-and-search .more-services-list .category .item-list__inline{display:block;margin-left:0}.widget__more-services-and-search .more-services-list .category .item-list__inline li{color:#c7c7c7;display:inline-block;font-size:.9em;margin:0 .5em 0 0;padding:0 0 .25em;position:relative;z-index:90}.widget__more-services-and-search .more-services-list .category .item-list__inline li:before{bottom:.25em;content:', ';position:absolute;right:-.25em}.widget__more-services-and-search .more-services-list .category .item-list__inline li.more:before{content:'.'}.widget__more-services-and-search .more-services-list .category .item-list__inline li a{color:#fff;position:relative;z-index:100}.widget__more-services-and-search .more-services-list .category .item-list__inline li a:active,.widget__more-services-and-search .more-services-list .category .item-list__inline li a:focus,.widget__more-services-and-search .more-services-list .category .item-list__inline li a:hover{text-decoration:underline}.widget__latest-news{border-right:1px solid #c7c7c7;margin-right:7.67px;padding-right:20px}.widget__latest-news h2{margin:.5em 0 .25em;margin-bottom:0}.widget__latest-news a{border-bottom:1px solid #c7c7c7;display:block;margin:0 -9px;overflow:hidden;text-decoration:none;padding:1em 11px 0}.widget__latest-news a h3{-webkit-transition:.3s color ease-in;-moz-transition:.3s color ease-in;transition:.3s color ease-in;margin:0 21px .5em 0}.widget__latest-news a h3:before{border-color:transparent transparent transparent #3465a6;border-width:8px 0 8px 10px;content:'';border-style:solid;display:block;float:right;height:0;margin:.225em -49px 0 0;-webkit-transition:.15s margin ease-in;-moz-transition:.15s margin ease-in;transition:.15s margin ease-in;opacity:0;width:0}.widget__latest-news a p{color:#222;font-size:.9em;margin:0 0 1em;display:block}.widget__latest-news a:active h3,.widget__latest-news a:focus h3,.widget__latest-news a:hover h3{color:#222;text-decoration:underline}.widget__latest-news a:active h3:before,.widget__latest-news a:focus h3:before,.widget__latest-news a:hover h3:before{margin-right:-29px;opacity:1}.widget__latest-news a:last-child{border-bottom:0 none}.widget__middle-adverts{margin:0 -9px;margin:0 -9px 0 -12.33px}.widget__middle-adverts h2{margin:.5em 0 .25em;margin:.5em 11px .25em;display:none}.widget__middle-adverts .advert{display:block;overflow:hidden;text-decoration:none;-webkit-transition:.15s background-color ease-in;-moz-transition:.15s background-color ease-in;transition:.15s background-color ease-in;border-bottom:0 none;padding:11px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin:0;width:50%}.widget__middle-adverts .advert:active h3,.widget__middle-adverts .advert:focus h3,.widget__middle-adverts .advert:hover h3{color:#222;text-decoration:underline}.widget__middle-adverts .advert:active,.widget__middle-adverts .advert:focus,.widget__middle-adverts .advert:hover{background-color:#dbe3ef}.widget__middle-adverts .advert h3{margin:.5em 0;font-size:1.45em}.widget__middle-adverts .advert p{color:#222;margin:0;display:block}.widget__middle-adverts .advert .image{width:100%;display:block}.widget__featured-page{margin:.25em 0}.widget__featured-page a{display:block;margin:0 -10px;padding:1em 20px 1em 2.5em;position:relative;text-decoration:none;-webkit-transition:.15s background-color ease-in;-moz-transition:.15s background-color ease-in;transition:.15s background-color ease-in;padding-left:3em}.widget__featured-page a:before{color:#c7c7c7;display:block;font-weight:400;height:1.5em;left:10px;line-height:1.5;position:absolute;text-align:center;text-shadow:0 -1px 1px rgba(255,255,255,.5);top:0;-webkit-transition:.15s color ease-in;-moz-transition:.15s color ease-in;transition:.15s color ease-in;width:1em;font-size:2.85rem}.lt-ie9 .widget__featured-page a:before{font-size:2.85em}.widget__featured-page a:active,.widget__featured-page a:focus,.widget__featured-page a:hover{background-color:#dbe3ef}.widget__featured-page a:active h2,.widget__featured-page a:focus h2,.widget__featured-page a:hover h2{color:#222;text-decoration:underline}.widget__featured-page a:active:before,.widget__featured-page a:focus:before,.widget__featured-page a:hover:before{color:#114a97}.widget__featured-page a h2{margin:0 0 .5em 24px;padding:0}.widget__featured-page a p{color:#000;margin:0 0 0 24px}.widget-style__1{margin:1.5em 0 1.25em}.widget-style__2:last-child .widget{margin-bottom:0}.widget-style__2:nth-child(odd) a{margin-left:0;margin-right:0}.widget-style__2:nth-child(even) a{margin-right:0;margin-left:0}.widget-style__2:nth-last-child(2) .widget{margin-bottom:0}.stacking{margin:0 0 10px;width:100%;clear:both}.width2{width:1%;margin:0 1% 0 0}.width3{width:2%;margin:0 1% 0 0}.width4{width:3%;margin:0 1% 0 0}.width5{width:4%;margin:0 1% 0 0}.width6{width:5%;margin:0 1% 0 0}.width7{width:6%;margin:0 1% 0 0}.width8{width:7%;margin:0 1% 0 0}.width9{width:8%;margin:0 1% 0 0}.width10{width:9%;margin:0 1% 0 0}.width11{width:10%;margin:0 1% 0 0}.width12{width:11%;margin:0 1% 0 0}.width13{width:12%;margin:0 1% 0 0}.width14{width:13%;margin:0 1% 0 0}.width15{width:14%;margin:0 1% 0 0}.width16{width:15%;margin:0 1% 0 0}.width17{width:16%;margin:0 1% 0 0}.width18{width:17%;margin:0 1% 0 0}.width19{width:18%;margin:0 1% 0 0}.width20{width:19%;margin:0 1% 0 0}.width21{width:20%;margin:0 1% 0 0}.width22{width:21%;margin:0 1% 0 0}.width23{width:22%;margin:0 1% 0 0}.width24{width:23%;margin:0 1% 0 0}.width25{width:24%;margin:0 1% 0 0}.width26{width:25%;margin:0 1% 0 0}.width27{width:26%;margin:0 1% 0 0}.width28{width:27%;margin:0 1% 0 0}.width29{width:28%;margin:0 1% 0 0}.width30{width:29%;margin:0 1% 0 0}.width31{width:30%;margin:0 1% 0 0}.width32{width:31%;margin:0 1% 0 0}.width33{width:32%;margin:0 1% 0 0}.width34{width:33%;margin:0 1% 0 0}.width35{width:34%;margin:0 1% 0 0}.width36{width:35%;margin:0 1% 0 0}.width37{width:36%;margin:0 1% 0 0}.width38{width:37%;margin:0 1% 0 0}.width39{width:38%;margin:0 1% 0 0}.width40{width:39%;margin:0 1% 0 0}.width41{width:40%;margin:0 1% 0 0}.width42{width:41%;margin:0 1% 0 0}.width43{width:42%;margin:0 1% 0 0}.width44{width:43%;margin:0 1% 0 0}.width45{width:44%;margin:0 1% 0 0}.width46{width:45%;margin:0 1% 0 0}.width47{width:46%;margin:0 1% 0 0}.width48{width:47%;margin:0 1% 0 0}.width49{width:48%;margin:0 1% 0 0}.width50{width:49%;margin:0 1% 0 0}.width51{width:50%;margin:0 1% 0 0}.width52{width:51%;margin:0 1% 0 0}.width53{width:52%;margin:0 1% 0 0}.width54{width:53%;margin:0 1% 0 0}.width55{width:54%;margin:0 1% 0 0}.width56{width:55%;margin:0 1% 0 0}.width57{width:56%;margin:0 1% 0 0}.width58{width:57%;margin:0 1% 0 0}.width59{width:58%;margin:0 1% 0 0}.width60{width:59%;margin:0 1% 0 0}.width61{width:60%;margin:0 1% 0 0}.width62{width:61%;margin:0 1% 0 0}.width63{width:62%;margin:0 1% 0 0}.width64{width:63%;margin:0 1% 0 0}.width65{width:64%;margin:0 1% 0 0}.width66{width:65%;margin:0 1% 0 0}.width67{width:66%;margin:0 1% 0 0}.width68{width:67%;margin:0 1% 0 0}.width69{width:68%;margin:0 1% 0 0}.width70{width:69%;margin:0 1% 0 0}.width71{width:70%;margin:0 1% 0 0}.width72{width:71%;margin:0 1% 0 0}.width73{width:72%;margin:0 1% 0 0}.width74{width:73%;margin:0 1% 0 0}.width75{width:74%;margin:0 1% 0 0}.width76{width:75%;margin:0 1% 0 0}.width77{width:76%;margin:0 1% 0 0}.width78{width:77%;margin:0 1% 0 0}.width79{width:78%;margin:0 1% 0 0}.width80{width:79%;margin:0 1% 0 0}.width81{width:80%;margin:0 1% 0 0}.width82{width:81%;margin:0 1% 0 0}.width83{width:82%;margin:0 1% 0 0}.width84{width:83%;margin:0 1% 0 0}.width85{width:84%;margin:0 1% 0 0}.width86{width:85%;margin:0 1% 0 0}.width87{width:86%;margin:0 1% 0 0}.width88{width:87%;margin:0 1% 0 0}.width89{width:88%;margin:0 1% 0 0}.width90{width:89%;margin:0 1% 0 0}.width91{width:90%;margin:0 1% 0 0}.width92{width:91%;margin:0 1% 0 0}.width93{width:92%;margin:0 1% 0 0}.width94{width:93%;margin:0 1% 0 0}.width95{width:94%;margin:0 1% 0 0}.width96{width:95%;margin:0 1% 0 0}.width97{width:96%;margin:0 1% 0 0}.width98{width:97%;margin:0 1% 0 0}.width99{width:98%;margin:0 1% 0 0}.lastWidget2{width:2%;margin:0}.lastWidget3{width:3%;margin:0}.lastWidget4{width:4%;margin:0}.lastWidget5{width:5%;margin:0}.lastWidget6{width:6%;margin:0}.lastWidget7{width:7%;margin:0}.lastWidget8{width:8%;margin:0}.lastWidget9{width:9%;margin:0}.lastWidget10{width:10%;margin:0}.lastWidget11{width:11%;margin:0}.lastWidget12{width:12%;margin:0}.lastWidget13{width:13%;margin:0}.lastWidget14{width:14%;margin:0}.lastWidget15{width:15%;margin:0}.lastWidget16{width:16%;margin:0}.lastWidget17{width:17%;margin:0}.lastWidget18{width:18%;margin:0}.lastWidget19{width:19%;margin:0}.lastWidget20{width:20%;margin:0}.lastWidget21{width:21%;margin:0}.lastWidget22{width:22%;margin:0}.lastWidget23{width:23%;margin:0}.lastWidget24{width:24%;margin:0}.lastWidget25{width:25%;margin:0}.lastWidget26{width:26%;margin:0}.lastWidget27{width:27%;margin:0}.lastWidget28{width:28%;margin:0}.lastWidget29{width:29%;margin:0}.lastWidget30{width:30%;margin:0}.lastWidget31{width:31%;margin:0}.lastWidget32{width:32%;margin:0}.lastWidget33{width:33%;margin:0}.lastWidget34{width:34%;margin:0}.lastWidget35{width:35%;margin:0}.lastWidget36{width:36%;margin:0}.lastWidget37{width:37%;margin:0}.lastWidget38{width:38%;margin:0}.lastWidget39{width:39%;margin:0}.lastWidget40{width:40%;margin:0}.lastWidget41{width:41%;margin:0}.lastWidget42{width:42%;margin:0}.lastWidget43{width:43%;margin:0}.lastWidget44{width:44%;margin:0}.lastWidget45{width:45%;margin:0}.lastWidget46{width:46%;margin:0}.lastWidget47{width:47%;margin:0}.lastWidget48{width:48%;margin:0}.lastWidget49{width:49%;margin:0}.lastWidget50{width:50%;margin:0}.lastWidget51{width:51%;margin:0}.lastWidget52{width:52%;margin:0}.lastWidget53{width:53%;margin:0}.lastWidget54{width:54%;margin:0}.lastWidget55{width:55%;margin:0}.lastWidget56{width:56%;margin:0}.lastWidget57{width:57%;margin:0}.lastWidget58{width:58%;margin:0}.lastWidget59{width:59%;margin:0}.lastWidget60{width:60%;margin:0}.lastWidget61{width:61%;margin:0}.lastWidget62{width:62%;margin:0}.lastWidget63{width:63%;margin:0}.lastWidget64{width:64%;margin:0}.lastWidget65{width:65%;margin:0}.lastWidget66{width:66%;margin:0}.lastWidget67{width:67%;margin:0}.lastWidget68{width:68%;margin:0}.lastWidget69{width:69%;margin:0}.lastWidget70{width:70%;margin:0}.lastWidget71{width:71%;margin:0}.lastWidget72{width:72%;margin:0}.lastWidget73{width:73%;margin:0}.lastWidget74{width:74%;margin:0}.lastWidget75{width:75%;margin:0}.lastWidget76{width:76%;margin:0}.lastWidget77{width:77%;margin:0}.lastWidget78{width:78%;margin:0}.lastWidget79{width:79%;margin:0}.lastWidget80{width:80%;margin:0}.lastWidget81{width:81%;margin:0}.lastWidget82{width:82%;margin:0}.lastWidget83{width:83%;margin:0}.lastWidget84{width:84%;margin:0}.lastWidget85{width:85%;margin:0}.lastWidget86{width:86%;margin:0}.lastWidget87{width:87%;margin:0}.lastWidget88{width:88%;margin:0}.lastWidget89{width:89%;margin:0}.lastWidget90{width:90%;margin:0}.lastWidget91{width:91%;margin:0}.lastWidget92{width:92%;margin:0}.lastWidget93{width:93%;margin:0}.lastWidget94{width:94%;margin:0}.lastWidget95{width:95%;margin:0}.lastWidget96{width:96%;margin:0}.lastWidget97{width:97%;margin:0}.lastWidget98{width:98%;margin:0}.lastWidget99{width:99%;margin:0}.width100{width:100%;margin:0}.NewOnSiteWidget,.WhatsOnWidget,.cateInfoWidget,.contentWidget,.directoryWidget,.documentListWidget,.eventCalendarWidget,.imageWidget,.latestNewsWidget,.middleAdvertWidget,.navigationWidget,.opinionPollWidget,.randomimageWidget,.rightAdvertWidget,.topFaqWidget{margin:0 0 20px}.directoryWidget,.opinionPollWidget{background:#EEE;padding:20px}.directoryWidget form,.opinionPollWidget form{margin:10px 0}.directoryWidget input[type=text],.opinionPollWidget input[type=text]{width:60%}.directoryWidget .button,.directoryWidget input[type=submit],.opinionPollWidget .button,.opinionPollWidget input[type=submit]{margin:0;display:inline-block}.middleAdvertWidget img{float:left;margin:0 0 5px}.rightAdvertWidget span{display:block}.rightAdvertWidget .adwrap{padding-bottom:20px}.randomimageWidget span{display:block}.eventCalendarWidget{padding:0 0 10px}.eventCalendarWidget table.calendar{background:0 0;border-collapse:collapse;border:none;font-size:.9em;width:100%;display:table}.eventCalendarWidget table.calendar td,.eventCalendarWidget table.calendar th{background:0 0;text-transform:uppercase;border:none;padding:4px 2px;text-align:center}.eventCalendarWidget table.calendar tr{background:0 0;text-transform:uppercase;border:none}.eventCalendarWidget table.calendar td.today{background:#eee}.eventCalendarWidget table.calendar td a:active,.eventCalendarWidget table.calendar td a:hover,.eventCalendarWidget table.calendar td a:link,.eventCalendarWidget table.calendar td a:visited{color:#fff;background:#114A97}.opinionPollWidget form label{float:none;width:auto;display:inline}
\ No newline at end of file diff --git a/web/cobrands/angus/third_party/css/standard.css b/web/cobrands/angus/third_party/css/standard.css new file mode 100644 index 000000000..ab74adb7a --- /dev/null +++ b/web/cobrands/angus/third_party/css/standard.css @@ -0,0 +1 @@ +@charset "UTF-8";@font-face{font-family:angusgov;src:url(../fonts/angusgov.eot?-q16et6);src:url(../fonts/angusgov.eot?#iefix-q16et6) format("embedded-opentype"),url(../fonts/angusgov.woff?-q16et6) format("woff"),url(../fonts/angusgov.ttf?-q16et6) format("truetype"),url(../fonts/angusgov.svg?-q16et6#angusgov) format("svg");font-weight:400;font-style:normal}[class*=" icon-"]:before,[class^=icon-]:before{font-family:angusgov;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-alert:before{content:"\e600"}.icon-briefcase:before{content:"\e601"}.icon-time:before{content:"\e602"}.icon-payment:before{content:"\e603"}.icon-position:before{content:"\e604"}.icon-picture:before{content:"\e605"}.icon-direction:before{content:"\e606"}.icon-bin:before{content:"\e607"}.icon-education:before{content:"\e608"}.icon-tennis:before{content:"\e609"}.icon-football:before{content:"\e60a"}.icon-roads:before{content:"\e60b"}.icon-repair:before{content:"\e60c"}.icon-identity:before{content:"\e60d"}.icon-regenerate:before{content:"\e60e"}.icon-transport:before{content:"\e60f"}.icon-traffic:before{content:"\e610"}.icon-health:before{content:"\e611"}.icon-clipboard:before{content:"\e612"}.icon-number:before{content:"\e63e"}.icon-number2:before{content:"\e63f"}.icon-number3:before{content:"\e640"}.icon-number4:before{content:"\e641"}.icon-number5:before{content:"\e642"}.icon-number6:before{content:"\e643"}.icon-number7:before{content:"\e644"}.icon-number8:before{content:"\e645"}.icon-number9:before{content:"\e646"}.icon-number10:before{content:"\e647"}.icon-number11:before{content:"\e648"}.icon-number12:before{content:"\e649"}.icon-number13:before{content:"\e64a"}.icon-number14:before{content:"\e64b"}.icon-number15:before{content:"\e64c"}.icon-number16:before{content:"\e64d"}.icon-number17:before{content:"\e64e"}.icon-number18:before{content:"\e64f"}.icon-number19:before{content:"\e650"}.icon-number20:before{content:"\e651"}.icon-quote:before{content:"\e652"}.icon-quote2:before{content:"\e653"}.icon-tag:before{content:"\e654"}.icon-tag2:before{content:"\e655"}.icon-link:before{content:"\e656"}.icon-link2:before{content:"\e657"}.icon-cabinet:before{content:"\e658"}.icon-cabinet2:before{content:"\e659"}.icon-calendar:before{content:"\e65a"}.icon-calendar2:before{content:"\e65b"}.icon-calendar3:before{content:"\e65c"}.icon-file:before{content:"\e65d"}.icon-file2:before{content:"\e65e"}.icon-file3:before{content:"\e65f"}.icon-files:before{content:"\e660"}.icon-phone:before{content:"\e661"}.icon-tablet:before{content:"\e662"}.icon-window:before{content:"\e663"}.icon-monitor:before{content:"\e664"}.icon-ipod:before{content:"\e665"}.icon-tv:before{content:"\e666"}.icon-camera:before{content:"\e667"}.icon-camera2:before{content:"\e668"}.icon-camera3:before{content:"\e669"}.icon-film:before{content:"\e66a"}.icon-film2:before{content:"\e66b"}.icon-film3:before{content:"\e66c"}.icon-microphone:before{content:"\e66d"}.icon-microphone2:before{content:"\e66e"}.icon-microphone3:before{content:"\e66f"}.icon-drink:before{content:"\e670"}.icon-drink2:before{content:"\e671"}.icon-drink3:before{content:"\e672"}.icon-drink4:before{content:"\e673"}.icon-coffee:before{content:"\e674"}.icon-mug:before{content:"\e675"}.icon-icecream:before{content:"\e676"}.icon-cake:before{content:"\e677"}.icon-inbox:before{content:"\e678"}.icon-download:before{content:"\e679"}.icon-upload:before{content:"\e67a"}.icon-inbox2:before{content:"\e67b"}.icon-checkmark:before{content:"\e67c"}.icon-checkmark2:before{content:"\e67d"}.icon-cancel:before{content:"\e67e"}.icon-cancel2:before{content:"\e67f"}.icon-plus:before{content:"\e680"}.icon-plus2:before{content:"\e681"}.icon-minus:before{content:"\e682"}.icon-minus2:before{content:"\e683"}.icon-notice:before{content:"\e684"}.icon-alert2:before{content:"\e61f"}.icon-cog:before{content:"\e685"}.icon-cogs:before{content:"\e686"}.icon-cog2:before{content:"\e687"}.icon-warning:before{content:"\e688"}.icon-health2:before{content:"\e689"}.icon-suitcase:before{content:"\e68a"}.icon-suitcase2:before{content:"\e68b"}.icon-briefcase2:before{content:"\e620"}.icon-picture2:before{content:"\e68c"}.icon-pictures:before{content:"\e68d"}.icon-pictures2:before{content:"\e68e"}.icon-android:before{content:"\e68f"}.icon-marvin:before{content:"\e690"}.icon-pacman:before{content:"\e691"}.icon-cassette:before{content:"\e692"}.icon-watch:before{content:"\e693"}.icon-chronometer:before{content:"\e694"}.icon-time2:before{content:"\e621"}.icon-alarmclock:before{content:"\e695"}.icon-time3:before{content:"\e696"}.icon-time4:before{content:"\e697"}.icon-headphones:before{content:"\e698"}.icon-payment2:before{content:"\e622"}.icon-checkmark3:before{content:"\e699"}.icon-cancel3:before{content:"\e69a"}.icon-eye:before{content:"\e69b"}.icon-position2:before{content:"\e623"}.icon-sitemap:before{content:"\e69c"}.icon-sitemap2:before{content:"\e69d"}.icon-cloud:before{content:"\e69e"}.icon-upload2:before{content:"\e69f"}.icon-chart:before{content:"\e6a0"}.icon-chart2:before{content:"\e6a1"}.icon-chart3:before{content:"\e6a2"}.icon-chart4:before{content:"\e6a3"}.icon-chart5:before{content:"\e6a4"}.icon-chart6:before{content:"\e6a5"}.icon-location:before{content:"\e6a6"}.icon-download2:before{content:"\e6a7"}.icon-basket:before{content:"\e6a8"}.icon-folder:before{content:"\e6a9"}.icon-gamepad:before{content:"\e6aa"}.icon-alarm:before{content:"\e6ab"}.icon-alarm-cancel:before{content:"\e6ac"}.icon-phone2:before{content:"\e6ad"}.icon-phone3:before{content:"\e6ae"}.icon-picture3:before{content:"\e624"}.icon-open:before{content:"\e6af"}.icon-sale:before{content:"\e6b0"}.icon-direction2:before{content:"\e625"}.icon-map:before{content:"\e6b1"}.icon-bin2:before{content:"\e626"}.icon-vote:before{content:"\e6b2"}.icon-education2:before{content:"\e627"}.icon-lab:before{content:"\e6b3"}.icon-tie:before{content:"\e6b4"}.icon-football2:before{content:"\e6b5"}.icon-eightball:before{content:"\e6b6"}.icon-bowling:before{content:"\e6b7"}.icon-bowlingpin:before{content:"\e6b8"}.icon-tennis2:before{content:"\e628"}.icon-football3:before{content:"\e629"}.icon-dglasses:before{content:"\e6b9"}.icon-microwave:before{content:"\e6ba"}.icon-refrigerator:before{content:"\e6bb"}.icon-oven:before{content:"\e6bc"}.icon-washingmachine:before{content:"\e6bd"}.icon-mouse:before{content:"\e6be"}.icon-smiley:before{content:"\e6bf"}.icon-sad:before{content:"\e6c0"}.icon-mute:before{content:"\e6c1"}.icon-hand:before{content:"\e6c2"}.icon-radio:before{content:"\e6c3"}.icon-satellite:before{content:"\e6c4"}.icon-medal:before{content:"\e6c5"}.icon-medal2:before{content:"\e6c6"}.icon-switch:before{content:"\e6c7"}.icon-key:before{content:"\e6c8"}.icon-cord:before{content:"\e6c9"}.icon-locked:before{content:"\e6ca"}.icon-unlocked:before{content:"\e6cb"}.icon-locked2:before{content:"\e6cc"}.icon-unlocked2:before{content:"\e6cd"}.icon-magnifier:before{content:"\e6ce"}.icon-zoomin:before{content:"\e6cf"}.icon-zoomout:before{content:"\e6d0"}.icon-stack:before{content:"\e6d1"}.icon-stack2:before{content:"\e6d2"}.icon-stack3:before{content:"\e6d3"}.icon-davidstar:before{content:"\e6d4"}.icon-cross:before{content:"\e6d5"}.icon-moonandstar:before{content:"\e6d6"}.icon-transformers:before{content:"\e6d7"}.icon-batman:before{content:"\e6d8"}.icon-spaceinvaders:before{content:"\e6d9"}.icon-skeletor:before{content:"\e6da"}.icon-lamp:before{content:"\e6db"}.icon-lamp2:before{content:"\e6dc"}.icon-umbrella:before{content:"\e6dd"}.icon-roads2:before{content:"\e62a"}.icon-bomb:before{content:"\e6de"}.icon-archive:before{content:"\e6df"}.icon-battery:before{content:"\e6e0"}.icon-battery2:before{content:"\e6e1"}.icon-battery3:before{content:"\e6e2"}.icon-battery4:before{content:"\e6e3"}.icon-battery5:before{content:"\e6e4"}.icon-megaphone:before{content:"\e6e5"}.icon-megaphone2:before{content:"\e6e6"}.icon-patch:before{content:"\e6e7"}.icon-pil:before{content:"\e6e8"}.icon-injection:before{content:"\e6e9"}.icon-thermometer:before{content:"\e6ea"}.icon-lamp3:before{content:"\e6eb"}.icon-lamp4:before{content:"\e6ec"}.icon-lamp5:before{content:"\e6ed"}.icon-cube:before{content:"\e6ee"}.icon-box:before{content:"\e6ef"}.icon-box2:before{content:"\e6f0"}.icon-diamond:before{content:"\e6f1"}.icon-bag:before{content:"\e6f2"}.icon-moneybag:before{content:"\e6f3"}.icon-grid:before{content:"\e6f4"}.icon-grid2:before{content:"\e6f5"}.icon-list:before{content:"\e6f6"}.icon-list2:before{content:"\e6f7"}.icon-ruler:before{content:"\e6f8"}.icon-ruler2:before{content:"\e6f9"}.icon-layout:before{content:"\e6fa"}.icon-layout2:before{content:"\e6fb"}.icon-layout3:before{content:"\e6fc"}.icon-layout4:before{content:"\e6fd"}.icon-layout5:before{content:"\e6fe"}.icon-layout6:before{content:"\e6ff"}.icon-layout7:before{content:"\e700"}.icon-layout8:before{content:"\e701"}.icon-layout9:before{content:"\e702"}.icon-layout10:before{content:"\e703"}.icon-layout11:before{content:"\e704"}.icon-layout12:before{content:"\e705"}.icon-layout13:before{content:"\e706"}.icon-layout14:before{content:"\e707"}.icon-tools:before{content:"\e708"}.icon-repair2:before{content:"\e62b"}.icon-paint:before{content:"\e709"}.icon-hammer:before{content:"\e70a"}.icon-brush:before{content:"\e70b"}.icon-pen:before{content:"\e70c"}.icon-chat:before{content:"\e70d"}.icon-comments:before{content:"\e70e"}.icon-chat2:before{content:"\e70f"}.icon-chat3:before{content:"\e710"}.icon-volume:before{content:"\e711"}.icon-volume2:before{content:"\e712"}.icon-volume3:before{content:"\e713"}.icon-equalizer:before{content:"\e714"}.icon-resize:before{content:"\e715"}.icon-resize2:before{content:"\e716"}.icon-stretch:before{content:"\e717"}.icon-narrow:before{content:"\e718"}.icon-resize3:before{content:"\e719"}.icon-download3:before{content:"\e71a"}.icon-calculator:before{content:"\e71b"}.icon-library:before{content:"\e71c"}.icon-auction:before{content:"\e71d"}.icon-justice:before{content:"\e71e"}.icon-stats:before{content:"\e71f"}.icon-stats2:before{content:"\e720"}.icon-attachment:before{content:"\e721"}.icon-hourglass:before{content:"\e722"}.icon-abacus:before{content:"\e723"}.icon-pencil:before{content:"\e724"}.icon-pen2:before{content:"\e725"}.icon-pin:before{content:"\e726"}.icon-pin2:before{content:"\e727"}.icon-discout:before{content:"\e728"}.icon-edit:before{content:"\e729"}.icon-scissors:before{content:"\e72a"}.icon-identity2:before{content:"\e62c"}.icon-profile:before{content:"\e72b"}.icon-profile2:before{content:"\e72c"}.icon-rotate:before{content:"\e72d"}.icon-regenerate2:before{content:"\e62d"}.icon-reply:before{content:"\e72e"}.icon-forward:before{content:"\e72f"}.icon-retweet:before{content:"\e730"}.icon-shuffle:before{content:"\e731"}.icon-loop:before{content:"\e732"}.icon-crop:before{content:"\e733"}.icon-square:before{content:"\e734"}.icon-square2:before{content:"\e735"}.icon-circle:before{content:"\e736"}.icon-dollar:before{content:"\e737"}.icon-dollar2:before{content:"\e738"}.icon-coins:before{content:"\e739"}.icon-pig:before{content:"\e73a"}.icon-bookmark:before{content:"\e73b"}.icon-bookmark2:before{content:"\e73c"}.icon-addressbook:before{content:"\e73d"}.icon-addressbook2:before{content:"\e73e"}.icon-safe:before{content:"\e73f"}.icon-envelope:before{content:"\e740"}.icon-envelope2:before{content:"\e741"}.icon-radioactive:before{content:"\e742"}.icon-music:before{content:"\e743"}.icon-presentation:before{content:"\e744"}.icon-male:before{content:"\e745"}.icon-female:before{content:"\e746"}.icon-aids:before{content:"\e747"}.icon-heart:before{content:"\e748"}.icon-info:before{content:"\e749"}.icon-info2:before{content:"\e74a"}.icon-piano:before{content:"\e74b"}.icon-rain:before{content:"\e74c"}.icon-snow:before{content:"\e74d"}.icon-lightning:before{content:"\e74e"}.icon-sun:before{content:"\e74f"}.icon-moon:before{content:"\e750"}.icon-cloudy:before{content:"\e751"}.icon-cloudy2:before{content:"\e752"}.icon-car:before{content:"\e753"}.icon-bike:before{content:"\e754"}.icon-truck:before{content:"\e755"}.icon-transport2:before{content:"\e62e"}.icon-bike2:before{content:"\e756"}.icon-plane:before{content:"\e757"}.icon-paperplane:before{content:"\e758"}.icon-rocket:before{content:"\e759"}.icon-book:before{content:"\e75a"}.icon-book2:before{content:"\e75b"}.icon-barcode:before{content:"\e75c"}.icon-barcode2:before{content:"\e75d"}.icon-expand:before{content:"\e75e"}.icon-collapse:before{content:"\e75f"}.icon-popout:before{content:"\e760"}.icon-popin:before{content:"\e761"}.icon-target:before{content:"\e762"}.icon-badge:before{content:"\e763"}.icon-badge2:before{content:"\e764"}.icon-ticket:before{content:"\e765"}.icon-ticket2:before{content:"\e766"}.icon-ticket3:before{content:"\e767"}.icon-microphone4:before{content:"\e768"}.icon-traffic2:before{content:"\e62f"}.icon-blocked:before{content:"\e769"}.icon-stop:before{content:"\e76a"}.icon-keyboard:before{content:"\e76b"}.icon-keyboard2:before{content:"\e76c"}.icon-radio2:before{content:"\e76d"}.icon-printer:before{content:"\e76e"}.icon-checked:before{content:"\e76f"}.icon-error:before{content:"\e770"}.icon-add:before{content:"\e771"}.icon-minus3:before{content:"\e772"}.icon-alert3:before{content:"\e773"}.icon-pictures3:before{content:"\e774"}.icon-atom:before{content:"\e775"}.icon-eyedropper:before{content:"\e776"}.icon-globe:before{content:"\e777"}.icon-globe2:before{content:"\e778"}.icon-shipping:before{content:"\e779"}.icon-yingyang:before{content:"\e77a"}.icon-compass:before{content:"\e77b"}.icon-zip:before{content:"\e77c"}.icon-zip2:before{content:"\e77d"}.icon-anchor:before{content:"\e77e"}.icon-lockedheart:before{content:"\e77f"}.icon-magnet:before{content:"\e780"}.icon-navigation:before{content:"\e781"}.icon-tags:before{content:"\e782"}.icon-health3:before{content:"\e630"}.icon-heart2:before{content:"\e783"}.icon-usb:before{content:"\e784"}.icon-clipboard2:before{content:"\e785"}.icon-clipboard3:before{content:"\e631"}.icon-clipboard4:before{content:"\e786"}.icon-switch2:before{content:"\e787"}.icon-ruler3:before{content:"\e788"}.icon-house:before{content:"\e613"}.icon-buildings:before{content:"\e614"}.icon-books:before{content:"\e615"}.icon-museum:before{content:"\e616"}.icon-map2:before{content:"\e617"}.icon-people:before{content:"\e618"}.icon-leaf:before{content:"\e619"}.icon-live:before{content:"\e61a"}.icon-community:before{content:"\e61b"}.icon-facebook:before{content:"\e61c"}.icon-twitter:before{content:"\e61d"}.icon-youtube:before{content:"\e61e"}.icon-house2:before{content:"\e632"}.icon-home:before{content:"\e789"}.icon-home2:before{content:"\e78a"}.icon-buildings2:before{content:"\e633"}.icon-newspaper:before{content:"\e78b"}.icon-pencil2:before{content:"\e78c"}.icon-pencil3:before{content:"\e78d"}.icon-quill:before{content:"\e78e"}.icon-pen3:before{content:"\e78f"}.icon-blog:before{content:"\e790"}.icon-droplet:before{content:"\e791"}.icon-paint-format:before{content:"\e792"}.icon-image:before{content:"\e793"}.icon-image2:before{content:"\e794"}.icon-images:before{content:"\e795"}.icon-camera4:before{content:"\e796"}.icon-music2:before{content:"\e797"}.icon-headphones2:before{content:"\e798"}.icon-play:before{content:"\e799"}.icon-film4:before{content:"\e79a"}.icon-camera5:before{content:"\e79b"}.icon-dice:before{content:"\e79c"}.icon-pacman2:before{content:"\e79d"}.icon-spades:before{content:"\e79e"}.icon-clubs:before{content:"\e79f"}.icon-diamonds:before{content:"\e7a0"}.icon-pawn:before{content:"\e7a1"}.icon-bullhorn:before{content:"\e7a2"}.icon-connection:before{content:"\e7a3"}.icon-podcast:before{content:"\e7a4"}.icon-feed:before{content:"\e7a5"}.icon-book3:before{content:"\e7a6"}.icon-books2:before{content:"\e634"}.icon-museum2:before{content:"\e635"}.icon-file4:before{content:"\e7a7"}.icon-profile3:before{content:"\e7a8"}.icon-file5:before{content:"\e7a9"}.icon-file6:before{content:"\e7aa"}.icon-file7:before{content:"\e7ab"}.icon-copy:before{content:"\e7ac"}.icon-copy2:before{content:"\e7ad"}.icon-copy3:before{content:"\e7ae"}.icon-paste:before{content:"\e7af"}.icon-paste2:before{content:"\e7b0"}.icon-paste3:before{content:"\e7b1"}.icon-stack4:before{content:"\e7b2"}.icon-folder2:before{content:"\e7b3"}.icon-folder-open:before{content:"\e7b4"}.icon-tag3:before{content:"\e7b5"}.icon-tags2:before{content:"\e7b6"}.icon-barcode3:before{content:"\e7b7"}.icon-qrcode:before{content:"\e7b8"}.icon-ticket4:before{content:"\e7b9"}.icon-cart:before{content:"\e7ba"}.icon-cart2:before{content:"\e7bb"}.icon-cart3:before{content:"\e7bc"}.icon-coin:before{content:"\e7bd"}.icon-credit:before{content:"\e7be"}.icon-calculate:before{content:"\e7bf"}.icon-support:before{content:"\e7c0"}.icon-phone4:before{content:"\e7c1"}.icon-phone-hang-up:before{content:"\e7c2"}.icon-address-book:before{content:"\e7c3"}.icon-notebook:before{content:"\e7c4"}.icon-envelope3:before{content:"\e7c5"}.icon-pushpin:before{content:"\e7c6"}.icon-location2:before{content:"\e7c7"}.icon-location3:before{content:"\e7c8"}.icon-compass2:before{content:"\e7c9"}.icon-map3:before{content:"\e636"}.icon-map4:before{content:"\e7ca"}.icon-history:before{content:"\e7cb"}.icon-clock:before{content:"\e7cc"}.icon-clock2:before{content:"\e7cd"}.icon-alarm2:before{content:"\e7ce"}.icon-alarm3:before{content:"\e7cf"}.icon-bell:before{content:"\e7d0"}.icon-stopwatch:before{content:"\e7d1"}.icon-calendar4:before{content:"\e7d2"}.icon-calendar5:before{content:"\e7d3"}.icon-print:before{content:"\e7d4"}.icon-keyboard3:before{content:"\e7d5"}.icon-screen:before{content:"\e7d6"}.icon-laptop:before{content:"\e7d7"}.icon-mobile:before{content:"\e7d8"}.icon-mobile2:before{content:"\e7d9"}.icon-tablet2:before{content:"\e7da"}.icon-tv2:before{content:"\e7db"}.icon-cabinet3:before{content:"\e7dc"}.icon-drawer:before{content:"\e7dd"}.icon-drawer2:before{content:"\e7de"}.icon-drawer3:before{content:"\e7df"}.icon-box-add:before{content:"\e7e0"}.icon-box-remove:before{content:"\e7e1"}.icon-download4:before{content:"\e7e2"}.icon-upload3:before{content:"\e7e3"}.icon-disk:before{content:"\e7e4"}.icon-storage:before{content:"\e7e5"}.icon-undo:before{content:"\e7e6"}.icon-redo:before{content:"\e7e7"}.icon-flip:before{content:"\e7e8"}.icon-flip2:before{content:"\e7e9"}.icon-undo2:before{content:"\e7ea"}.icon-redo2:before{content:"\e7eb"}.icon-forward2:before{content:"\e7ec"}.icon-reply2:before{content:"\e7ed"}.icon-bubble:before{content:"\e7ee"}.icon-bubbles:before{content:"\e7ef"}.icon-bubbles2:before{content:"\e7f0"}.icon-bubble2:before{content:"\e7f1"}.icon-bubbles3:before{content:"\e7f2"}.icon-bubbles4:before{content:"\e7f3"}.icon-user:before{content:"\e7f4"}.icon-people2:before{content:"\e637"}.icon-user2:before{content:"\e7f5"}.icon-users:before{content:"\e7f6"}.icon-user3:before{content:"\e7f7"}.icon-user4:before{content:"\e7f8"}.icon-quotes-left:before{content:"\e7f9"}.icon-busy:before{content:"\e7fa"}.icon-spinner:before{content:"\e7fb"}.icon-spinner2:before{content:"\e7fc"}.icon-spinner3:before{content:"\e7fd"}.icon-spinner4:before{content:"\e7fe"}.icon-spinner5:before{content:"\e7ff"}.icon-spinner6:before{content:"\e800"}.icon-binoculars:before{content:"\e801"}.icon-search:before{content:"\e802"}.icon-zoomin2:before{content:"\e803"}.icon-zoomout2:before{content:"\e804"}.icon-expand2:before{content:"\e805"}.icon-contract:before{content:"\e806"}.icon-expand3:before{content:"\e807"}.icon-contract2:before{content:"\e808"}.icon-key2:before{content:"\e809"}.icon-key3:before{content:"\e80a"}.icon-lock:before{content:"\e80b"}.icon-lock2:before{content:"\e80c"}.icon-unlocked3:before{content:"\e80d"}.icon-wrench:before{content:"\e80e"}.icon-settings:before{content:"\e80f"}.icon-equalizer2:before{content:"\e810"}.icon-cog3:before{content:"\e811"}.icon-cogs2:before{content:"\e812"}.icon-cog4:before{content:"\e813"}.icon-hammer2:before{content:"\e814"}.icon-wand:before{content:"\e815"}.icon-aid:before{content:"\e816"}.icon-bug:before{content:"\e817"}.icon-pie:before{content:"\e818"}.icon-stats3:before{content:"\e819"}.icon-bars:before{content:"\e81a"}.icon-bars2:before{content:"\e81b"}.icon-gift:before{content:"\e81c"}.icon-trophy:before{content:"\e81d"}.icon-glass:before{content:"\e81e"}.icon-mug2:before{content:"\e81f"}.icon-food:before{content:"\e820"}.icon-leaf2:before{content:"\e638"}.icon-rocket2:before{content:"\e821"}.icon-meter:before{content:"\e822"}.icon-meter2:before{content:"\e823"}.icon-dashboard:before{content:"\e824"}.icon-hammer3:before{content:"\e825"}.icon-fire:before{content:"\e826"}.icon-lab2:before{content:"\e827"}.icon-magnet2:before{content:"\e828"}.icon-remove:before{content:"\e829"}.icon-remove2:before{content:"\e82a"}.icon-briefcase3:before{content:"\e82b"}.icon-airplane:before{content:"\e82c"}.icon-truck2:before{content:"\e82d"}.icon-road:before{content:"\e82e"}.icon-accessibility:before{content:"\e82f"}.icon-target2:before{content:"\e830"}.icon-shield:before{content:"\e831"}.icon-live2:before{content:"\e639"}.icon-switch3:before{content:"\e832"}.icon-powercord:before{content:"\e833"}.icon-signup:before{content:"\e834"}.icon-list3:before{content:"\e835"}.icon-list4:before{content:"\e836"}.icon-numbered-list:before{content:"\e837"}.icon-menu:before{content:"\e838"}.icon-menu2:before{content:"\e839"}.icon-tree:before{content:"\e83a"}.icon-cloud2:before{content:"\e83b"}.icon-cloud-download:before{content:"\e83c"}.icon-cloud-upload:before{content:"\e83d"}.icon-download5:before{content:"\e83e"}.icon-upload4:before{content:"\e83f"}.icon-download6:before{content:"\e840"}.icon-upload5:before{content:"\e841"}.icon-globe3:before{content:"\e842"}.icon-earth:before{content:"\e843"}.icon-link3:before{content:"\e844"}.icon-flag:before{content:"\e845"}.icon-attachment2:before{content:"\e846"}.icon-community2:before{content:"\e63a"}.icon-eye-blocked:before{content:"\e847"}.icon-eye2:before{content:"\e848"}.icon-bookmark3:before{content:"\e849"}.icon-bookmarks:before{content:"\e84a"}.icon-brightness-medium:before{content:"\e84b"}.icon-brightness-contrast:before{content:"\e84c"}.icon-contrast:before{content:"\e84d"}.icon-star:before{content:"\e84e"}.icon-star2:before{content:"\e84f"}.icon-star3:before{content:"\e850"}.icon-heart3:before{content:"\e851"}.icon-heart4:before{content:"\e852"}.icon-heart-broken:before{content:"\e853"}.icon-thumbs-up:before{content:"\e854"}.icon-thumbs-up2:before{content:"\e855"}.icon-happy:before{content:"\e856"}.icon-happy2:before{content:"\e857"}.icon-smiley2:before{content:"\e858"}.icon-smiley3:before{content:"\e859"}.icon-tongue:before{content:"\e85a"}.icon-tongue2:before{content:"\e85b"}.icon-sad2:before{content:"\e85c"}.icon-sad3:before{content:"\e85d"}.icon-wink:before{content:"\e85e"}.icon-wink2:before{content:"\e85f"}.icon-grin:before{content:"\e860"}.icon-grin2:before{content:"\e861"}.icon-cool:before{content:"\e862"}.icon-cool2:before{content:"\e863"}.icon-angry:before{content:"\e864"}.icon-angry2:before{content:"\e865"}.icon-evil:before{content:"\e866"}.icon-evil2:before{content:"\e867"}.icon-shocked:before{content:"\e868"}.icon-shocked2:before{content:"\e869"}.icon-confused:before{content:"\e86a"}.icon-confused2:before{content:"\e86b"}.icon-neutral:before{content:"\e86c"}.icon-neutral2:before{content:"\e86d"}.icon-wondering:before{content:"\e86e"}.icon-wondering2:before{content:"\e86f"}.icon-point-up:before{content:"\e870"}.icon-point-right:before{content:"\e871"}.icon-point-down:before{content:"\e872"}.icon-point-left:before{content:"\e873"}.icon-warning2:before{content:"\e874"}.icon-notification:before{content:"\e875"}.icon-question:before{content:"\e876"}.icon-info3:before{content:"\e877"}.icon-info4:before{content:"\e878"}.icon-blocked2:before{content:"\e879"}.icon-cancel-circle:before{content:"\e87a"}.icon-checkmark-circle:before{content:"\e87b"}.icon-spam:before{content:"\e87c"}.icon-close:before{content:"\e87d"}.icon-checkmark4:before{content:"\e87e"}.icon-checkmark5:before{content:"\e87f"}.icon-spell-check:before{content:"\e880"}.icon-minus4:before{content:"\e881"}.icon-plus3:before{content:"\e882"}.icon-enter:before{content:"\e883"}.icon-exit:before{content:"\e884"}.icon-play2:before{content:"\e885"}.icon-pause:before{content:"\e886"}.icon-stop2:before{content:"\e887"}.icon-backward:before{content:"\e888"}.icon-forward3:before{content:"\e889"}.icon-play3:before{content:"\e88a"}.icon-pause2:before{content:"\e88b"}.icon-stop3:before{content:"\e88c"}.icon-backward2:before{content:"\e88d"}.icon-forward4:before{content:"\e88e"}.icon-first:before{content:"\e88f"}.icon-last:before{content:"\e890"}.icon-previous:before{content:"\e891"}.icon-next:before{content:"\e892"}.icon-eject:before{content:"\e893"}.icon-volume-high:before{content:"\e894"}.icon-volume-medium:before{content:"\e895"}.icon-volume-low:before{content:"\e896"}.icon-volume-mute:before{content:"\e897"}.icon-volume-mute2:before{content:"\e898"}.icon-volume-increase:before{content:"\e899"}.icon-volume-decrease:before{content:"\e89a"}.icon-loop2:before{content:"\e89b"}.icon-loop3:before{content:"\e89c"}.icon-loop4:before{content:"\e89d"}.icon-shuffle2:before{content:"\e89e"}.icon-arrow-up-left:before{content:"\e89f"}.icon-arrow-up:before{content:"\e8a0"}.icon-arrow-up-right:before{content:"\e8a1"}.icon-arrow-right:before{content:"\e8a2"}.icon-arrow-down-right:before{content:"\e8a3"}.icon-arrow-down:before{content:"\e8a4"}.icon-arrow-down-left:before{content:"\e8a5"}.icon-arrow-left:before{content:"\e8a6"}.icon-arrow-up-left2:before{content:"\e8a7"}.icon-arrow-up2:before{content:"\e8a8"}.icon-arrow-up-right2:before{content:"\e8a9"}.icon-arrow-right2:before{content:"\e8aa"}.icon-arrow-down-right2:before{content:"\e8ab"}.icon-arrow-down2:before{content:"\e8ac"}.icon-arrow-down-left2:before{content:"\e8ad"}.icon-arrow-left2:before{content:"\e8ae"}.icon-arrow-up-left3:before{content:"\e8af"}.icon-arrow-up3:before{content:"\e8b0"}.icon-arrow-up-right3:before{content:"\e8b1"}.icon-arrow-right3:before{content:"\e8b2"}.icon-arrow-down-right3:before{content:"\e8b3"}.icon-arrow-down3:before{content:"\e8b4"}.icon-arrow-down-left3:before{content:"\e8b5"}.icon-arrow-left3:before{content:"\e8b6"}.icon-tab:before{content:"\e8b7"}.icon-checkbox-checked:before{content:"\e8b8"}.icon-checkbox-unchecked:before{content:"\e8b9"}.icon-checkbox-partial:before{content:"\e8ba"}.icon-radio-checked:before{content:"\e8bb"}.icon-radio-unchecked:before{content:"\e8bc"}.icon-crop2:before{content:"\e8bd"}.icon-scissors2:before{content:"\e8be"}.icon-filter:before{content:"\e8bf"}.icon-filter2:before{content:"\e8c0"}.icon-font:before{content:"\e8c1"}.icon-text-height:before{content:"\e8c2"}.icon-text-width:before{content:"\e8c3"}.icon-bold:before{content:"\e8c4"}.icon-underline:before{content:"\e8c5"}.icon-italic:before{content:"\e8c6"}.icon-strikethrough:before{content:"\e8c7"}.icon-omega:before{content:"\e8c8"}.icon-sigma:before{content:"\e8c9"}.icon-table:before{content:"\e8ca"}.icon-table2:before{content:"\e8cb"}.icon-insert-template:before{content:"\e8cc"}.icon-pilcrow:before{content:"\e8cd"}.icon-lefttoright:before{content:"\e8ce"}.icon-righttoleft:before{content:"\e8cf"}.icon-paragraph-left:before{content:"\e8d0"}.icon-paragraph-center:before{content:"\e8d1"}.icon-paragraph-right:before{content:"\e8d2"}.icon-paragraph-justify:before{content:"\e8d3"}.icon-paragraph-left2:before{content:"\e8d4"}.icon-paragraph-center2:before{content:"\e8d5"}.icon-paragraph-right2:before{content:"\e8d6"}.icon-paragraph-justify2:before{content:"\e8d7"}.icon-indent-increase:before{content:"\e8d8"}.icon-indent-decrease:before{content:"\e8d9"}.icon-newtab:before{content:"\e8da"}.icon-embed:before{content:"\e8db"}.icon-code:before{content:"\e8dc"}.icon-console:before{content:"\e8dd"}.icon-share:before{content:"\e8de"}.icon-mail:before{content:"\e8df"}.icon-mail2:before{content:"\e8e0"}.icon-mail3:before{content:"\e8e1"}.icon-mail4:before{content:"\e8e2"}.icon-google:before{content:"\e8e3"}.icon-googleplus:before{content:"\e8e4"}.icon-googleplus2:before{content:"\e8e5"}.icon-googleplus3:before{content:"\e8e6"}.icon-googleplus4:before{content:"\e8e7"}.icon-google-drive:before{content:"\e8e8"}.icon-facebook2:before{content:"\e63b"}.icon-facebook3:before{content:"\e8e9"}.icon-facebook4:before{content:"\e8ea"}.icon-instagram:before{content:"\e8eb"}.icon-twitter2:before{content:"\e63c"}.icon-twitter3:before{content:"\e8ec"}.icon-twitter4:before{content:"\e8ed"}.icon-feed2:before{content:"\e8ee"}.icon-feed3:before{content:"\e8ef"}.icon-feed4:before{content:"\e8f0"}.icon-youtube2:before{content:"\e63d"}.icon-youtube3:before{content:"\e8f1"}.icon-vimeo:before{content:"\e8f2"}.icon-vimeo2:before{content:"\e8f3"}.icon-vimeo3:before{content:"\e8f4"}.icon-lanyrd:before{content:"\e8f5"}.icon-flickr:before{content:"\e8f6"}.icon-flickr2:before{content:"\e8f7"}.icon-flickr3:before{content:"\e8f8"}.icon-flickr4:before{content:"\e8f9"}.icon-picassa:before{content:"\e8fa"}.icon-picassa2:before{content:"\e8fb"}.icon-dribbble:before{content:"\e8fc"}.icon-dribbble2:before{content:"\e8fd"}.icon-dribbble3:before{content:"\e8fe"}.icon-forrst:before{content:"\e8ff"}.icon-forrst2:before{content:"\e900"}.icon-deviantart:before{content:"\e901"}.icon-deviantart2:before{content:"\e902"}.icon-steam:before{content:"\e903"}.icon-steam2:before{content:"\e904"}.icon-github:before{content:"\e905"}.icon-github2:before{content:"\e906"}.icon-github3:before{content:"\e907"}.icon-github4:before{content:"\e908"}.icon-github5:before{content:"\e909"}.icon-wordpress:before{content:"\e90a"}.icon-wordpress2:before{content:"\e90b"}.icon-joomla:before{content:"\e90c"}.icon-blogger:before{content:"\e90d"}.icon-blogger2:before{content:"\e90e"}.icon-tumblr:before{content:"\e90f"}.icon-tumblr2:before{content:"\e910"}.icon-yahoo:before{content:"\e911"}.icon-tux:before{content:"\e912"}.icon-apple:before{content:"\e913"}.icon-finder:before{content:"\e914"}.icon-android2:before{content:"\e915"}.icon-windows:before{content:"\e916"}.icon-windows8:before{content:"\e917"}.icon-soundcloud:before{content:"\e918"}.icon-soundcloud2:before{content:"\e919"}.icon-skype:before{content:"\e91a"}.icon-reddit:before{content:"\e91b"}.icon-linkedin:before{content:"\e91c"}.icon-lastfm:before{content:"\e91d"}.icon-lastfm2:before{content:"\e91e"}.icon-delicious:before{content:"\e91f"}.icon-stumbleupon:before{content:"\e920"}.icon-stumbleupon2:before{content:"\e921"}.icon-stackoverflow:before{content:"\e922"}.icon-pinterest:before{content:"\e923"}.icon-pinterest2:before{content:"\e924"}.icon-xing:before{content:"\e925"}.icon-xing2:before{content:"\e926"}.icon-flattr:before{content:"\e927"}.icon-foursquare:before{content:"\e928"}.icon-foursquare2:before{content:"\e929"}.icon-paypal:before{content:"\e92a"}.icon-paypal2:before{content:"\e92b"}.icon-paypal3:before{content:"\e92c"}.icon-yelp:before{content:"\e92d"}.icon-libreoffice:before{content:"\e92e"}.icon-file-pdf:before{content:"\e92f"}.icon-file-openoffice:before{content:"\e930"}.icon-file-word:before{content:"\e931"}.icon-file-excel:before{content:"\e932"}.icon-file-zip:before{content:"\e933"}.icon-file-powerpoint:before{content:"\e934"}.icon-file-xml:before{content:"\e935"}.icon-file-css:before{content:"\e936"}.icon-html5:before{content:"\e937"}.icon-html52:before{content:"\e938"}.icon-css3:before{content:"\e939"}.icon-chrome:before{content:"\e93a"}.icon-firefox:before{content:"\e93b"}.icon-IE:before{content:"\e93c"}.icon-opera:before{content:"\e93d"}.icon-safari:before{content:"\e93e"}.icon-IcoMoon:before{content:"\e93f"}/*! normalize.css v1.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}blockquote{margin:1em 40px}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}p,pre{margin:1em 0}code,kbd,pre,samp{font-family:monospace,serif;font-family:'courier new',monospace}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}q{quotes:none}q:after,q:before{content:'';content:none}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dl,menu,ol,ul{margin:1em 0}dd{margin:0 0 0 40px}menu,ol,ul{padding:0 0 0 40px}nav ol,nav ul{list-style:none;list-style-image:none}img{border:0;-ms-interpolation-mode:bicubic}svg:not(:root){overflow:hidden}figure,form{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0;white-space:normal;*margin-left:-7px}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer;*overflow:visible}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0;*height:13px;*width:13px}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto}table{border-collapse:collapse;border-spacing:0}input{font-family:Sintony,sans-serif}.visually-hidden{display:none!important}.hidden{position:absolute;left:-999999px;top:-99999px}.float-left{float:left}.float-right{float:right}.border-box{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.show-grid:nth-child(2n+1) div{background:#fac8f0}.show-grid:nth-child(3n+1) div{background:#c8faf0}.show-grid div{height:200px;background:#b4c8f0}.container{width:100%;max-width:1200px;padding:0 20px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:auto;display:block;margin-bottom:1.2em;clear:both;overflow:hidden}.grid-master{position:absolute;z-index:999;text-align:center;overflow:auto;width:100%}.grid-overlay{height:2000px}.grid-overlay div{height:2000px;background:rgba(255,0,0,.1)!important}.column{margin-right:1.66667%;display:block;float:left}.column:last-child{margin-right:0}@media (max-width:480px){.column{width:100%!important;margin-right:0;margin-left:0!important;float:none;clear:both}}body{background:#424242;font-size:.8em}@media screen and (min-width:760px){body{font-size:1em}}.oneCol .content{width:100%;padding:0}@media screen and (max-width:380px){.container{padding:0 10px}}.skip-links{font-size:.9em;left:10px;margin:0;padding:0;position:absolute;top:0;z-index:300000;width:16.66667%}@media screen and (min-width:380px){.skip-links{left:20px}}@media screen and (min-width:480px){.skip-links{width:12.5%}}@media screen and (min-width:950px){.skip-links{width:8.33333%}}.skip-links li{list-style:none;margin:0;padding:0}.skip-links a{background-color:#c7c7c7;border-radius:0 0 .5em .5em;color:#222;margin-top:-5em;padding:.75em 10px;position:absolute;text-align:center;-webkit-transition:.15s margin ease-in;-moz-transition:.15s margin ease-in;transition:.15s margin ease-in;width:100%}.skip-links a:focus{margin-top:0}.site-header{background-color:#008672;border-bottom:.5em solid #006d5c;box-shadow:0 5px 5px rgba(0,0,0,.075);overflow:hidden;position:relative;z-index:20000}.site-header .container{margin:0;padding:10px;position:relative;z-index:90}@media screen and (min-width:380px){.site-header .container{padding:10px 20px}}@media screen and (min-width:1180px){.site-header .container{margin:0 auto;width:100%}}.site-header .item-list{color:#cce6e2;font-size:.9em;float:right;margin:0;text-align:right;width:70%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media screen and (min-width:760px){.site-header .item-list{font-size:.8em;margin:.25em 0 0;width:auto}}@media screen and (min-width:760px) and (min-width:1200px){.site-header .item-list{padding-left:0}}.site-header .item-list li{margin:0}.site-header .item-list li a{color:#fff;padding:.125em .5em;margin:0}.site-header .item-list li a:active,.site-header .item-list li a:focus,.site-header .item-list li a:hover{color:#fff}.site-header .item-list li a:last-child{padding-right:0}.site-header .form__search{clear:right;float:right;margin:.65em 0 .25em;padding:0;text-align:right;width:75%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.site-header .form__search .field{border-color:rgba(0,0,0,.6);min-width:13em;position:relative;z-index:100;width:41.66667%}.site-header .form__search .button,.site-header .form__search input[type=submit]{margin:0;position:relative;padding-left:10px;padding-right:10px;z-index:100;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.site-header .form__search .button:active,.site-header .form__search input[type=submit]:active{margin-top:.1em;min-height:2.8em}@media screen and (min-width:760px){.site-header .form__search .button:active,.site-header .form__search input[type=submit]:active{min-height:2.8em}}@media screen and (min-width:480px){.site-header .form__search{width:61.10833%}.site-header .form__search .button,.site-header .form__search input[type=submit]{padding-left:20px;padding-right:20px}}.home .site-header{box-shadow:0 5px 5px rgba(0,0,0,.05)}.alert.announcement{margin:0;padding:.75em 0 .25em;text-align:center}@media screen and (min-width:480px){.alert.announcement{text-align:left}}.alert.announcement .container{margin-bottom:0}.alert.announcement h2,.alert.announcement p{display:inline-block;margin:0 20px 0 0}.alert.announcement h2{line-height:1.8;clear:both}.alert.announcement h2:before{display:none;float:left;margin:0 10px 0 0;font-size:2.5rem}.lt-ie9 .alert.announcement h2:before{font-size:2.5em}@media screen and (min-width:760px){.alert.announcement h2{clear:none}.alert.announcement h2:before{display:block}}.alert.announcement p{line-height:2;padding:1em 0}@media screen and (min-width:480px){.alert.announcement p{line-height:2.95;padding:0}}.alert.announcement .button,.alert.announcement input[type=submit]{margin:1em 6em 0;display:inline-block}@media screen and (min-width:480px){.alert.announcement .button,.alert.announcement input[type=submit]{margin:.1em 0 0 10px;float:right}}.alert.announcement .button:active,.alert.announcement input[type=submit]:active{min-height:2.65em}.logo{color:#c7c7c7;float:left;margin:.2em 0 0;text-decoration:none}.logo img{display:block;width:56px}@media screen and (min-width:480px){.logo img{width:130px}}@media screen and (min-width:760px){.logo img{width:165px}}.site-main{background:#fff;border-bottom:.5em solid #717171;overflow:hidden;position:relative;z-index:90}.site-main .outer-container{background-image:-ms-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f5f5f5),color-stop(0.3,#fff),color-stop(1,#f5f5f5));background-image:-webkit-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#fff 30%,#f5f5f5 100%);*zoom:1}.site-main .outer-container:after,.site-main .outer-container:before{content:' ';display:table}.site-main .outer-container:after{clear:both}.site-main .outer-container>.container{overflow:visible;*zoom:1}.site-main .outer-container>.container:after,.site-main .outer-container>.container:before{content:' ';display:table}.site-main .outer-container>.container:after{clear:both}.site-main:focus{outline:0}.home .site-main{box-shadow:inset 0 -2px 5px rgba(0,0,0,.3)}h1{margin:1em 0 0;padding:0 0 .5em}.top-strip{background-color:#424242;height:auto;overflow:hidden;padding:2em 0;position:relative}.top-strip .top-image{background-position:center 70%;background-repeat:no-repeat;background-size:100% auto;-webkit-filter:blur(3px);-moz-filter:blur(3px);-o-filter:blur(3px);-ms-filter:blur(3px);filter:blur(3px);filter:url(css_img/blur.svg#blur);height:97%;left:0;overflow:hidden;position:absolute;top:1.5%;width:100%}.top-strip .container{overflow:visible}.top-strip h1,.top-strip p{clear:left;color:#fff;float:left;margin:0 0 0 -20px;max-width:90%;position:relative;z-index:10;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media screen and (min-width:760px){.top-strip h1,.top-strip p{max-width:50%}}@media screen and (min-width:1200px){.top-strip h1:before,.top-strip p:before{content:' ';display:block;height:100%;left:-1000%;position:absolute;top:0;width:1000%;z-index:10}}.top-strip h1{background-color:#008672;border-bottom:.15em solid #006d5c;padding:.25em 20px}@media screen and (min-width:950px){.top-strip h1:before{background-color:#008672;border-bottom:.15em solid #006d5c}}.top-strip p{background-color:rgba(255,255,255,.8);color:#222;margin-top:.875em;font-size:1.17em;padding:.5em 20px}@media screen and (min-width:950px){.top-strip p:before{background-color:rgba(255,255,255,.8)}}.no-top-image .top-strip{background-color:#eee;border-bottom:1px solid #c7c7c7;border-top:1px solid #c7c7c7}.content{float:left;margin:1.25em 0 .75em;width:100%}.content h2:first-child{margin-top:0}@media screen and (min-width:760px){.content{padding-right:20px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:66.66667%}}.landing .content{display:block}.site-az,.widget-az{background-color:#114a97}.site-az .container,.widget-az .container{margin-bottom:0}.site-az .button,.site-az input[type=submit],.widget-az .button,.widget-az input[type=submit]{margin:1.3em auto;width:66.66667%}.site-az .button:active,.site-az input[type=submit]:active,.widget-az .button:active,.widget-az input[type=submit]:active{margin-top:1.4em;min-height:2.7em}@media screen and (min-width:380px){.site-az .button,.site-az input[type=submit],.widget-az .button,.widget-az input[type=submit]{width:50%}}@media screen and (min-width:480px){.site-az .button,.site-az input[type=submit],.widget-az .button,.widget-az input[type=submit]{display:none}}.site-az .az-list,.widget-az .az-list{display:none;margin:.5em -10px}.site-az .az-list li,.widget-az .az-list li{padding:.25em 0;margin:0}.site-az .az-list a,.widget-az .az-list a{color:#fff;padding:.5em 0;text-align:center;text-decoration:none}.site-az .az-list a:active,.site-az .az-list a:focus,.site-az .az-list a:hover,.widget-az .az-list a:active,.widget-az .az-list a:focus,.widget-az .az-list a:hover{background-color:#0e3f80;border-radius:4px;box-shadow:inset 0 3px 5px rgba(0,0,0,.2);text-decoration:none}.site-az .az-list span,.widget-az .az-list span{color:#999;padding:.5em 0;text-align:center;text-decoration:none;text-transform:uppercase;display:block}@media screen and (min-width:480px){.site-az .az-list,.widget-az .az-list{display:block}}@media screen and (min-width:1200px){.site-az .az-list,.widget-az .az-list{margin:.5em 0}}.home .site-az{box-shadow:0 5px 5px rgba(0,0,0,.2)}.site-footer{overflow:hidden;padding:.5em 0}.site-footer .footer-copy .container{color:#fff;font-size:.9em;margin:1.75em auto 1.5em;padding:0 10px}.site-footer .footer-copy .container .item-list__inline,.site-footer .footer-copy .container p{line-height:1.75;margin:0 0 1em}.site-footer .footer-copy .container .item-list__inline{margin-bottom:.75em}.site-footer .footer-copy .container .item-list__inline li{display:inline-block;margin:0 .75em .25em 0;padding:0;position:relative}.site-footer .footer-copy .container .item-list__inline li:before{bottom:0;content:',';display:block;position:absolute;right:-.3em}.site-footer .footer-copy .container .item-list__inline li:last-child:before{content:'.'}.site-footer .footer-copy .container a{color:#c7c7c7;text-decoration:none;-webkit-transition:.15s color ease-in;-moz-transition:.15s color ease-in;transition:.15s color ease-in}.site-footer .footer-copy .container a:active,.site-footer .footer-copy .container a:focus,.site-footer .footer-copy .container a:hover{color:#fff;text-decoration:underline}@media screen and (min-width:950px){.site-footer .footer-copy .container p{width:50%}}.site-footer .footer-copy .container p.social{overflow:hidden}.site-footer .footer-copy .container p.social a{background-color:#3c3c3c;border-radius:1em;font-size:2.25rem;float:left;height:1em;margin:0 .25em 0 0;text-indent:-20000px;-webkit-transition:.15s color ease-in,.15s background-color ease-in;-moz-transition:.15s color ease-in,.15s background-color ease-in;transition:.15s color ease-in,.15s background-color ease-in;width:1em}.site-footer .footer-copy .container p.social a:before{float:left;font-size:1.25rem;line-height:1.8;text-align:center;text-indent:0;width:100%}.lt-ie9 .site-footer .footer-copy .container p.social a:before{font-size:1.25em}.site-footer .footer-copy .container p.social a:active,.site-footer .footer-copy .container p.social a:focus,.site-footer .footer-copy .container p.social a:hover{background-color:#353535;text-decoration:none}.lt-ie9 .site-footer .footer-copy .container p.social a{font-size:2.25em}.site-footer .footer-copy .container p:last-child{margin-bottom:0}.site-footer .footer-copy .container p:last-child span{display:inline-block;margin:0 .5em 0 0}@media screen and (min-width:380px){.site-footer .footer-copy .container{padding:0 20px}}@media screen and (min-width:760px){.site-footer .footer-copy .container{font-size:.8em}}div.main_image,img.main_image{width:30%;max-width:30%;float:left;margin:1em 1em 1em 0;display:none}@media screen and (min-width:380px){div.main_image,img.main_image{display:block}}.float_left{float:left}.float_right{float:right}.image_centre{display:block;margin:1em auto;text-align:center}.figcaption,.imageCaption{max-width:100%}.figcaption p,.imageCaption p{margin-top:5px;text-align:left;font-style:italic;font-size:.8em;margin-bottom:0}.byEditor{overflow:auto}.byEditor .imageCaption.float_left,.byEditor img.float_left{margin:1em 1em 1em 0}.byEditor .imageCaption.float_right,.byEditor img.float_right{margin:1em 0 1em 1em}.byEditor p.date{margin-top:0}.byEditor .indent{padding-left:1em}.byEditor .indent2{padding-left:2em}.byEditor .strikethrough_text{text-decoration:line-through}.byEditor .underline_text{text-decoration:underline}.byEditor table{width:100%;margin:1em 0}.byEditor table caption{font-weight:700;text-align:left;padding:.5em}.byEditor table thead tr:nth-child(odd){background:0 0}.byEditor table tr:nth-child(odd){background:#EEE}.byEditor table th{text-align:left;padding:.5em;vertical-align:top}.byEditor table td{padding:.5em;vertical-align:top}.byEditor .text_align_center{text-align:center}.byEditor .text_align_right{text-align:right}.download_box{padding:10px 10px 0;margin:1em 0;border:1px solid #C7C7C7}.download_box h3{margin-top:0}.gallery_box{overflow:hidden}.gallery_box h3{margin:0 0 .5em}.gallery_box p{margin-top:.5em}.gallery_box a.galImg{width:15%;display:block;float:left;text-align:center;padding:5px;margin:0 1em 1em 0}.gallery_box a.galImg img{display:block;margin:0 auto}.gallery_info,.podcast_info{clear:both;float:right;margin-top:0;width:100%}@media screen and (min-width:760px){.gallery_info,.podcast_info{width:25%;clear:none}}.gallery_info #gallery_near_items,.podcast_info #gallery_near_items{padding:0}.gallery_info #gallery_near_items li,.podcast_info #gallery_near_items li{width:50%;display:inline-block;margin-right:-4px;list-style:none;padding:5px;vertical-align:top;text-align:center;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.gallery_info #gallery_near_items li a,.podcast_info #gallery_near_items li a{display:block}.gallery_info #gallery_near_items li a img,.podcast_info #gallery_near_items li a img{display:block;margin:0 auto;border:1px solid #114A97;padding:5px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.gallery_info #gallery_near_items li a img:hover,.podcast_info #gallery_near_items li a img:hover{opacity:.6}#gallery_item,#podcast_multimedia{padding-right:20px;width:100%;float:none;margin:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media screen and (min-width:760px){#gallery_item,#podcast_multimedia{float:left;width:66.6667%;margin:1.25em 0 .75em}}#gallery_item img.img_gallery,#podcast_multimedia img.img_gallery{display:block;margin:0 auto}#gallery_item object,#podcast_multimedia object{display:block;margin:0 auto;max-width:100%}.vcard div.photo,.vcard img.photo{max-width:100%;width:100%!important;float:none;margin:0 0 1em;display:block}@media screen and (min-width:480px){.vcard div.photo,.vcard img.photo{float:right;width:auto!important;margin:0 0 1em 1em;max-width:30%}}.googleMap{width:100%!important}.googleMap img,.mapContainer img{max-width:none}td.record a{-ms-word-break:break-all;word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;hyphens:auto}@media print{*{background:transparent!important;box-shadow:none!important;color:#000!important;text-shadow:none!important;position:relative!important;overflow:hidden!important;float:none!important}body{background:#fff!important}.announcement,.site-header,footer,site-header{display:none}main a,main a:visited{text-decoration:underline}main a[href]:after{content:" (" attr(href) ")"}main abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,main .widget a[href]:after,main a[href^="javascript:"]:after,main a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}table,td,th{border-collapse:collapse;border:1px solid #000}img,tr{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}}html{font-family:Sintony,sans-serif}p{line-height:1.6}p.date{font-size:.8em}a{color:#114a97;text-decoration:none}a:active,a:focus,a:hover{text-decoration:underline}.lt-ie9 .site-header .item-list li.ie-last-child{padding-right:0}.lt-ie9 .complexViewer{width:800px!important}.lt-ie9 .complexViewer .map_content{width:58%!important}.lt-ie9 .complexViewer .content{width:40%}.lt-ie9 .site-footer .footer-copy .container .item-list__inline li.ie-last-child:before{content:'.'}.lt-ie9 .site-footer .footer-copy .container .tel span.ie-first-child{margin-right:.5em}.lt-ie9 .site-footer .footer-copy .container .tel span.ie-first-child:before{content:' – ';float:right;padding-left:.5em}.lt-ie9 .site-footer .footer-copy .container p.ie-last-child{margin-bottom:0}.lt-ie9 .site-footer .footer-copy .container p.ie-last-child span{display:inline-block;margin:0 .5em 0 0}.lt-ie9 .home .widget-row.ie-first-child{background-color:#424242;color:#fff;text-shadow:0 1px 1px rgba(0,0,0,.5)}@media screen and (min-width:760px){.lt-ie9 .home .widget-row.ie-first-child{background-image:-ms-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-moz-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-o-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-webkit-gradient(radial,center top,0,center top,477,color-stop(0,#969696),color-stop(0.4,#575757),color-stop(0.8,#424242));background-image:-webkit-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:radial-gradient(circle farthest-side at center top,#969696 0,#575757 40%,#424242 80%);background-position:center -60px;background-size:80% 150%}}.lt-ie9 .home .widget-row.ie-nth-chd-2{background-color:#008672;box-shadow:0 -2px 5px rgba(0,0,0,.1);color:#fff;text-shadow:0 1px 1px rgba(0,0,0,.5)}.lt-ie9 .home .widget-row.ie-nth-chd-3{background:#114A97}.lt-ie9 .home .widget-row.ie-last-child{background-image:-ms-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f5f5f5),color-stop(0.3,#fff),color-stop(1,#f5f5f5));background-image:-webkit-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#fff 30%,#f5f5f5 100%)}.lt-ie9 .widget__featured-services .featured-services-list li a{overflow:visible;padding-bottom:.5em}.lt-ie9 .widget__featured-services li:after,.lt-ie9 .widget__featured-services li:before{display:none!important}.lt-ie9 .widget__featured-services li.ie-last-child{margin-bottom:0}@media screen and (min-width:380px){.lt-ie9 .widget__featured-services li.ie-nth-chd-odd{clear:left;padding-right:5px}.lt-ie9 .widget__featured-services li.ie-nth-chd-even{padding-left:5px}.lt-ie9 .widget__featured-services li.ie-first-child a,.lt-ie9 .widget__featured-services li.ie-nth-chd-2 a{padding-top:0}.lt-ie9 .widget__featured-services li.ie-last-child,.lt-ie9 .widget__featured-services li.ie-nth-last-chd-2{margin-bottom:0;padding-bottom:0}}@media screen and (min-width:480px){.lt-ie9 .widget__featured-services li.ie-first-child a,.lt-ie9 .widget__featured-services li.ie-nth-chd-2 a{padding-top:.5em}}@media screen and (min-width:760px){.lt-ie9 .widget__featured-services li.ie-nth-chd-odd{clear:both}.lt-ie9 .widget__featured-services li.ie-nth-chd-even{float:right}.lt-ie9 .widget__featured-services li.ie-last-child{margin-bottom:1em}}@media screen and (min-width:760px){.lt-ie9 .widget__more-services-and-search .more-services-list .category.ie-nth-chd-3np1{clear:left}}.lt-ie9 .widget__latest-news a.ie-last-child{border-bottom:0 none}.lt-ie9 .widget__middle-adverts .advert.ie-last-child{margin-top:.5em}@media screen and (min-width:480px){.lt-ie9 .widget__middle-adverts .advert.ie-last-child{margin-top:0}}.lt-ie9 .widget-style__2.ie-last-child .widget{margin-bottom:0}@media screen and (min-width:950px){.lt-ie9 .widget-style__2.ie-nth-chd-odd a{margin-left:0;margin-right:0}.lt-ie9 .widget-style__2.ie-nth-chd-even a{margin-right:0;margin-left:0}.lt-ie9 .widget-style__2.ie-nth-last-chd-2 .widget{margin-bottom:0}}.lt-ie9 .logo{width:165px}.lt-ie9 .button,.lt-ie9 input[type=submit]{min-height:1em}.lt-ie9 .button.active,.lt-ie9 .button:active,.lt-ie9 input.active[type=submit],.lt-ie9 input[type=submit].active,.lt-ie9 input[type=submit]:active{min-height:.9em}.lt-ie9 .top-strip p{background-color:#fff}.lt-ie9 .widget-row .container{padding-left:20px;padding-right:20px}.lt-ie9 table td.record{min-width:50%}.lt-ie8 .az-list li{width:3.6%}.lt-ie8 .breadcrumb ol li{padding-right:20px!important}.lt-ie8 .widget-width{float:left!important;padding-left:0!important;padding-right:0!important}.lt-ie8 .widgetPadding{padding-left:10px;padding-right:10px}.lt-ie8 .widget__middle-adverts .advert{float:left!important;width:45%}.lt-ie8 .widget__more-services-and-search .more-services-list .category{padding-left:0;padding-right:0;width:33%}.lt-ie8 .widget__more-services-and-search .form label{position:absolute!important;left:-999999px!important;top:-999999px!important}.lt-ie8 .widget__featured-services .featured-services-list li.ie-nth-chd-even{clear:right!important}.lt-ie8 .complexViewer .map_content{width:56%!important}.lt-ie8 #content .az-list li{float:left!important;display:block!important}.lt-ie8 input.field{height:1.5em}.lt-ie8 .site-footer .footer-copy .container p.social a{width:auto;text-indent:0;font-size:1.2em!important;height:1.5em}.lt-ie8 .site-footer .footer-copy .container .item-list__inline li{display:block!important;float:left!important}.alert{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:.5em 0;position:relative;margin:1em 0;border-bottom-style:solid;border-bottom-width:4px;border-bottom-color:#008672}.alert__success{background:#c6edcc;border-color:#36b14a}.alert__success h2{color:#2a8a3a}.alert__success p{color:#1e6329}.alert__danger{background:#edc6c6;border-color:#b13636}.alert__danger h2{color:#8a2a2a}.alert__danger p{color:#631e1e}.alert__info{background:#c6d2ed;border-color:#365cb1}.alert__info h2{color:#2a488a}.alert__info p{color:#1e3363}.alert__warning{background:#d0b32c;border-color:#917d1f}.alert__warning h2,.alert__warning p{color:#7c6b1a}.quote{font-size:1em;font-weight:600;background:#00b99d;color:#424242;padding:10px;font-style:italic}.quote__pullquote,.quote__pullquote-right{width:80%;margin-left:0;display:block}.quote__pullquote-right{margin-left:auto;margin-right:0}.breadcrumb{background-color:#fff;border-bottom:1px solid #c7c7c7;color:#222;font-size:.9em;width:100%}.breadcrumb .container{margin:0 auto;padding-bottom:.75em;padding-top:1em}.breadcrumb ol{padding:0;margin:0}.breadcrumb ol li{list-style:none;display:inline}.breadcrumb ol li:first-child:before{display:none}.breadcrumb ol li:before{content:'>';padding:0 10px}.breadcrumb a{color:#114a97}.landing .breadcrumb{border-bottom:0 none}.button,input[type=submit]{-webkit-appearance:none;border:0 none;border-bottom:2px solid;border-radius:4px;color:#fff;cursor:pointer;display:block;font-family:Sintony,sans-serif;font-size:.9em;font-weight:400;min-height:2.5em;line-height:1.6;margin:.5em 0;padding:.55em 1em .45em;text-align:center;text-decoration:none;text-shadow:0 -1px 0 rgba(0,0,0,.5);text-transform:lowercase;vertical-align:top;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.button.active,.button:active,input.active[type=submit],input[type=submit]:active{border-bottom:0 none;box-shadow:inset 0 3px 5px rgba(0,0,0,.2);margin-top:.65em;min-height:2.2em}.button:active,.button:focus,.button:hover,input[type=submit]:active,input[type=submit]:focus,input[type=submit]:hover{text-decoration:none}.button,.button__primary,input[type=submit]{background:#114a97;border-bottom-color:#0c3469!important}.button:focus,.button:hover,.button__primary:focus,.button__primary:hover,input[type=submit]:focus,input[type=submit]:hover{background:#285ca1}.button__secondary{background:#424242;border-bottom-color:#292929!important}.button__secondary:focus,.button__secondary:hover{background:#545454}.button__info{background:#008672;border-bottom-color:#005347!important}.button__info:focus,.button__info:hover{background:#199280}.button__warning{background:#dec96b;border-bottom-color:#a68f23!important;color:#7c6b1a;text-shadow:0 1px 0 rgba(255,255,255,.3)}.button__warning:focus,.button__warning:hover{background:#e2d180}.button__muted{background:#b3b3b3;border-bottom-color:#666!important;color:#222;text-shadow:0 1px 0 rgba(255,255,255,.3)}.button__muted:focus,.button__muted:hover{background:#c2c2c2}.button__muted.active,.button__muted:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.3)}.calendar{width:100%;border-collapse:collapse;border-radius:4px}.calendar th{background:#008672;border:1px solid #000;margin:0;padding:4px}.calendar td{padding:4px;border:1px solid #000;margin:-4px;text-align:center}.calendar a{background:#008672;padding:0 .3em}#calendarcontainer{background:#eee;padding:10px;margin:0 -10px 2em}#calendarcontainer table{width:100%;display:table}#calendarcontainer table td,#calendarcontainer table th{text-align:center;padding:5px 0}#calendarcontainer table td.today{background:#e1e1e1}.callout{padding:.25em 1em;margin:1em 0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-radius:4px}.callout__success{background:#edf9ef}.callout__success p{color:#1e6329}.callout__success h2{color:#2a8a3a}.callout__warning{background:#fff}.callout__warning p{color:#7c6b1a}.callout__warning h2{color:#a68f23}.callout__danger{background:#f9eded}.callout__danger p{color:#631e1e}.callout__danger h2{color:#8a2a2a}.callout__info{background:#edf1f9}.callout__info p{color:#1e3363}.callout__info h2{color:#2a488a}.callout__disabled{background:#ccc;cursor:none}.callout__disabled p{color:#999}.callout__disabled h2{color:#b3b3b3}.callout__muted{background:#b3b3b3}.callout__muted p{color:gray}.callout__muted h2{color:#999}.callout__feature{background:#e6e6e6}.callout__feature p{color:#b3b3b3}::-webkit-input-placeholder{color:#999}:-moz-placeholder{color:#999}::-moz-placeholder{color:#999}:-ms-input-placeholder{color:#999}.placeholdersjs{color:#999}.form{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:1em}.form strong{margin-top:0;margin-bottom:1em;display:block}.form label{margin:.5em 0}.checkbox input,.radio input{display:inline;margin-right:.5em}input.field,input.text,input[type=search].field,textarea{-webkit-appearance:none;border:1px solid rgba(0,0,0,.35);box-shadow:inset 0 3px 5px rgba(0,0,0,.15);font-family:Sintony,sans-serif;font-size:.9em;height:2.5em;margin:0;padding:.55em .5em;vertical-align:top;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input.field:focus,input.text:focus,input[type=search].field:focus,textarea:focus{background-color:#faf7e9}.field__disabled{background-color:#ccc}textarea{resize:none}input:focus{outline:0}.form__inline label,.form__search label{display:none}.form__inline .button,.form__inline .field,.form__inline input[type=submit],.form__inline select,.form__search .button,.form__search .field,.form__search input[type=submit],.form__search select{display:inline}.form__block label{display:block;min-width:50%}.form__block .button,.form__block .field,.form__block input[type=submit],.form__block select{display:block}.form__append{margin:1em 0;overflow:auto}.form__append .field{border-radius:0;font-size:1em;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;float:left}h2.warning{color:#b13636}.basic_form p{margin:1.7em 0}.basic_form div.center{min-height:50px;display:block;overflow:hidden}.basic_form div.center input.button,.basic_form div.center input[type=submit]{float:right;margin-left:1em}.basic_form div.center input.button__muted{float:left;margin-left:0}.basic_form p.final{min-height:60px;display:block;overflow:hidden}.basic_form .label,.basic_form label{display:block;clear:both;margin:0 0 .5em}.basic_form .label strong,.basic_form label strong{color:#b13636}.basic_form input[type=password],.basic_form input[type=text],.basic_form textarea{width:24em;max-width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.basic_form input.button:active,.basic_form input[type=submit]:active{margin-top:.6em;min-height:2.8em}@media screen and (min-width:760px){.basic_form input.button:active,.basic_form input[type=submit]:active{min-height:2.8em}}.basic_form textarea{height:auto}.basic_form select{padding:.4em;height:33px;border:1px solid rgba(0,0,0,.35);-webkit-appearance:menulist-button}@media screen and (min-width:760px){.basic_form select{height:35px}}.basic_form .help{font-size:.8em;color:#999;display:block;clear:both;margin:0 0 .5em}.basic_form input.checkbox,.basic_form input.radio{margin:0 10px 0 0}.basic_form table{width:100%}.basic_form table td{padding:10px}.basic_form ol.dateOfBirth,.basic_form ul.list_check{list-style:none;padding:0}.basic_form ol.dateOfBirth li{display:inline-block;margin-right:-4px;width:33%;padding:0 20px 0 0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media screen and (min-width:760px){.basic_form ol.dateOfBirth li{width:20%}}.box_standout,.form__standout{padding:10px;background:#eee;margin:2em 0}.box_standout h3,.form__standout h3{margin:0 0 .5em}.box_standout p,.form__standout p{margin:0}.box_standout p span,.form__standout p span{padding-top:10px;display:block}.box_standout label,.form__standout label{margin:0}.box_standout #search_results ul ul,.form__standout #search_results ul ul{list-style:none;margin:2em 0}.form_select p{margin-top:0;min-height:5em}.form_select input[type=submit]{display:inline-block;margin:0}.form_select select{max-width:68%;height:33px}@media screen and (min-width:760px){.form_select select{height:40px}}.form_select input.button:active,.form_select input[type=submit]:active{margin-top:.1em;min-height:2.8em}.userTextPref{padding:0}.userTextPref label{display:block;clear:both}.userTextPref li{width:100%;display:block;margin:0 -4px 10px 0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}@media screen and (min-width:760px){.userTextPref li{width:33%;display:inline-block;margin:0 -4px 10px 0;padding:0 1em}}.userTextPref select{width:100%}.userSettings{padding:0}.userSettings label{padding:5px;display:block}.userSettings label input{margin-right:5px}.userSettings li{width:100%;display:block;margin:0 0 10px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}@media screen and (min-width:760px){.userSettings li{width:50%;display:inline-block;margin:0 -4px 10px 0;padding:0 1em}}.form_404 input.field{width:70%;display:inline}.form_404 input[type=submit]{margin:0;display:inline}p.user_final{text-align:center}p.user_final input{display:inline-block}.prefContrast label{background:#000;color:#ff0}.prefCream label{background:#FFF9D2;color:#010066}.prefBlue label{background:#9FCFFF;color:#010066}#preview_box{padding:1em;margin-top:1em}#preview_box img{float:right;margin:0 0 1em 1em}.form_user .button,.form_user input[type=submit]{margin-bottom:10px}form .list-check li{margin-bottom:0}form li.form_text label{width:80%}h1,h2,h3,h4{font-family:'PT Sans',sans-serif;font-weight:400}h1{font-size:2.25em}h2{font-size:1.45em}h3{font-size:1.4em;font-weight:700}img{max-width:100%}ul{padding-left:2em}li{padding-bottom:.5em}li:last-child{padding-bottom:0}.item-list,.widget-width .list{margin:0;padding:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.item-list li,.widget-width .list li{list-style:none;margin-bottom:.5em;padding-bottom:.5em}.item-list li:last-child,.widget-width .list li:last-child{margin-bottom:0;padding-bottom:0}.widget-width .list li{border-bottom:1px solid #C7C7C7}.widget-width .list li:last-child{border-bottom:none}.item-list__inline li{display:inline;margin-right:1.8em}.item-list__striped{padding:0}.item-list__striped li{list-style:none;padding:.3em .5em;background:#fff;border:none}.item-list__striped li:nth-child(odd){background:#e1e1e1}.az-list{overflow:auto;padding:0;text-align:center}.az-list li{float:left;margin:.35em 0;width:11.11%}@media screen and (min-width:480px){.az-list li{width:7.69%}}@media screen and (min-width:760px){.az-list li{width:3.84%}}.az-list li a{display:block;text-transform:uppercase}#content .az-list li{display:inline-block;float:none;margin:0 5px 9px 0;width:auto;padding:0}#content .az-list a,#content .az-list span{text-transform:uppercase;padding:10px 5px;width:35px;text-align:center;border-radius:4px;display:block;font-size:1.1em}#content .az-list a{background:#114A97;color:#fff}#content .az-list a:hover{background:#285CA1;text-decoration:none}#content .az-list span{background:#eee;color:#999}ul.list_contact{list-style:none;padding:0}ul.list_contact li{margin-bottom:1em;padding:10px;border:1px solid #C7C7C7}ul.list_contact li h3{margin:0 0 .2em}ul.list_contact li p{margin:0}ul.list_contact_main li{border:none;background:#eee}ul.list_article{padding:0}ul.list_article li{overflow:hidden;list-style:none}ul.list_article li h2,ul.list_article li h3{margin-bottom:.3em}ul.list_article li p{margin:.5em 0}ul.list_article li img{width:25%;float:left;margin:0 1em 1em 0}ul.list_article li a.button{display:inline-block}ul.list_gallery{list-style:none;padding:0}ul.list_gallery li{width:50%;display:inline-block;margin-right:-4px;vertical-align:top;padding:0 .5em 1em;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media screen and (min-width:480px){ul.list_gallery li{width:20%}}ul.list_gallery li a{text-align:center;display:block}ul.list_gallery li a img{display:block;margin:0 auto;padding:5px;border:1px solid #114a97;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.list_gallery li a span{position:absolute;left:-999999px;top:-99999px}ul.list_gallery li a:hover{opacity:.6}ul.list_faq{padding:0;list-style:none}ul.list_faq p.faq{font-weight:700;margin:.2em 0}ul.list_person{padding:0;list-style:none}ul.list_person li{display:inline-block;margin-right:-4px;vertical-align:top;padding-bottom:2em;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media screen and (min-width:480px){ul.list_person li{width:50%}}ul.list_person li h3{margin:0 0 .5em}ul.list_person li div{width:60%;float:right;padding-right:5%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.list_person li img{float:left;width:35%}ul.list_person li p,ul.list_polls h2{margin:0}ul.list_polls .progressbar,ul.list_polls p{margin:5px 0}ul#keyList{margin:0;padding:0}ul#keyList li{list-style:none}ul#keyList li img{max-width:5%;display:inline;vertical-align:top;margin:0 5px 5px 0}@media screen and (min-width:480px){ul#keyList li img{max-width:3%}}ul.list_long a{-ms-word-break:break-all;word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;hyphens:auto}ol.list_results{margin:0;padding:0}ol.list_results li{list-style:none}ol.list_results li .icon img{max-width:20%;float:left;margin:0 10px 5px 0}@media screen and (min-width:480px){ol.list_results li .icon img{max-width:5%}}ol.list_results li h3{margin:0 0 5px}ol.list_results li p{margin:0 0 5px;display:inline}ol.list_results li p.url{font-size:.8em;display:block;clear:both;color:#006D5C}ul.list-pages{list-style:decimal;background:#eee;padding:15px 20px}ul.list-pages li{border-bottom:0;width:100%;padding:5px 0;margin-left:2em}.sociable ul{padding:0}.sociable ul li{padding:0 10px 0 0;list-style:none;display:inline-block;margin:0 0 20px}.sociable ul li a{display:inline-block;text-indent:-20000px;width:20px}.sociable ul li.digg a{background:url(css_img/bm16pxdigg.gif) no-repeat left center}.sociable ul li.delicious a{background:url(css_img/bm16pxdelicious.gif) no-repeat left center}.sociable ul li.stumbleupon a{background:url(css_img/bm16pxstumble.gif) no-repeat left center}.sociable ul li.reddit a{background:url(css_img/bm16pxreddit.gif) no-repeat left center}.sociable ul li.facebook a{background:url(css_img/bm16pxfacebook.gif) no-repeat left center}.sociable ul li.google a{background:url(css_img/bm16pxgoogle.gif) no-repeat left center}.sociable ul li.linkedin a{background:url(css_img/bm16pxlinkedin.gif) no-repeat left center}.sociable ul li.live a{background:url(css_img/bm16pxlive.gif) no-repeat left center}.sociable ul li.newsvine a{background:url(css_img/bm16pxnewsvine.gif) no-repeat left center}.complexViewer{width:100%!important;height:100%!important;margin-bottom:1em;overflow:hidden;border:0!important}.complexViewer .content{width:100%;float:left}.complexViewer .map_content{width:100%!important;float:left;top:51px!important}#mapControlTools{border:0!important}#page-search{width:100%!important;height:100%!important}@media screen and (min-width:900px){.complexViewer .map_content{width:58%!important}.complexViewer .content{width:40%}}.pagePagination{overflow:hidden;padding:0;margin:2em 0;min-height:60px}.pagePagination li{list-style:none}#progressbar,.progressbar{margin-bottom:1em;border:1px solid #008672}.progress-bar{background:#008672;width:100%;height:20px}.progress-bar .progress-indicator{background:#b3b3b3;padding:10px 0}.progress-bar__success .progress-indicator{background:#36b14a}.progress-bar__danger .progress-indicator{background:#b13636}.progress-bar__info .progress-indicator{background:#365cb1}.sidebar__primary{clear:left;float:left;margin:1.25em 0;width:100%}@media screen and (min-width:760px){.sidebar__primary{clear:none;float:right;margin-top:0;width:25%}}.sidebar__primary aside,.sidebar__primary nav{margin-bottom:2em;*zoom:1}.sidebar__primary aside:after,.sidebar__primary aside:before,.sidebar__primary nav:after,.sidebar__primary nav:before{content:' ';display:table}.sidebar__primary aside:after,.sidebar__primary nav:after{clear:both}.sidebar__primary :last-child{margin-bottom:0}.sidebar__primary .supplement{margin:0 0 2em}.sidebar__primary .related-items h2{margin-top:0}.sidebar__primary .related-items ul{overflow:hidden}.sidebar__primary .site-navigation{background-color:#424242;margin:0 -20px 2em;padding:.5em 0 1em;overflow:hidden}.sidebar__primary .site-navigation li{margin:0 0 3px;padding:0}.sidebar__primary .site-navigation li a{border-bottom:.25em solid #353535;color:#fff;display:block;font-size:.9em;margin:0 10px;padding:.75em 10px;-webkit-transition:.15s border-color ease-in;-moz-transition:.15s border-color ease-in;transition:.15s border-color ease-in;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.sidebar__primary .site-navigation li a:active,.sidebar__primary .site-navigation li a:focus,.sidebar__primary .site-navigation li a:hover{border-color:#008672;color:#fff;text-decoration:none}@media screen and (min-width:480px){.sidebar__primary .site-navigation li{float:left;width:50%}.sidebar__primary .site-navigation li:nth-child(2n+1){clear:left}.sidebar__primary .site-navigation li:nth-child(odd) a{margin:0 5px 0 0}.sidebar__primary .site-navigation li:nth-child(even) a{margin:0 0 0 5px}}@media screen and (min-width:760px){.sidebar__primary .site-navigation li{clear:both;width:100%}.sidebar__primary .site-navigation li a{padding:.75em 10px}.sidebar__primary .site-navigation li:nth-child(even) a,.sidebar__primary .site-navigation li:nth-child(odd) a{margin:0}}@media screen and (min-width:480px){.sidebar__primary .site-navigation{padding:.5em 10px 1em}}@media screen and (min-width:760px){.sidebar__primary .site-navigation{margin:0 -10px 2em}}.sidebar__primary aside{clear:both}@media screen and (min-width:760px){.sidebar__primary aside{padding:0 10px}}.sidebar__primary aside li{padding-bottom:0}.sidebar__primary aside li a{border-bottom:1px solid #c7c7c7;display:block;font-size:.9em;margin:0 -10px .5em;padding:0 10px .5em}.sidebar__primary aside li:last-child a{border-bottom:0 none;padding-bottom:0}@media screen and (min-width:480px){.sidebar__primary aside li{float:left;width:50%}.sidebar__primary aside li:last-child a{border-bottom:1px solid #c7c7c7;padding-bottom:.5em}.sidebar__primary aside li:nth-child(2n+1){clear:left}.sidebar__primary aside li:nth-child(odd) a{margin-right:5px}.sidebar__primary aside li:nth-child(even) a{margin-left:5px}.sidebar__primary aside li:nth-last-child(-n+2){margin-bottom:0}}@media screen and (min-width:760px){.sidebar__primary aside li{width:100%}.sidebar__primary aside li:last-child a{border-bottom:0 none;padding-bottom:0}.sidebar__primary aside li:nth-child(odd) a{margin-right:-10px}.sidebar__primary aside li:nth-child(even) a{margin-left:-10px}.sidebar__primary aside li:nth-last-child(-n+2){margin-bottom:.5em}}@media screen and (min-width:760px){.landing .sidebar__primary{margin-top:-9.65em;position:relative;z-index:10}}@media screen and (min-width:760px){.landing.no-top-image .sidebar__primary{margin-top:-6em}}@media screen and (min-width:760px){.landing .sidebar__primary.no-categories{margin-top:3.5em}}.supplement{margin:2em 0;overflow:hidden;padding:10px;background:#fff;border:1px solid #A4A9B2}.supplement h3{margin-top:0}.supplement ul{list-style:none;padding:0}.supplement ul li{padding:0}.supplement ul li a{border-bottom:1px solid #C7C7C7;display:block;font-size:.9em;padding:.5em 0}.supplement ul li:last-child a{border-bottom:0}.supplement.vcard{background:#DBE3EF;padding:10px}.supplement.vcard h2,.supplement.vcard h3{margin-top:0;font-size:1.45em}.supplement a.email{-ms-word-break:break-all;word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;hyphens:auto}.sidebar__primary .supplement img{margin:0 auto 10px;display:block}#content .supplement.vcard img{width:30%;float:right;margin:0 0 10px 20px}table{display:block;overflow-x:scroll;width:100%;margin:0 0 2em}@media screen and (min-width:480px){table{overflow-x:visible;display:table}}table tr{vertical-align:top}table th{padding:.5em 1em;text-align:left;max-width:40%}table td{padding:.5em 1em}table td :first-child{margin-top:0}table td.record{min-width:60%}table td.record .googleMap{min-width:200px}table td.record img{width:100%}.data-table__compact td,.data-table__compact th{padding:.5em}.data-table__striped tr{background:#fff}.data-table__striped tr:nth-child(odd){background:#eee}.data-table__bordered{border:1px solid #000}.data-table__bordered th{border-bottom:1px solid #000}.data-table__bordered td{border:1px solid #000}.data-table__bordered td+td,.data-table__bordered th+th{border-left:1px solid #000}.data-table__horizontal th{padding-left:0}.widget-row{margin:0 -10px;*zoom:1}.widget-row:after,.widget-row:before{content:' ';display:table}.widget-row:after{clear:both}.widget-row .container{margin-bottom:0;max-width:1180px;overflow:visible}@media screen and (min-width:1200px){.widget-row .container{padding:0}}.home .widget-row:first-child{background-color:#424242;color:#fff;text-shadow:0 1px 1px rgba(0,0,0,.5)}@media screen and (min-width:760px){.home .widget-row:first-child{background-image:-ms-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-moz-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-o-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:-webkit-gradient(radial,center top,0,center top,477,color-stop(0,#969696),color-stop(0.4,#575757),color-stop(0.8,#424242));background-image:-webkit-radial-gradient(center top,circle farthest-side,#969696 0,#575757 40%,#424242 80%);background-image:radial-gradient(circle farthest-side at center top,#969696 0,#575757 40%,#424242 80%);background-position:center -60px;background-size:80% 150%}}.home .widget-row:nth-child(2){background-color:#008672;box-shadow:0 -2px 5px rgba(0,0,0,.1);color:#fff;text-shadow:0 1px 1px rgba(0,0,0,.5)}.home .widget-row:nth-child(3){background:#114A97}.home .widget-row:last-child{background-image:-ms-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f5f5f5),color-stop(0.3,#fff),color-stop(1,#f5f5f5));background-image:-webkit-linear-gradient(top,#f5f5f5 0,#fff 30%,#f5f5f5 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#fff 30%,#f5f5f5 100%)}.widget-width{float:left;padding:0 10px;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.myAreaWidget{background:#EEE;padding:20px;margin-bottom:10px}.myAreaWidget a{font-weight:400}.myAreaWidget input[type=text]{width:60%}.myAreaWidget input[type=submit]{margin:0 0 0 5px;display:inline-block}#myMap{width:80%!important;max-width:600px!important}.byEditor .snippet iframe{overflow:auto;max-width:600px}@media screen and (min-width:760px){.home .widget-width.width33{width:33.3333%}.home .widget-width.width67{width:66.6666%}}.widget__featured-services{position:relative}.widget__featured-services h2{display:none}.widget__featured-services ul{list-style:none;padding:0}.widget__featured-services ul.service-links{display:block;margin:1em -10px 0;clear:both}@media screen and (min-width:480px){.widget__featured-services ul{margin:1em -10px 0}}@media screen and (min-width:760px){.widget__featured-services ul{margin-top:0;overflow:hidden}}@media screen and (min-width:950px){.widget__featured-services ul{margin:0}}@media screen and (max-width:479px){.widget__featured-services ul#featured-services-list{margin:0}}.widget__featured-services .featured-services-list li{clear:none;display:block;float:left;font-size:1.1em;margin:0;-webkit-transition:.3s color ease-in,.3s border-color ease-in;-moz-transition:.3s color ease-in,.3s border-color ease-in;transition:.3s color ease-in,.3s border-color ease-in;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.widget__featured-services .featured-services-list li a{border-color:#424242;color:#c7c7c7;float:left;line-height:1.5;padding:.5em 10px 0 0;text-decoration:none;-webkit-transition:.3s color ease-in,.3s border-color ease-in;-moz-transition:.3s color ease-in,.3s border-color ease-in;transition:.3s color ease-in,.3s border-color ease-in;vertical-align:middle}.widget__featured-services .featured-services-list li a:focus,.widget__featured-services .featured-services-list li a:focus:before,.widget__featured-services .featured-services-list li a:hover,.widget__featured-services .featured-services-list li a:hover:before{border-color:#008672;color:#fff}.widget__featured-services .featured-services-list li:first-child a{padding-top:0}@media screen and (min-width:760px){.widget__featured-services .featured-services-list li.active a{border-color:#008672;color:#fff}}.widget__featured-services .featured-services-list li a:before{background-color:rgba(0,0,0,.1);border-radius:1em;color:#c7c7c7;display:none;height:1.75em;float:left;font-size:1.65rem;font-weight:400;line-height:1.75;margin:-.45em .5em 0 10px;padding:0;text-align:center;-webkit-transition:.3s color ease-in,.3s border-color ease-in;-moz-transition:.3s color ease-in,.3s border-color ease-in;transition:.3s color ease-in,.3s border-color ease-in;vertical-align:middle;width:1.75em}.lt-ie9 .widget__featured-services .featured-services-list li a:before{font-size:1.65em;background-color:#3B3B3B}@media screen and (min-width:950px){.widget__featured-services .featured-services-list li a:before{font-size:2rem;margin:.35em 10px 0}.lt-ie9 .widget__featured-services .featured-services-list li a:before{font-size:2em}}@media screen and (min-width:760px){.widget__featured-services .featured-services-list li.active a:before{border-color:#fff;color:#fff}}.widget__featured-services .featured-services-list li:last-child{margin-bottom:0}@media screen and (min-width:380px){.widget__featured-services .featured-services-list li{margin:0 0 .25em;width:50%}.widget__featured-services .featured-services-list li:nth-child(odd){clear:left;padding-right:5px}.widget__featured-services .featured-services-list li:nth-child(even){padding-left:5px}.widget__featured-services .featured-services-list li:first-child a,.widget__featured-services .featured-services-list li:nth-child(2) a{padding-top:0}.widget__featured-services .featured-services-list li:last-child,.widget__featured-services .featured-services-list li:nth-last-child(2){margin-bottom:0;padding-bottom:0}}@media screen and (min-width:480px){.widget__featured-services .featured-services-list li{margin:0 0 .5em}.widget__featured-services .featured-services-list li a{padding:.5em 20px .5em 0}.widget__featured-services .featured-services-list li a:before{display:inline-block}.widget__featured-services .featured-services-list li:first-child a,.widget__featured-services .featured-services-list li:nth-child(2) a{padding-top:.5em}}@media screen and (min-width:760px){.widget__featured-services .featured-services-list li{display:inline;font-size:.9em;margin-bottom:.75em;margin-top:.25em;padding:0;position:relative;width:25%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.widget__featured-services .featured-services-list li a{border-bottom:5px solid #424242;display:block;float:none;line-height:2.5;overflow:hidden;padding:.55em 10px 0 70px;text-overflow:ellipsis;white-space:nowrap;z-index:90}.widget__featured-services .featured-services-list li a:before{margin:-.3em 10px .15em -60px}.widget__featured-services .featured-services-list li:after,.widget__featured-services .featured-services-list li:before{border-style:solid;bottom:0;content:'';display:block;height:0;position:absolute;-webkit-transition:.3s border-color ease-in;-moz-transition:.3s border-color ease-in;transition:.3s border-color ease-in;width:0}.widget__featured-services .featured-services-list li:before{z-index:20}.widget__featured-services .featured-services-list li:after{width:4px;z-index:10}.widget__featured-services .featured-services-list li:nth-child(odd){clear:both}.widget__featured-services .featured-services-list li:nth-child(odd):before{border-color:transparent transparent #5e5e5e;border-width:0 0 12px 12px;right:0}.widget__featured-services .featured-services-list li:nth-child(odd):after{border-color:transparent transparent #424242;border-width:0 0 5px 5px;right:7px}.widget__featured-services .featured-services-list li.active:nth-child(odd):before{border-color:transparent transparent #3fa495}.widget__featured-services .featured-services-list li:nth-child(even){float:right;padding:0}.widget__featured-services .featured-services-list li:nth-child(even) a{padding:.55em 70px 0 10px}.widget__featured-services .featured-services-list li:nth-child(even) a:before{float:right;margin:-.3em -60px .15em 10px}.widget__featured-services .featured-services-list li:nth-child(even):before{border-color:transparent transparent transparent #5e5e5e;border-width:12px 0 0 12px;left:0}.widget__featured-services .featured-services-list li:nth-child(even):after{border-color:transparent transparent #424242;border-width:0 0 5px 5px;left:7px;-webkit-transform:rotateY(180deg);-moz-transform:rotateY(180deg);-ms-transform:rotateY(180deg);transform:rotateY(180deg)}.widget__featured-services .featured-services-list li.active:nth-child(even):before{border-color:transparent transparent transparent #3fa495}.widget__featured-services .featured-services-list li:last-child{margin-bottom:1em}}@media screen and (min-width:950px){.widget__featured-services .featured-services-list li{font-size:1.05em}}@media screen and (max-width:759px){.widget__featured-services .featured-service-preview{display:none!important}}@media screen and (min-width:760px){.widget__featured-services .featured-service-preview{display:block;left:31.25%;padding:0 10px;position:absolute;text-align:center;top:0;width:37.5%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}}@media screen and (min-width:950px){.widget__featured-services .featured-service-preview{left:33.33333%;width:33.33333%}}@media screen and (min-width:1200px){.widget__featured-services .featured-service-preview{padding:0 20px}}.widget__featured-services .featured-service-preview:before{color:#fff;display:block;float:left;font-size:6.5rem;height:1em;line-height:1;margin-bottom:.125em;text-align:center;text-shadow:0 1px 0 rgba(0,0,0,.5),0 -1px 0 rgba(255,255,255,.15);width:100%}.lt-ie9 .widget__featured-services .featured-service-preview:before{font-size:6.5em}@media screen and (min-width:950px){.widget__featured-services .featured-service-preview:before{font-size:8rem}.lt-ie9 .widget__featured-services .featured-service-preview:before{font-size:8em}}.widget__featured-services .featured-service-preview.icon-direction:before{font-size:8rem}.lt-ie9 .widget__featured-services .featured-service-preview.icon-direction:before{font-size:8em}@media screen and (min-width:950px){.widget__featured-services .featured-service-preview.icon-direction:before{font-size:9.5rem}.lt-ie9 .widget__featured-services .featured-service-preview.icon-direction:before{font-size:9.5em}}.widget__featured-services .featured-service-preview h2{background:0 0;display:block;line-height:1.25;margin:.75em 0 .5em;padding-bottom:0}@media screen and (max-width:950px){.widget__featured-services .featured-service-preview h2{font-size:1.25em}}.widget__featured-services .featured-service-preview h2 strong{clear:left;float:left;font-size:1.15em;margin-bottom:.5em;width:100%}.widget__featured-services .featured-service-preview p{color:#c7c7c7;font-size:.9em;margin-top:0}.widget__featured-services .featured-service-preview .service-links li{color:#c7c7c7;display:inline-block;font-size:.9em;line-height:1.5;margin:0 .5em 0 0;padding:0;position:relative}.widget__featured-services .featured-service-preview .service-links li a{color:#fff}.widget__featured-services .featured-service-preview .service-links li:before{bottom:0;content:', ';position:absolute;right:-.25em!important}.widget__featured-services .featured-service-preview .service-links li:last-child:before{content:'.'}@media screen and (min-width:760px){.widget__featured-services{padding:.5em 0}}.no-js .widget__featured-services .featured-services-list li a:before{display:none}@media screen and (min-width:480px){.no-js .widget__featured-services .featured-services-list li:nth-child(odd){padding-right:0}.no-js .widget__featured-services .featured-services-list li:nth-child(even),.no-js .widget__featured-services .featured-services-list li:nth-child(odd){padding-left:10px}}@media screen and (min-width:760px){.no-js .widget__featured-services .featured-services-list li a{padding-left:10px}.no-js .widget__featured-services .featured-services-list li:after,.no-js .widget__featured-services .featured-services-list li:before{display:none}.no-js .widget__featured-services .featured-services-list li:nth-child(even),.no-js .widget__featured-services .featured-services-list li:nth-child(odd){padding-left:0}}@media screen and (min-width:950px){.no-js .widget__featured-services .featured-services-list li:nth-child(odd) a{padding-left:10px}.no-js .widget__featured-services .featured-services-list li:nth-child(even) a{padding-right:10px}}.widget__more-services-and-search{padding:0 0 1em;text-align:center;*zoom:1}.widget__more-services-and-search:after,.widget__more-services-and-search:before{content:' ';display:table}.widget__more-services-and-search:after{clear:both}.widget__more-services-and-search .form,.widget__more-services-and-search h2{margin:1em 0 .25em}.widget__more-services-and-search h2{line-height:1.35;margin-bottom:.75em;width:100%}@media screen and (min-width:380px){.widget__more-services-and-search h2{float:left;margin-bottom:.15em;text-align:left;width:50%}}@media screen and (min-width:760px){.widget__more-services-and-search h2{margin-top:.75em;width:29.16667%}}@media screen and (min-width:760px) and (max-width:950px){.widget__more-services-and-search h2{font-size:1.25em}}.widget__more-services-and-search .form{display:none;float:right;padding:0;position:relative;text-align:right;width:25%}@media screen and (min-width:760px){.widget__more-services-and-search .form{display:block;margin-top:1em}}.widget__more-services-and-search .form div{clear:right;float:right;position:relative;width:100%}.widget__more-services-and-search .form div #loading{background:#fff;position:absolute;right:8px;top:11px}@media screen and (min-width:950px){.widget__more-services-and-search .form div{width:90%}}.widget__more-services-and-search .form label{color:#c7c7c7;display:block;position:absolute;overflow:hidden;right:.5em;text-indent:-20000px;text-shadow:none;top:.25em;width:1em}.widget__more-services-and-search .form label:before{float:right;text-indent:0;width:1em}.widget__more-services-and-search .form label.pulse{color:#114a97}.widget__more-services-and-search .form .field{border-color:rgba(0,0,0,.6);padding-right:2em;width:100%}.widget__more-services-and-search .form #search_results{background-color:#008672;margin:0 -10px;padding:0 10px;position:absolute;right:0;top:2.5em;z-index:100}.widget__more-services-and-search .form .item-list,.widget__more-services-and-search .form .list{padding:.5em 0;text-align:left}.widget__more-services-and-search .form .item-list li,.widget__more-services-and-search .form .list li{margin-bottom:0;border-bottom:0;padding:0}.widget__more-services-and-search .form .item-list a,.widget__more-services-and-search .form .list a{border-bottom:.25em solid rgba(66,66,66,.25);color:#fff;display:block;font-size:.9em;margin:0;padding:.75em .5em;-webkit-transition:.15s border-color ease-in;-moz-transition:.15s border-color ease-in;transition:.15s border-color ease-in;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.widget__more-services-and-search .form .item-list a:active,.widget__more-services-and-search .form .item-list a:focus,.widget__more-services-and-search .form .item-list a:hover,.widget__more-services-and-search .form .list a:active,.widget__more-services-and-search .form .list a:focus,.widget__more-services-and-search .form .list a:hover{border-color:#114a97;color:#fff;text-decoration:none}.widget__more-services-and-search .button,.widget__more-services-and-search input[type=submit]{clear:both;margin-bottom:.25em;margin-left:auto;margin-right:auto;width:66.66667%}@media screen and (min-width:380px){.widget__more-services-and-search .button,.widget__more-services-and-search input[type=submit]{clear:none;float:right;margin-top:1.6em;width:25%}.widget__more-services-and-search .button.active,.widget__more-services-and-search .button:active,.widget__more-services-and-search input.active[type=submit],.widget__more-services-and-search input[type=submit]:active{margin-top:1.7em}}@media screen and (min-width:480px){.widget__more-services-and-search .button,.widget__more-services-and-search input[type=submit]{width:33.33333%}}@media screen and (min-width:760px){.widget__more-services-and-search .button,.widget__more-services-and-search input[type=submit]{display:inline-block;float:none;margin:1.1em 0 0 -4.16667%;width:25%}.widget__more-services-and-search .button.active,.widget__more-services-and-search .button:active,.widget__more-services-and-search input.active[type=submit],.widget__more-services-and-search input[type=submit]:active{margin-top:1.2em}}.widget__more-services-and-search #more-services-list{display:none}.widget__more-services-and-search .no-js #more-services-list{display:block}.widget__more-services-and-search .more-services-list{clear:both;list-style:none;margin:1em -20px 0;overflow:hidden;padding:0}.widget__more-services-and-search .more-services-list .category{display:inline;float:left;padding:0 20px .5em;text-align:left;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media screen and (min-width:760px){.widget__more-services-and-search .more-services-list .category{text-align:center;width:33.33333%}.widget__more-services-and-search .more-services-list .category:nth-child(3n+1){clear:left}}.widget__more-services-and-search .more-services-list .category h3{margin:1em 0 .5em;padding-left:3.25rem;position:relative}@media screen and (min-width:480px){.widget__more-services-and-search .more-services-list .category h3{padding-left:3.85rem}}@media screen and (min-width:760px){.widget__more-services-and-search .more-services-list .category h3{padding-left:0;padding-top:6em}}.widget__more-services-and-search .more-services-list .category h3:before{background-color:rgba(0,0,0,.1);border-radius:1em;display:block;font-size:1.5rem;font-weight:400;height:1.75em;left:0;line-height:1.75;position:absolute;text-align:center;top:-.45em;width:1.75em}.lt-ie9 .widget__more-services-and-search .more-services-list .category h3:before{background-color:#007866;font-size:1.5em}@media screen and (min-width:480px){.widget__more-services-and-search .more-services-list .category h3:before{font-size:1.65rem;top:-.1em}.lt-ie9 .widget__more-services-and-search .more-services-list .category h3:before{font-size:1.65em}}@media screen and (min-width:760px){.widget__more-services-and-search .more-services-list .category h3:before{font-size:4.2rem;height:1.75em;left:50%;line-height:1.75;margin-left:-.875em;top:0;width:1.75em}.lt-ie9 .widget__more-services-and-search .more-services-list .category h3:before{font-size:4.2em}}.widget__more-services-and-search .more-services-list .category h3 a{color:#fff}.widget__more-services-and-search .more-services-list .category .item-list__inline{display:none;margin-left:3.85rem}@media screen and (min-width:480px){.widget__more-services-and-search .more-services-list .category .item-list__inline{display:block}}@media screen and (min-width:760px){.widget__more-services-and-search .more-services-list .category .item-list__inline{margin-left:0}}.widget__more-services-and-search .more-services-list .category .item-list__inline li{color:#c7c7c7;display:inline-block;font-size:.9em;margin:0 .5em 0 0;padding:0 0 .25em;position:relative;z-index:90}.widget__more-services-and-search .more-services-list .category .item-list__inline li:before{bottom:.25em;content:', ';position:absolute;right:-.25em}.widget__more-services-and-search .more-services-list .category .item-list__inline li.more:before{content:'.'}.widget__more-services-and-search .more-services-list .category .item-list__inline li a{color:#fff;position:relative;z-index:100}.widget__more-services-and-search .more-services-list .category .item-list__inline li a:active,.widget__more-services-and-search .more-services-list .category .item-list__inline li a:focus,.widget__more-services-and-search .more-services-list .category .item-list__inline li a:hover{text-decoration:underline}@media screen and (min-width:760px){.widget__more-services-and-search{padding-top:.5em}}.widget__latest-news h2{margin:.5em 0 .25em}@media screen and (min-width:480px){.widget__latest-news h2{margin-bottom:0}}.widget__latest-news a{border-bottom:1px solid #c7c7c7;display:block;margin:0 -9px;overflow:hidden;padding:0 11px;text-decoration:none}.widget__latest-news a h3{margin:.5em 0;-webkit-transition:.3s color ease-in;-moz-transition:.3s color ease-in;transition:.3s color ease-in}@media screen and (min-width:480px){.widget__latest-news a h3{margin:0 21px .5em 0}.widget__latest-news a h3:before{border-color:transparent transparent transparent #3465a6;border-width:8px 0 8px 10px;content:'';border-style:solid;display:block;float:right;height:0;margin:.225em -49px 0 0;-webkit-transition:.15s margin ease-in;-moz-transition:.15s margin ease-in;transition:.15s margin ease-in;opacity:0;width:0}}.widget__latest-news a p{color:#222;display:none;font-size:.9em;margin:0 0 1em}@media screen and (min-width:480px){.widget__latest-news a p{display:block}}.widget__latest-news a:active h3,.widget__latest-news a:focus h3,.widget__latest-news a:hover h3{color:#222;text-decoration:underline}.widget__latest-news a:active h3:before,.widget__latest-news a:focus h3:before,.widget__latest-news a:hover h3:before{margin-right:-29px;opacity:1}@media screen and (min-width:480px){.widget__latest-news a{padding:1em 11px 0}.widget__latest-news a:last-child{border-bottom:0 none}}@media screen and (min-width:760px){.widget__latest-news{border-right:1px solid #c7c7c7;margin-right:7.67px;padding-right:20px}}.widget__middle-adverts h2{margin:.5em 0 .25em}@media screen and (min-width:480px){.widget__middle-adverts h2{margin:.5em 11px .25em}}@media screen and (min-width:760px){.widget__middle-adverts h2{display:none}}.widget__middle-adverts .advert{border-bottom:1px solid #c7c7c7;display:block;margin:0 -9px;overflow:hidden;padding:0 11px;text-decoration:none;-webkit-transition:.15s background-color ease-in;-moz-transition:.15s background-color ease-in;transition:.15s background-color ease-in;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media screen and (min-width:480px){.widget__middle-adverts .advert{border-bottom:0 none;margin-top:0;padding:11px}}.widget__middle-adverts .advert:active h3,.widget__middle-adverts .advert:focus h3,.widget__middle-adverts .advert:hover h3{color:#222;text-decoration:underline}@media screen and (min-width:480px){.widget__middle-adverts .advert:active,.widget__middle-adverts .advert:focus,.widget__middle-adverts .advert:hover{background-color:#dbe3ef}}.widget__middle-adverts .advert h3{margin:.5em 0}@media screen and (min-width:480px){.widget__middle-adverts .advert h3{font-size:1.45em}}.widget__middle-adverts .advert p{color:#222;display:none;margin:0}@media screen and (min-width:480px){.widget__middle-adverts .advert p{display:block}}.widget__middle-adverts .advert .image{display:none;width:100%}@media screen and (min-width:480px){.widget__middle-adverts .advert .image{display:block}}@media screen and (min-width:480px){.widget__middle-adverts .advert{float:left;margin:0;width:50%}}@media screen and (min-width:480px){.widget__middle-adverts{margin:0 -9px}}@media screen and (min-width:950px){.widget__middle-adverts{margin:0 -9px 0 -12.33px}}.widget__featured-page{margin:.25em 0}.widget__featured-page a{display:block;margin:0 -10px;padding:1em 20px 1em 2.5em;position:relative;text-decoration:none;-webkit-transition:.15s background-color ease-in;-moz-transition:.15s background-color ease-in;transition:.15s background-color ease-in}.widget__featured-page a:before{color:#c7c7c7;display:block;font-size:2.15rem;font-weight:400;height:1.5em;left:10px;line-height:1.5;position:absolute;text-align:center;text-shadow:0 -1px 1px rgba(255,255,255,.5);top:0;-webkit-transition:.15s color ease-in;-moz-transition:.15s color ease-in;transition:.15s color ease-in;width:1em}.lt-ie9 .widget__featured-page a:before{font-size:2.15em}@media screen and (min-width:760px){.widget__featured-page a:before{font-size:2.85rem}.lt-ie9 .widget__featured-page a:before{font-size:2.85em}}.widget__featured-page a:active,.widget__featured-page a:focus,.widget__featured-page a:hover{background-color:#dbe3ef}.widget__featured-page a:active h2,.widget__featured-page a:focus h2,.widget__featured-page a:hover h2{color:#222;text-decoration:underline}.widget__featured-page a:active:before,.widget__featured-page a:focus:before,.widget__featured-page a:hover:before{color:#114a97}.widget__featured-page a h2{margin:0 0 .5em 24px;padding:0}.widget__featured-page a p{color:#000;margin:0 0 0 24px}@media screen and (min-width:380px){.widget__featured-page a{padding-left:3em}}.widget-style__1{margin:1.5em 0 1.25em}.widget-style__2:last-child .widget{margin-bottom:0}@media screen and (min-width:950px){.widget-style__2:nth-child(odd) a{margin-left:0;margin-right:0}.widget-style__2:nth-child(even) a{margin-right:0;margin-left:0}.widget-style__2:nth-last-child(2) .widget{margin-bottom:0}}@media screen and (min-width:950px){.stacking{margin:0 0 10px;width:100%;clear:both}.width2{width:1%;margin:0 1% 0 0}.width3{width:2%;margin:0 1% 0 0}.width4{width:3%;margin:0 1% 0 0}.width5{width:4%;margin:0 1% 0 0}.width6{width:5%;margin:0 1% 0 0}.width7{width:6%;margin:0 1% 0 0}.width8{width:7%;margin:0 1% 0 0}.width9{width:8%;margin:0 1% 0 0}.width10{width:9%;margin:0 1% 0 0}.width11{width:10%;margin:0 1% 0 0}.width12{width:11%;margin:0 1% 0 0}.width13{width:12%;margin:0 1% 0 0}.width14{width:13%;margin:0 1% 0 0}.width15{width:14%;margin:0 1% 0 0}.width16{width:15%;margin:0 1% 0 0}.width17{width:16%;margin:0 1% 0 0}.width18{width:17%;margin:0 1% 0 0}.width19{width:18%;margin:0 1% 0 0}.width20{width:19%;margin:0 1% 0 0}.width21{width:20%;margin:0 1% 0 0}.width22{width:21%;margin:0 1% 0 0}.width23{width:22%;margin:0 1% 0 0}.width24{width:23%;margin:0 1% 0 0}.width25{width:24%;margin:0 1% 0 0}.width26{width:25%;margin:0 1% 0 0}.width27{width:26%;margin:0 1% 0 0}.width28{width:27%;margin:0 1% 0 0}.width29{width:28%;margin:0 1% 0 0}.width30{width:29%;margin:0 1% 0 0}.width31{width:30%;margin:0 1% 0 0}.width32{width:31%;margin:0 1% 0 0}.width33{width:32%;margin:0 1% 0 0}.width34{width:33%;margin:0 1% 0 0}.width35{width:34%;margin:0 1% 0 0}.width36{width:35%;margin:0 1% 0 0}.width37{width:36%;margin:0 1% 0 0}.width38{width:37%;margin:0 1% 0 0}.width39{width:38%;margin:0 1% 0 0}.width40{width:39%;margin:0 1% 0 0}.width41{width:40%;margin:0 1% 0 0}.width42{width:41%;margin:0 1% 0 0}.width43{width:42%;margin:0 1% 0 0}.width44{width:43%;margin:0 1% 0 0}.width45{width:44%;margin:0 1% 0 0}.width46{width:45%;margin:0 1% 0 0}.width47{width:46%;margin:0 1% 0 0}.width48{width:47%;margin:0 1% 0 0}.width49{width:48%;margin:0 1% 0 0}.width50{width:49%;margin:0 1% 0 0}.width51{width:50%;margin:0 1% 0 0}.width52{width:51%;margin:0 1% 0 0}.width53{width:52%;margin:0 1% 0 0}.width54{width:53%;margin:0 1% 0 0}.width55{width:54%;margin:0 1% 0 0}.width56{width:55%;margin:0 1% 0 0}.width57{width:56%;margin:0 1% 0 0}.width58{width:57%;margin:0 1% 0 0}.width59{width:58%;margin:0 1% 0 0}.width60{width:59%;margin:0 1% 0 0}.width61{width:60%;margin:0 1% 0 0}.width62{width:61%;margin:0 1% 0 0}.width63{width:62%;margin:0 1% 0 0}.width64{width:63%;margin:0 1% 0 0}.width65{width:64%;margin:0 1% 0 0}.width66{width:65%;margin:0 1% 0 0}.width67{width:66%;margin:0 1% 0 0}.width68{width:67%;margin:0 1% 0 0}.width69{width:68%;margin:0 1% 0 0}.width70{width:69%;margin:0 1% 0 0}.width71{width:70%;margin:0 1% 0 0}.width72{width:71%;margin:0 1% 0 0}.width73{width:72%;margin:0 1% 0 0}.width74{width:73%;margin:0 1% 0 0}.width75{width:74%;margin:0 1% 0 0}.width76{width:75%;margin:0 1% 0 0}.width77{width:76%;margin:0 1% 0 0}.width78{width:77%;margin:0 1% 0 0}.width79{width:78%;margin:0 1% 0 0}.width80{width:79%;margin:0 1% 0 0}.width81{width:80%;margin:0 1% 0 0}.width82{width:81%;margin:0 1% 0 0}.width83{width:82%;margin:0 1% 0 0}.width84{width:83%;margin:0 1% 0 0}.width85{width:84%;margin:0 1% 0 0}.width86{width:85%;margin:0 1% 0 0}.width87{width:86%;margin:0 1% 0 0}.width88{width:87%;margin:0 1% 0 0}.width89{width:88%;margin:0 1% 0 0}.width90{width:89%;margin:0 1% 0 0}.width91{width:90%;margin:0 1% 0 0}.width92{width:91%;margin:0 1% 0 0}.width93{width:92%;margin:0 1% 0 0}.width94{width:93%;margin:0 1% 0 0}.width95{width:94%;margin:0 1% 0 0}.width96{width:95%;margin:0 1% 0 0}.width97{width:96%;margin:0 1% 0 0}.width98{width:97%;margin:0 1% 0 0}.width99{width:98%;margin:0 1% 0 0}.lastWidget2{width:2%;margin:0}.lastWidget3{width:3%;margin:0}.lastWidget4{width:4%;margin:0}.lastWidget5{width:5%;margin:0}.lastWidget6{width:6%;margin:0}.lastWidget7{width:7%;margin:0}.lastWidget8{width:8%;margin:0}.lastWidget9{width:9%;margin:0}.lastWidget10{width:10%;margin:0}.lastWidget11{width:11%;margin:0}.lastWidget12{width:12%;margin:0}.lastWidget13{width:13%;margin:0}.lastWidget14{width:14%;margin:0}.lastWidget15{width:15%;margin:0}.lastWidget16{width:16%;margin:0}.lastWidget17{width:17%;margin:0}.lastWidget18{width:18%;margin:0}.lastWidget19{width:19%;margin:0}.lastWidget20{width:20%;margin:0}.lastWidget21{width:21%;margin:0}.lastWidget22{width:22%;margin:0}.lastWidget23{width:23%;margin:0}.lastWidget24{width:24%;margin:0}.lastWidget25{width:25%;margin:0}.lastWidget26{width:26%;margin:0}.lastWidget27{width:27%;margin:0}.lastWidget28{width:28%;margin:0}.lastWidget29{width:29%;margin:0}.lastWidget30{width:30%;margin:0}.lastWidget31{width:31%;margin:0}.lastWidget32{width:32%;margin:0}.lastWidget33{width:33%;margin:0}.lastWidget34{width:34%;margin:0}.lastWidget35{width:35%;margin:0}.lastWidget36{width:36%;margin:0}.lastWidget37{width:37%;margin:0}.lastWidget38{width:38%;margin:0}.lastWidget39{width:39%;margin:0}.lastWidget40{width:40%;margin:0}.lastWidget41{width:41%;margin:0}.lastWidget42{width:42%;margin:0}.lastWidget43{width:43%;margin:0}.lastWidget44{width:44%;margin:0}.lastWidget45{width:45%;margin:0}.lastWidget46{width:46%;margin:0}.lastWidget47{width:47%;margin:0}.lastWidget48{width:48%;margin:0}.lastWidget49{width:49%;margin:0}.lastWidget50{width:50%;margin:0}.lastWidget51{width:51%;margin:0}.lastWidget52{width:52%;margin:0}.lastWidget53{width:53%;margin:0}.lastWidget54{width:54%;margin:0}.lastWidget55{width:55%;margin:0}.lastWidget56{width:56%;margin:0}.lastWidget57{width:57%;margin:0}.lastWidget58{width:58%;margin:0}.lastWidget59{width:59%;margin:0}.lastWidget60{width:60%;margin:0}.lastWidget61{width:61%;margin:0}.lastWidget62{width:62%;margin:0}.lastWidget63{width:63%;margin:0}.lastWidget64{width:64%;margin:0}.lastWidget65{width:65%;margin:0}.lastWidget66{width:66%;margin:0}.lastWidget67{width:67%;margin:0}.lastWidget68{width:68%;margin:0}.lastWidget69{width:69%;margin:0}.lastWidget70{width:70%;margin:0}.lastWidget71{width:71%;margin:0}.lastWidget72{width:72%;margin:0}.lastWidget73{width:73%;margin:0}.lastWidget74{width:74%;margin:0}.lastWidget75{width:75%;margin:0}.lastWidget76{width:76%;margin:0}.lastWidget77{width:77%;margin:0}.lastWidget78{width:78%;margin:0}.lastWidget79{width:79%;margin:0}.lastWidget80{width:80%;margin:0}.lastWidget81{width:81%;margin:0}.lastWidget82{width:82%;margin:0}.lastWidget83{width:83%;margin:0}.lastWidget84{width:84%;margin:0}.lastWidget85{width:85%;margin:0}.lastWidget86{width:86%;margin:0}.lastWidget87{width:87%;margin:0}.lastWidget88{width:88%;margin:0}.lastWidget89{width:89%;margin:0}.lastWidget90{width:90%;margin:0}.lastWidget91{width:91%;margin:0}.lastWidget92{width:92%;margin:0}.lastWidget93{width:93%;margin:0}.lastWidget94{width:94%;margin:0}.lastWidget95{width:95%;margin:0}.lastWidget96{width:96%;margin:0}.lastWidget97{width:97%;margin:0}.lastWidget98{width:98%;margin:0}.lastWidget99{width:99%;margin:0}.width100{width:100%;margin:0}}.NewOnSiteWidget,.WhatsOnWidget,.cateInfoWidget,.contentWidget,.directoryWidget,.documentListWidget,.eventCalendarWidget,.imageWidget,.latestNewsWidget,.middleAdvertWidget,.navigationWidget,.opinionPollWidget,.randomimageWidget,.rightAdvertWidget,.topFaqWidget{margin:0 0 20px}.directoryWidget,.opinionPollWidget{background:#EEE;padding:20px}.directoryWidget form,.opinionPollWidget form{margin:10px 0}.directoryWidget input[type=text],.opinionPollWidget input[type=text]{width:100%}@media screen and (min-width:480px){.directoryWidget input[type=text],.opinionPollWidget input[type=text]{width:60%}}.directoryWidget .button,.directoryWidget input[type=submit],.opinionPollWidget .button,.opinionPollWidget input[type=submit]{margin:0;display:inline-block}.middleAdvertWidget img{float:left;margin:0 0 5px}.rightAdvertWidget span{display:block}.rightAdvertWidget .adwrap{padding-bottom:20px}.randomimageWidget span{display:block}.eventCalendarWidget{padding:0 0 10px}.eventCalendarWidget table.calendar{background:0 0;border-collapse:collapse;border:none;font-size:.9em;width:100%;display:table}.eventCalendarWidget table.calendar td,.eventCalendarWidget table.calendar th{background:0 0;text-transform:uppercase;border:none;padding:4px 2px;text-align:center}.eventCalendarWidget table.calendar tr{background:0 0;text-transform:uppercase;border:none}.eventCalendarWidget table.calendar td.today{background:#eee}.eventCalendarWidget table.calendar td a:active,.eventCalendarWidget table.calendar td a:hover,.eventCalendarWidget table.calendar td a:link,.eventCalendarWidget table.calendar td a:visited{color:#fff;background:#114A97}.opinionPollWidget form label{float:none;width:auto;display:inline}
\ No newline at end of file diff --git a/web/cobrands/angus/third_party/css_img/50.png b/web/cobrands/angus/third_party/css_img/50.png Binary files differnew file mode 100644 index 000000000..2fa47b371 --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/50.png diff --git a/web/cobrands/angus/third_party/css_img/angus-logo-dark.png b/web/cobrands/angus/third_party/css_img/angus-logo-dark.png Binary files differnew file mode 100644 index 000000000..01c2bb3ec --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/angus-logo-dark.png diff --git a/web/cobrands/angus/third_party/css_img/angus-logo-grey-20.png b/web/cobrands/angus/third_party/css_img/angus-logo-grey-20.png Binary files differnew file mode 100644 index 000000000..0c3e056a8 --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/angus-logo-grey-20.png diff --git a/web/cobrands/angus/third_party/css_img/angus-logo-grey.png b/web/cobrands/angus/third_party/css_img/angus-logo-grey.png Binary files differnew file mode 100644 index 000000000..1c09f3e4f --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/angus-logo-grey.png diff --git a/web/cobrands/angus/third_party/css_img/angus-logo-header.png b/web/cobrands/angus/third_party/css_img/angus-logo-header.png Binary files differnew file mode 100644 index 000000000..57c36a48b --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/angus-logo-header.png diff --git a/web/cobrands/angus/third_party/css_img/angus-logo.png b/web/cobrands/angus/third_party/css_img/angus-logo.png Binary files differnew file mode 100644 index 000000000..71cb065dd --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/angus-logo.png diff --git a/web/cobrands/angus/third_party/css_img/blur.svg b/web/cobrands/angus/third_party/css_img/blur.svg new file mode 100644 index 000000000..631c8410e --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/blur.svg @@ -0,0 +1,5 @@ +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"> + <filter id="blur"> + <feGaussianBlur stdDeviation="3" /> + </filter> +</svg>
\ No newline at end of file diff --git a/web/cobrands/angus/third_party/css_img/bullet.gif b/web/cobrands/angus/third_party/css_img/bullet.gif Binary files differnew file mode 100644 index 000000000..d7d4800ff --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/bullet.gif diff --git a/web/cobrands/angus/third_party/css_img/grad.gif b/web/cobrands/angus/third_party/css_img/grad.gif Binary files differnew file mode 100644 index 000000000..e45deaa62 --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/grad.gif diff --git a/web/cobrands/angus/third_party/css_img/left_arrow.gif b/web/cobrands/angus/third_party/css_img/left_arrow.gif Binary files differnew file mode 100644 index 000000000..2be608089 --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/left_arrow.gif diff --git a/web/cobrands/angus/third_party/css_img/right_arrow.gif b/web/cobrands/angus/third_party/css_img/right_arrow.gif Binary files differnew file mode 100644 index 000000000..0b02babc7 --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/right_arrow.gif diff --git a/web/cobrands/angus/third_party/css_img/xml.gif b/web/cobrands/angus/third_party/css_img/xml.gif Binary files differnew file mode 100644 index 000000000..f72adeb3e --- /dev/null +++ b/web/cobrands/angus/third_party/css_img/xml.gif diff --git a/web/cobrands/angus/third_party/fonts/angusgov.eot b/web/cobrands/angus/third_party/fonts/angusgov.eot Binary files differnew file mode 100755 index 000000000..ebe5ab2f5 --- /dev/null +++ b/web/cobrands/angus/third_party/fonts/angusgov.eot diff --git a/web/cobrands/angus/third_party/fonts/angusgov.svg b/web/cobrands/angus/third_party/fonts/angusgov.svg new file mode 100755 index 000000000..d1101f735 --- /dev/null +++ b/web/cobrands/angus/third_party/fonts/angusgov.svg @@ -0,0 +1,842 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata>Generated by IcoMoon</metadata> +<defs> +<font id="angusgov" horiz-adv-x="512"> +<font-face units-per-em="512" ascent="480" descent="-32" /> +<missing-glyph horiz-adv-x="512" /> +<glyph unicode=" " d="" horiz-adv-x="256" /> +<glyph unicode="" d="M248 432c-119.296 0-216-96.704-216-216s96.704-216 216-216 216 96.704 216 216-96.704 216-216 216zM248 48c-92.784 0-168 75.216-168 168s75.216 168 168 168 168-75.216 168-168-75.216-168-168-168zM248 320c-13.248 0-24-10.736-24-24v-80.992c0-13.248 10.752-24 24-24s24 10.752 24 24v80.992c0 13.264-10.752 24-24 24zM248 160c-13.248 0-24-10.752-24-24s10.752-24 24-24 24 10.752 24 24-10.752 24-24 24z" /> +<glyph unicode="" d="M448 16h-384c-17.664 0-32 14.336-32 32v144h64v-48h64v48h192v-48h64v48h64v-144c0-17.664-14.336-32-32-32zM368 160v64h32v-64h-32zM112 160v64h32v-64h-32zM416 240h-64v-32h-192v32h-64v-32h-64v112c0 17.664 14.336 32 32 32h384c17.664 0 32-14.336 32-32v-112h-64v32zM304 400.336h-96v-32.336h-32v15.664h16v48.336h128.336v-48h15.664v-16h-32v32.336z" /> +<glyph unicode="" d="M448 191.504h-16v-112c0-26.496-21.504-48-48-48h-64v-63.008h-176v63.008h-64c-26.512 0-48 21.504-48 48v272c0 26.512 21.488 48 48 48h64v64h176v-64h64c26.496 0 48-21.488 48-48v-112h16c8.832 0 16-7.168 16-16v-16c0-8.832-7.168-16-16-16zM400 335.504c0 17.68-14.336 32-32 32h-272c-17.664 0-32-14.336-32-32v-240c0-17.664 14.336-32 32-32h272c17.664 0 32 14.336 32 32v240zM336 207.504h-32v48h16v-32h16v32h16v-80h-16v32zM256 175.504h-16v80h48v-80h-32zM272 239.504h-16v-48h16v48zM208 207.504h16v-16h-16v16zM208 239.504h16v-16h-16v16zM160 175.504v16h16v16h-16v16h16v16h-16v16h32v-80h-32zM112 175.504v48h16v16h-16v16h32v-48h-16v-16h16v-16h-32z" /> +<glyph unicode="" d="M288 128c-17.664 0-32 14.336-32 32v32c0 17.68 14.336 32 32 32h192v-96h-192zM312 198.672c-13.248 0-24-10.752-24-24 0-13.264 10.752-24 24-24 13.264 0 24 10.736 24 24 0 13.248-10.736 24-24 24zM240 192v-32c0-26.496 21.504-48 48-48h160v-64c0-26.496-21.488-48-48-48h-336c-26.496 0-48 21.504-48 48v304c0 26.512 21.504 48 48 48h154.112l-37.584-15.664h-124.512c-13.248 0-24-10.752-24-24 0-13.264 10.752-24 24-24h391.984v-96.336h-160c-26.496 0-48-21.488-48-48zM80.016 304h-32v-32h16v16h16v16zM80.016 256h-32v-32h16.656l-0.656 16 16-0.336v16.336zM80.016 208h-32v-32h16.336l-0.336 16h16v16zM80.016 160h-32v-32h16.336l-0.336 16 16-0.336v16.336zM80.016 112h-32v-32h16v16h16v16zM80.016 64h-32v-32h16.336l-0.336 15.664h16v16.336zM144.016 352.992l188 79.008 36-79.008h-224zM362.336 400h37.664c14.016 0 26.496-6.096 35.28-15.664h-65.296l-7.648 15.664z" /> +<glyph unicode="" d="M264 88.848v15.936c53.632-1.584 95.888-18.784 95.888-39.792 0-22.064-46.496-40.96-103.872-40.96-57.376 0-103.872 18.896-103.872 40.96 0 21.008 42.256 38.224 95.872 39.792v-15.936c-44.784-1.104-79.888-11.36-79.888-23.856 0-13.232 39.344-25.968 87.888-25.968 48.528 0 87.872 12.736 87.872 25.968-0.016 12.496-35.104 22.736-79.888 23.856zM168.256 336.080c0 48.528 40.336 87.888 88.896 87.888 48.544 0 87.888-39.36 87.888-87.888 0-41.712-29.088-76.576-68.096-85.568l-20.944-211.504-21.008 212.096c-37.792 9.84-66.736 44.096-66.736 84.976zM256 359.616c0 13.248-10.736 23.968-23.968 23.968-13.248 0-23.984-10.72-23.984-23.968 0-13.232 10.736-23.968 23.984-23.968 13.248 0 23.968 10.72 23.968 23.968z" /> +<glyph unicode="" d="M448 16v16h-16v16h-16v208h16v16h16v16h16v-272h-16zM432 272h-16v-16h-320v16h-16v16h-16v16h384v-16h-16v-16zM80 272v-16h16v-208h-16v-16h-16v-16h-16v272h16v-16h16zM80 32h16v16h320v-16h16v-16h16v-16h-384v16h16v16zM205.696 112.288l36.576 59.152 36.576-36.864 50.288 75.696 52.576-130.272h-233.152l29.712 59.44 27.424-27.152zM183.856 175.856c-13.264 0-24 10.752-24 24s10.736 24 24 24c13.248 0 24-10.752 24-24s-10.752-24-24-24zM400 304l-117.152 87.2c-5.504-4.432-12.4-7.2-20-7.2-10.576 0-19.904 5.2-25.712 13.136l-125.136-93.136h-16l135.888 104.288c-0.608 2.48-1.024 5.040-1.024 7.712 0 17.664 14.32 32 31.984 32 17.68 0 32-14.336 32-32 0-5.744-1.648-11.072-4.304-15.744l125.456-96.256h-16z" /> +<glyph unicode="" d="M287.792 432h-80v-48h80v48zM287.792 240v32h-80v-32h80zM207.792 0h80v128h-80v-128zM399.792 288l-34.992 40 34.992 40h-256l-41.6-40 41.6-40h256zM367.792 224h-256l35.008-40-35.008-40h256l42 40-42 40z" /> +<glyph unicode="" d="M128 64c0-26.496 21.488-48 48-48h160c26.496 0 48 21.504 48 48l32 256h-320l32-256zM304 272h32v-208h-32v208zM240 272h32v-208h-32v208zM176 272h32v-208h-32v208zM408 384h-104c0 0-7.168 32-16 32h-64c-8.848 0-16-32-16-32h-104c-13.264 0-24-10.736-24-24s0-24 0-24h352c0 0 0 10.736 0 24s-10.752 24-24 24z" /> +<glyph unicode="" d="M522.224 199.024c0 0-73.472 74.912-174.72 74.912-98.928 0-196.72-74.912-196.72-74.912l-54.928 22.928v-67.264c8.656-2.944 14.992-10.912 14.992-20.56 0-9.744-6.464-17.728-15.248-20.608l16.24-45.296h-47.936l16.384 45.68c-7.872 3.344-13.376 11.12-13.376 20.224 0 8.912 5.344 16.496 12.976 19.952v74.544l-79.888 33.312 351.504 157.776 322.496-159.76-151.776-60.928zM343.504 235.984c101.856 0 151.776-53.92 151.776-53.92v-111.84c0 0-51.92-41.936-159.76-41.936s-143.792 41.936-143.792 41.936v111.84c0 0 49.92 53.92 151.776 53.92zM341.504 52.256c70.592 0 127.824 14.32 127.824 31.952s-57.232 31.952-127.824 31.952-127.808-14.32-127.808-31.952 57.216-31.952 127.808-31.952z" horiz-adv-x="674" /> +<glyph unicode="" d="M319.216 224c0 103.152 53.312 161.104 53.312 161.104s-47.056 38.176-117.328 38.176c-70.272 0-117.344-38.208-117.344-38.208s54.272-44.080 54.272-161.072c0-112.896-54.624-160.832-54.624-160.832s56.784-38.448 117.696-38.448c62.352 0 117.376 38.24 117.376 38.24s-53.36 50-53.36 161.040zM124.464 374.528c0 0-66.288-40.4-66.288-151.2 0-110.784 67.024-147.040 67.024-147.040s48.848 36.272 48.848 147.040c0 110.8-49.584 151.2-49.584 151.2zM385.936 371.536c0 0-49.568-37.408-49.568-148.208 0-110.784 48.816-147.040 48.816-147.040s68.624 36.272 68.624 147.040c0 110.8-67.872 148.208-67.872 148.208z" /> +<glyph unicode="" d="M460.624 317.552c-0.096 0.24-0.224 0.48-0.336 0.736l0.464-0.080-0.128-0.656zM404 124.528l-74.688-3.104-39.008 68.56 40.368 72.896 78.192-2.592 33.376-68.144-38.24-67.616zM203.328 190.96l-39.184 70.896 40.96 68.336 83.536 1.28 41.024-68.048-40.32-72.752-86.016 0.288zM205.056 331.36l-30.88 53.168 41.024 50.048 71.6 2.288 38.16-47.264-36.528-56.96-83.376-1.28zM165.984 124.016l-66.16 6.464-31.872 63.728 27.808 64.608 67.28 2.576 39.2-70.928-36.256-66.448zM396.976 381.456l6.336 12.592c24-20.816 43.472-46.592 56.976-75.76l-23.712 3.776-39.6 59.392zM326.16 390l-38.224 47.312c0.944 1.152 6.032 7.344 6.128 7.44-34.256 5.728-65.504 2.8-86.096-2.032 0.144-0.096 5.104-6.368 6.128-7.664l-41.040-50.048-61.2-10.304-5.456 16.688-0.944-0.288c39.904 35.968 92.576 58.064 150.544 58.064 55.968 0 107.024-20.528 146.4-54.32l-6.464-12.864-69.776 8.016zM74.224 316.448l-25.728-6.064 0.288-1.12 25.28 5.952 20.8-55.552-27.904-64.848c-3.776 0.368-32.976 3.168-32.976 1.392 5.12-42.96 21.424-80.336 49.504-115.296l16.48 48.368 66.048-6.448 41.712-63.296-28.8-46.896c-86.32 31.536-148.096 114.128-148.096 211.36 0 66.336 28.848 125.76 74.48 166.976l5.536-16.992-36.624-57.536zM285.744 57.040l34.336-48.080 0.976 0.688-34.128 47.728 42.4 62.88 74.624 3.088c1.504-3.376 20.624-46.368 20.496-46.368 31.472 36.848 47.28 73.776 52.992 115.872-0.064 0-30.624-0.128-34.224-0.16l-33.408 68.288 26.944 59.856 23.776-3.792 0.064 0.496c13.056-28.512 20.528-60.128 20.528-93.552 0-124.352-100.816-225.168-225.152-225.168-26.704 0-52.192 4.896-75.952 13.424l28.752 46.8 76.976-2zM179.744 11.728l-0.992 0.608 0.192 0.32c0.368-0.144 0.752-0.272 1.12-0.4l-0.32-0.528zM105.296 391.040l0.176 0.064c-0.064-0.048-0.112-0.096-0.144-0.128l-0.032 0.064zM402.624 395.28l1.024-0.512-0.336-0.72c-0.32 0.272-0.592 0.544-0.912 0.816l0.224 0.416z" /> +<glyph unicode="" d="M336.496 160.304v64l47.008 47.008h-47.008v64.992l47.008 47.008h-47.008v26.992c0 0-53.072 22.4-89.616 22.4-35.456 0-86.384-22.4-86.384-22.4v-27.008h-48l48-48v-64.992l-48 0.992 48-48v-64h-48.992l48.992-48.992v-79.008h63.008l0.992-32 48 0.992v31.008h64v80.992l48 48h-48zM249.152 63.648c-26.496 0-48 21.488-48 48 0 26.496 21.504 47.984 48 47.984 26.512 0 48-21.488 48-47.984 0-26.528-21.488-48-48-48zM249.152 174.64c-26.496 0-48 21.488-48 48 0 26.496 21.504 48 48 48 26.512 0 48-21.504 48-48 0-26.512-21.488-48-48-48zM249.152 287.632c-26.496 0-48 21.504-48 48.016 0 26.496 21.504 48 48 48 26.512 0 48-21.504 48-48 0-26.528-21.488-48.016-48-48.016z" /> +<glyph unicode="" d="M438.288 437.376l-58.336-35.488-0.416-32.080-128.768-128.448-17.648 17.648c-6.256 6.256-16.384 6.256-22.64 0-6.24-6.24-12.016-10.592-12.016-10.592l6.56-6.56c-0.064 0.064-0.144 0.128-0.208 0.192-31.808-31.792-52.32-40.992-52.32-40.992l-99.808-101.136c-6.256-6.272-6.256-16.352 0-22.624l56.576-56.576c6.24-6.256 16.368-6.256 22.624 0l99.792 101.136c0 0 9.184 20.48 41.024 52.336l5.664-5.664c0 0 5.040 5.056 11.312 11.312 6.256 6.256 6.256 16.368 0 22.624l-17.152 17.152 128.288 128.912 32.752 0.016 35.248 58.304-30.528 30.528zM63.664 89.568l101.568 101.568 11.312-11.296-101.568-101.584-11.312 11.312zM86.288 66.224l101.568 101.6 11.312-11.344-101.568-101.568-11.312 11.312zM120.224 32.288l-11.312 11.312 101.568 101.584 11.328-11.312-101.584-101.584z" /> +<glyph unicode="" d="M448 336h-31.328v47.008l-64.672 0.992 0.336-48h-194.336l1.328 48-63.328-0.992v-48l-32 0.992c-17.664 0-32-14.336-32-32v-224c0-17.664 14.336-32 32-32h384c17.664 0 32 14.336 32 32v224c0 17.664-14.336 32-32 32zM368 368h32v-64h-32v64zM160 259.008c19.328 0 35.008-20.592 35.008-46s-15.68-46-35.008-46-35.008 20.592-35.008 46 15.68 46 35.008 46zM112 368h32v-64h-32v64zM90.672 112.832c0 0 3.792 30.432 12.416 36.176 8.608 5.744 33.44 9.568 33.44 9.568s16.096-17.2 22.944-17.2c6.832 0 22.928 17.2 22.928 17.2s24.832-3.808 33.456-9.568c10.128-6.752 12.656-36.176 12.656-36.176h-137.84zM416 128h-144v16h144v-16zM416 160h-144v16h144v-16zM416 192h-144v16h144v-16zM416 224h-144v16h144v-16z" /> +<glyph unicode="" d="M416.544 211.728l-65.44 65.44h38.336c-0.352 0.96-0.72 1.904-1.088 2.848-22.736 57.632-78.928 98.4-144.64 98.4-85.84 0-155.44-69.6-155.44-155.44 0-85.856 69.6-155.456 155.44-155.456 63.152 0 117.504 37.664 141.824 91.728 0.24 0.496 0.384 1.056 0.608 1.584l41.68-41.424c-0.272-0.48-0.464-1.024-0.752-1.536-0.064-0.112-0.128-0.224-0.192-0.32-36.784-63.552-105.504-106.288-184.208-106.288-117.44 0.032-212.672 95.264-212.672 212.736s95.232 212.704 212.704 212.704c98.208 0 180.848-66.528 205.328-156.992 0.24-0.832 0.304-1.712 0.512-2.544h33.456l-65.456-65.44z" /> +<glyph unicode="" d="M352 15.808c0-8.848 7.152-16 16-16h16c8.832 0 16 7.152 16 16v32.992h-48v-32.992zM128 15.808c0-8.848 7.152-16 16-16h16c8.848 0 16 7.152 16 16v32.992h-48v-32.992zM79.76 68.336c0-10.72 8.704-19.44 19.44-19.44h329.536c10.736 0 19.44 8.72 19.44 19.44 0 10.752 0 11.44 0 11.44h-368.416c0 0 0-0.688 0-11.44zM512 319.808v32h-63.84l0.016 17.408c0 38.896-39.824 78.992-191.584 78.992-133.408 0-176.832-40.096-176.832-78.992v-17.408h-63.76v-32h-16v-64h16v-32h63.76v-127.584h368l0.352 239.584h47.888v-16h-16v-64h16v-16h-48v-16h64v32h16v64h-16zM79.76 239.808h-47.76v16h16v64h-16v16h47.76v-96zM200 400.8h128c4.416 0 8-3.584 8-8s-3.584-8-8-8h-128c-4.416 0-8 3.584-8 8s3.584 8 8 8zM112.656 332.336c0 10.736 8.704 19.44 19.44 19.44h104.224c10.736 0 19.44-8.704 19.44-19.44v-57.328c0-10.752-8.704-19.456-19.44-19.456h-104.224c-10.736 0-19.44 8.704-19.44 19.456v57.328zM143.808 132.192c-16.112 0-29.152 13.056-29.152 29.152 0 16.128 13.040 29.152 29.152 29.152s29.168-13.024 29.168-29.152c0.016-16.096-13.056-29.152-29.168-29.152zM192 207.808h144v-16h-144v16zM336.512 128.912h-144.096v15.44h144.096v-15.44zM336.512 160.784h-144.096v15.44h144.096v-15.44zM384.128 131.184c-16.112 0-29.152 13.056-29.152 29.152s13.040 29.152 29.152 29.152 29.168-13.056 29.168-29.152-13.056-29.152-29.168-29.152zM416.080 275.008c0-10.752-8.704-19.456-19.456-19.456h-104.992c-10.752 0-19.456 8.704-19.456 19.456v57.328c0 10.736 8.704 19.44 19.456 19.44h104.992c10.752 0 19.456-8.704 19.456-19.44v-57.328z" horiz-adv-x="528" /> +<glyph unicode="" d="M432.368 16.16h-352.752l0.24 30.32 40.96 35.312c0 0 73.744-24.32 135.008-24.32 60.368 0 136.368 24.32 136.368 24.32l40.192-34.88v-30.752zM130.928 94.096l25.6 81.216h198.608l25.6-81.216c0 0-77.344-23.056-124.32-23.056-45.84-0.016-125.488 23.056-125.488 23.056zM171.68 223.408l25.584 81.2h117.152l25.568-81.2h-168.304zM237.344 431.856h36.96l24.944-79.12h-86.832l24.928 79.12z" /> +<glyph unicode="" d="M384 272.368c-61.856 0-112-50.528-112-112.88 0-35.52 16.32-67.152 41.744-87.856-32.896-24.4-57.744-39.808-57.744-39.808s-224 138.432-224 249.952c0 67.2 41.328 134.384 120 134.384 72 0 104-68.736 104-68.736s28 68.736 104 68.736 118.656-65.84 118.656-134.384c0-15.328-4.352-31.088-11.456-46.912-20.496 22.976-50.144 37.504-83.2 37.504zM384 256.256c53.008 0 96-43.312 96-96.752s-42.992-96.768-96-96.768c-53.024 0-96 43.328-96 96.768s42.976 96.752 96 96.752zM336 143.376h32v-32.256h32v32.256h32v32.256h-32v32.256h-32v-32.256h-32v-32.256z" /> +<glyph unicode="" d="M126.448 367.632c0-8.8 0-31.888 0-31.888h224.224c0 0 0 23.088 0 31.888 0 8.816-7.12 15.952-15.936 15.952h-47.84c0 0 0.544 18.208 0.544 46.112 0 25.904-22.464 49.568-49.376 49.568s-47.648-22.496-47.648-49.424c0-25.904-0.192-46.256-0.192-46.256h-47.824c-8.816 0-15.952-7.136-15.952-15.952zM238.064 431.408c8.8 0 15.952-7.136 15.952-15.936 0-8.816-7.152-15.952-15.952-15.952s-15.952 7.136-15.952 15.952c0 8.8 7.152 15.936 15.952 15.936zM382.576 383.584v-158.416c0 0 13.76 15.184 31.872 22.464v151.888c0 17.616-15.28 31.888-32.88 31.888h-78.736v-31.888h63.776c8.816 0 15.968-7.136 15.968-15.936zM205.168-0.096h-94.672c-8.8 0-15.936 7.12-15.936 15.936v367.744c0 8.8 7.136 15.936 15.936 15.936h64.784v31.888h-80.72c-17.616 0-31.888-14.288-31.888-31.888v-399.616c0-17.616 14.272-31.904 31.888-31.904h145.296c-6.24 10.528-17.392 22.688-34.688 31.904zM382.576 15.84c0-8.816-7.152-15.936-15.952-15.936h-43.664c-8.032-10.752-15.6-21.44-22.56-31.904h81.184c17.6 0 32.88 14.288 32.88 31.904v98.064c-10.56-8.688-21.248-18.496-31.872-29.28v-52.848zM449.328 145.184c-17.968 39.936-7.68 72.368-5.12 109.808-105.264-52.4-172.016-209.648-172.016-209.648l-41.072 77.376-84.72-49.904c35.952-12.464 87.296-52.4 130.944-104.816 30.784 54.912 125.776 167.184 171.984 177.184z" /> +<glyph unicode="" d="M512 184.778l-256 198.713-256-198.714v81.019l256 198.713 256-198.714zM448 192v-192h-128v128h-128v-128h-128v192l192 144z" /> +<glyph unicode="" d="M0-32h256v512h-256v-512zM160 416h64v-64h-64v64zM160 288h64v-64h-64v64zM160 160h64v-64h-64v64zM32 416h64v-64h-64v64zM32 288h64v-64h-64v64zM32 160h64v-64h-64v64zM288 320h224v-32h-224zM288-32h64v128h96v-128h64v288h-224z" /> +<glyph unicode="" d="M288.117 335.365l121.356 40.716 101.792-303.392-121.356-40.716zM0 32h128v352h-128v-352zM32 320h64v-32h-64v32zM160 32h128v352h-128v-352zM192 320h64v-32h-64v32z" /> +<glyph unicode="" d="M256 480l-256-160h512l-256 160zM400 288l16-32v-192h64v192l16 32h-96zM272 288l16-32v-192h64v192l16 32h-96zM144 288l16-32v-192h64v192l16 32h-96zM16 288l16-32v-192h64v192l16 32h-96zM16 32l-16-64h512l-16 64h-480zM288 384c0-17.673-14.327-32-32-32s-32 14.327-32 32 14.327 32 32 32c17.673 0 32-14.327 32-32z" /> +<glyph unicode="" d="M0 384l160 64v-384l-160-64zM352 384v-384l-160 53.333v384zM512 448v-384l-128-51.2v384z" /> +<glyph unicode="" d="M367.497 77.313c-9.476 1.494-9.692 27.327-9.692 27.327s27.844 27.328 33.912 64.076c16.326 0 26.407 39.069 10.082 52.814 0.681 14.47 20.984 113.588-81.799 113.588-102.782 0-82.479-99.118-81.799-113.588-16.327-13.745-6.244-52.814 10.081-52.814 6.067-36.748 33.913-64.076 33.913-64.076s-0.216-25.833-9.692-27.327c-30.524-4.816-144.503-54.658-144.503-109.313h384c0 54.655-113.979 104.497-144.503 109.313zM172.027 68.595c22.047 13.575 48.813 26.154 70.769 33.712-7.876 11.216-16.647 26.468-22.165 44.531-7.703 6.283-13.972 15.266-17.999 26.301-4.033 11.052-5.561 23.426-4.304 34.842 0.902 8.196 3.239 15.833 6.825 22.544-2.175 23.293-3.707 69.017 26.224 102.366 11.607 12.933 26.278 22.23 43.85 27.843-3.137 32.38-19.58 70.385-83.227 70.385-102.782 0-82.479-99.118-81.799-113.588-16.327-13.745-6.244-52.814 10.081-52.814 6.067-36.748 33.913-64.076 33.913-64.076s-0.216-25.833-9.692-27.327c-30.524-4.817-144.503-54.659-144.503-109.314h164.798c2.355 1.537 4.753 3.070 7.229 4.595z" /> +<glyph unicode="" d="M358.774 480c-84.382-139.493-151.15-70.891-248.795-171.215-86.168-88.533-56.291-195.153 16.262-231.872 71.615 36.594 144.884 118.411 199.225 236.862 0 0 48.833-149.572-100.745-293.687 72.634-85.074 195.914-25.886 230.363 109.459 37.449 147.137-60.194 296.948-96.31 350.453zM48.506-3.121c0.058-1.453 1.711-28.879 37.683-28.879 26.172 0 158.916 72.339 227.133 260.102-103.219-182.607-253.060-227.919-264.816-231.223z" /> +<glyph unicode="" d="M192 480l-192-256h192l-128-256 448 320h-256l192 192z" /> +<glyph unicode="" d="M256 384c-111.659 0-208.441-65.021-256-160 47.559-94.979 144.341-160 256-160 111.657 0 208.439 65.021 256 160-47.558 94.979-144.343 160-256 160zM382.225 299.148c30.081-19.187 55.571-44.887 74.717-75.148-19.146-30.261-44.637-55.961-74.718-75.149-37.797-24.108-81.445-36.851-126.224-36.851-44.78 0-88.428 12.743-126.225 36.852-30.080 19.186-55.57 44.886-74.717 75.148 19.146 30.262 44.637 55.962 74.717 75.148 1.959 1.25 3.938 2.461 5.929 3.65-4.979-13.664-7.704-28.411-7.704-43.798 0-70.692 57.308-128 128-128s128 57.308 128 128c0 15.387-2.725 30.134-7.704 43.799 1.99-1.189 3.969-2.401 5.929-3.651zM256 275c0-26.51-21.49-48-48-48s-48 21.49-48 48 21.49 48 48 48 48-21.49 48-48z" /> +<glyph unicode="" d="M287.935-32h-95.935v256h-64v88.225l64 0.029-0.104 51.976c0 71.976 19.517 115.77 104.299 115.77h70.588v-88.242h-44.115c-33.016 0-34.603-12.328-34.603-35.342l-0.131-44.162h79.345l-9.352-88.225-69.927-0.029-0.065-256z" /> +<glyph unicode="" d="M512 382.791c-18.838-8.354-39.082-14.001-60.33-16.54 21.686 13 38.343 33.585 46.186 58.115-20.298-12.039-42.778-20.78-66.705-25.49-19.16 20.415-46.461 33.17-76.673 33.17-58.011 0-105.044-47.029-105.044-105.039 0-8.233 0.929-16.25 2.72-23.939-87.3 4.382-164.701 46.2-216.509 109.753-9.042-15.514-14.223-33.558-14.223-52.809 0-36.444 18.544-68.596 46.73-87.433-17.219 0.546-33.416 5.271-47.577 13.139-0.010-0.438-0.010-0.878-0.010-1.321 0-50.894 36.209-93.348 84.261-103-8.813-2.4-18.094-3.686-27.674-3.686-6.769 0-13.349 0.66-19.764 1.886 13.368-41.73 52.16-72.103 98.126-72.948-35.95-28.175-81.243-44.967-130.458-44.967-8.479 0-16.84 0.497-25.058 1.47 46.486-29.805 101.701-47.197 161.021-47.197 193.211 0 298.868 160.062 298.868 298.872 0 4.554-0.103 9.084-0.305 13.59 20.528 14.81 38.336 33.31 52.418 54.374z" /> +<glyph unicode="" d="M416 416h-320c-52.8 0-96-43.2-96-96v-192c0-52.8 43.2-96 96-96h320c52.8 0 96 43.2 96 96v192c0 52.8-43.2 96-96 96zM192 96v256l160-128-160-128z" /> +<glyph unicode="" d="M248 432c-119.296 0-216-96.704-216-216s96.704-216 216-216 216 96.704 216 216-96.704 216-216 216zM248 48c-92.784 0-168 75.216-168 168s75.216 168 168 168 168-75.216 168-168-75.216-168-168-168zM248 320c-13.248 0-24-10.736-24-24v-80.992c0-13.248 10.752-24 24-24s24 10.752 24 24v80.992c0 13.264-10.752 24-24 24zM248 160c-13.248 0-24-10.752-24-24s10.752-24 24-24 24 10.752 24 24-10.752 24-24 24z" /> +<glyph unicode="" d="M448 16h-384c-17.664 0-32 14.336-32 32v144h64v-48h64v48h192v-48h64v48h64v-144c0-17.664-14.336-32-32-32zM368 160v64h32v-64h-32zM112 160v64h32v-64h-32zM416 240h-64v-32h-192v32h-64v-32h-64v112c0 17.664 14.336 32 32 32h384c17.664 0 32-14.336 32-32v-112h-64v32zM304 400.336h-96v-32.336h-32v15.664h16v48.336h128.336v-48h15.664v-16h-32v32.336z" /> +<glyph unicode="" d="M448 191.504h-16v-112c0-26.496-21.504-48-48-48h-64v-63.008h-176v63.008h-64c-26.512 0-48 21.504-48 48v272c0 26.512 21.488 48 48 48h64v64h176v-64h64c26.496 0 48-21.488 48-48v-112h16c8.832 0 16-7.168 16-16v-16c0-8.832-7.168-16-16-16zM400 335.504c0 17.68-14.336 32-32 32h-272c-17.664 0-32-14.336-32-32v-240c0-17.664 14.336-32 32-32h272c17.664 0 32 14.336 32 32v240zM336 207.504h-32v48h16v-32h16v32h16v-80h-16v32zM256 175.504h-16v80h48v-80h-32zM272 239.504h-16v-48h16v48zM208 207.504h16v-16h-16v16zM208 239.504h16v-16h-16v16zM160 175.504v16h16v16h-16v16h16v16h-16v16h32v-80h-32zM112 175.504v48h16v16h-16v16h32v-48h-16v-16h16v-16h-32z" /> +<glyph unicode="" d="M288 128c-17.664 0-32 14.336-32 32v32c0 17.68 14.336 32 32 32h192v-96h-192zM312 198.672c-13.248 0-24-10.752-24-24 0-13.264 10.752-24 24-24 13.264 0 24 10.736 24 24 0 13.248-10.736 24-24 24zM240 192v-32c0-26.496 21.504-48 48-48h160v-64c0-26.496-21.488-48-48-48h-336c-26.496 0-48 21.504-48 48v304c0 26.512 21.504 48 48 48h154.112l-37.584-15.664h-124.512c-13.248 0-24-10.752-24-24 0-13.264 10.752-24 24-24h391.984v-96.336h-160c-26.496 0-48-21.488-48-48zM80.016 304h-32v-32h16v16h16v16zM80.016 256h-32v-32h16.656l-0.656 16 16-0.336v16.336zM80.016 208h-32v-32h16.336l-0.336 16h16v16zM80.016 160h-32v-32h16.336l-0.336 16 16-0.336v16.336zM80.016 112h-32v-32h16v16h16v16zM80.016 64h-32v-32h16.336l-0.336 15.664h16v16.336zM144.016 352.992l188 79.008 36-79.008h-224zM362.336 400h37.664c14.016 0 26.496-6.096 35.28-15.664h-65.296l-7.648 15.664z" /> +<glyph unicode="" d="M264 88.848v15.936c53.632-1.584 95.888-18.784 95.888-39.792 0-22.064-46.496-40.96-103.872-40.96-57.376 0-103.872 18.896-103.872 40.96 0 21.008 42.256 38.224 95.872 39.792v-15.936c-44.784-1.104-79.888-11.36-79.888-23.856 0-13.232 39.344-25.968 87.888-25.968 48.528 0 87.872 12.736 87.872 25.968-0.016 12.496-35.104 22.736-79.888 23.856zM168.256 336.080c0 48.528 40.336 87.888 88.896 87.888 48.544 0 87.888-39.36 87.888-87.888 0-41.712-29.088-76.576-68.096-85.568l-20.944-211.504-21.008 212.096c-37.792 9.84-66.736 44.096-66.736 84.976zM256 359.616c0 13.248-10.736 23.968-23.968 23.968-13.248 0-23.984-10.72-23.984-23.968 0-13.232 10.736-23.968 23.984-23.968 13.248 0 23.968 10.72 23.968 23.968z" /> +<glyph unicode="" d="M448 16v16h-16v16h-16v208h16v16h16v16h16v-272h-16zM432 272h-16v-16h-320v16h-16v16h-16v16h384v-16h-16v-16zM80 272v-16h16v-208h-16v-16h-16v-16h-16v272h16v-16h16zM80 32h16v16h320v-16h16v-16h16v-16h-384v16h16v16zM205.696 112.288l36.576 59.152 36.576-36.864 50.288 75.696 52.576-130.272h-233.152l29.712 59.44 27.424-27.152zM183.856 175.856c-13.264 0-24 10.752-24 24s10.736 24 24 24c13.248 0 24-10.752 24-24s-10.752-24-24-24zM400 304l-117.152 87.2c-5.504-4.432-12.4-7.2-20-7.2-10.576 0-19.904 5.2-25.712 13.136l-125.136-93.136h-16l135.888 104.288c-0.608 2.48-1.024 5.040-1.024 7.712 0 17.664 14.32 32 31.984 32 17.68 0 32-14.336 32-32 0-5.744-1.648-11.072-4.304-15.744l125.456-96.256h-16z" /> +<glyph unicode="" d="M287.792 432h-80v-48h80v48zM287.792 240v32h-80v-32h80zM207.792 0h80v128h-80v-128zM399.792 288l-34.992 40 34.992 40h-256l-41.6-40 41.6-40h256zM367.792 224h-256l35.008-40-35.008-40h256l42 40-42 40z" /> +<glyph unicode="" d="M128 64c0-26.496 21.488-48 48-48h160c26.496 0 48 21.504 48 48l32 256h-320l32-256zM304 272h32v-208h-32v208zM240 272h32v-208h-32v208zM176 272h32v-208h-32v208zM408 384h-104c0 0-7.168 32-16 32h-64c-8.848 0-16-32-16-32h-104c-13.264 0-24-10.736-24-24s0-24 0-24h352c0 0 0 10.736 0 24s-10.752 24-24 24z" /> +<glyph unicode="" d="M522.224 199.024c0 0-73.472 74.912-174.72 74.912-98.928 0-196.72-74.912-196.72-74.912l-54.928 22.928v-67.264c8.656-2.944 14.992-10.912 14.992-20.56 0-9.744-6.464-17.728-15.248-20.608l16.24-45.296h-47.936l16.384 45.68c-7.872 3.344-13.376 11.12-13.376 20.224 0 8.912 5.344 16.496 12.976 19.952v74.544l-79.888 33.312 351.504 157.776 322.496-159.76-151.776-60.928zM343.504 235.984c101.856 0 151.776-53.92 151.776-53.92v-111.84c0 0-51.92-41.936-159.76-41.936s-143.792 41.936-143.792 41.936v111.84c0 0 49.92 53.92 151.776 53.92zM341.504 52.256c70.592 0 127.824 14.32 127.824 31.952s-57.232 31.952-127.824 31.952-127.808-14.32-127.808-31.952 57.216-31.952 127.808-31.952z" horiz-adv-x="674" /> +<glyph unicode="" d="M319.216 224c0 103.152 53.312 161.104 53.312 161.104s-47.056 38.176-117.328 38.176c-70.272 0-117.344-38.208-117.344-38.208s54.272-44.080 54.272-161.072c0-112.896-54.624-160.832-54.624-160.832s56.784-38.448 117.696-38.448c62.352 0 117.376 38.24 117.376 38.24s-53.36 50-53.36 161.040zM124.464 374.528c0 0-66.288-40.4-66.288-151.2 0-110.784 67.024-147.040 67.024-147.040s48.848 36.272 48.848 147.040c0 110.8-49.584 151.2-49.584 151.2zM385.936 371.536c0 0-49.568-37.408-49.568-148.208 0-110.784 48.816-147.040 48.816-147.040s68.624 36.272 68.624 147.040c0 110.8-67.872 148.208-67.872 148.208z" /> +<glyph unicode="" d="M460.624 317.552c-0.096 0.24-0.224 0.48-0.336 0.736l0.464-0.080-0.128-0.656zM404 124.528l-74.688-3.104-39.008 68.56 40.368 72.896 78.192-2.592 33.376-68.144-38.24-67.616zM203.328 190.96l-39.184 70.896 40.96 68.336 83.536 1.28 41.024-68.048-40.32-72.752-86.016 0.288zM205.056 331.36l-30.88 53.168 41.024 50.048 71.6 2.288 38.16-47.264-36.528-56.96-83.376-1.28zM165.984 124.016l-66.16 6.464-31.872 63.728 27.808 64.608 67.28 2.576 39.2-70.928-36.256-66.448zM396.976 381.456l6.336 12.592c24-20.816 43.472-46.592 56.976-75.76l-23.712 3.776-39.6 59.392zM326.16 390l-38.224 47.312c0.944 1.152 6.032 7.344 6.128 7.44-34.256 5.728-65.504 2.8-86.096-2.032 0.144-0.096 5.104-6.368 6.128-7.664l-41.040-50.048-61.2-10.304-5.456 16.688-0.944-0.288c39.904 35.968 92.576 58.064 150.544 58.064 55.968 0 107.024-20.528 146.4-54.32l-6.464-12.864-69.776 8.016zM74.224 316.448l-25.728-6.064 0.288-1.12 25.28 5.952 20.8-55.552-27.904-64.848c-3.776 0.368-32.976 3.168-32.976 1.392 5.12-42.96 21.424-80.336 49.504-115.296l16.48 48.368 66.048-6.448 41.712-63.296-28.8-46.896c-86.32 31.536-148.096 114.128-148.096 211.36 0 66.336 28.848 125.76 74.48 166.976l5.536-16.992-36.624-57.536zM285.744 57.040l34.336-48.080 0.976 0.688-34.128 47.728 42.4 62.88 74.624 3.088c1.504-3.376 20.624-46.368 20.496-46.368 31.472 36.848 47.28 73.776 52.992 115.872-0.064 0-30.624-0.128-34.224-0.16l-33.408 68.288 26.944 59.856 23.776-3.792 0.064 0.496c13.056-28.512 20.528-60.128 20.528-93.552 0-124.352-100.816-225.168-225.152-225.168-26.704 0-52.192 4.896-75.952 13.424l28.752 46.8 76.976-2zM179.744 11.728l-0.992 0.608 0.192 0.32c0.368-0.144 0.752-0.272 1.12-0.4l-0.32-0.528zM105.296 391.040l0.176 0.064c-0.064-0.048-0.112-0.096-0.144-0.128l-0.032 0.064zM402.624 395.28l1.024-0.512-0.336-0.72c-0.32 0.272-0.592 0.544-0.912 0.816l0.224 0.416z" /> +<glyph unicode="" d="M336.496 160.304v64l47.008 47.008h-47.008v64.992l47.008 47.008h-47.008v26.992c0 0-53.072 22.4-89.616 22.4-35.456 0-86.384-22.4-86.384-22.4v-27.008h-48l48-48v-64.992l-48 0.992 48-48v-64h-48.992l48.992-48.992v-79.008h63.008l0.992-32 48 0.992v31.008h64v80.992l48 48h-48zM249.152 63.648c-26.496 0-48 21.488-48 48 0 26.496 21.504 47.984 48 47.984 26.512 0 48-21.488 48-47.984 0-26.528-21.488-48-48-48zM249.152 174.64c-26.496 0-48 21.488-48 48 0 26.496 21.504 48 48 48 26.512 0 48-21.504 48-48 0-26.512-21.488-48-48-48zM249.152 287.632c-26.496 0-48 21.504-48 48.016 0 26.496 21.504 48 48 48 26.512 0 48-21.504 48-48 0-26.528-21.488-48.016-48-48.016z" /> +<glyph unicode="" d="M438.288 437.376l-58.336-35.488-0.416-32.080-128.768-128.448-17.648 17.648c-6.256 6.256-16.384 6.256-22.64 0-6.24-6.24-12.016-10.592-12.016-10.592l6.56-6.56c-0.064 0.064-0.144 0.128-0.208 0.192-31.808-31.792-52.32-40.992-52.32-40.992l-99.808-101.136c-6.256-6.272-6.256-16.352 0-22.624l56.576-56.576c6.24-6.256 16.368-6.256 22.624 0l99.792 101.136c0 0 9.184 20.48 41.024 52.336l5.664-5.664c0 0 5.040 5.056 11.312 11.312 6.256 6.256 6.256 16.368 0 22.624l-17.152 17.152 128.288 128.912 32.752 0.016 35.248 58.304-30.528 30.528zM63.664 89.568l101.568 101.568 11.312-11.296-101.568-101.584-11.312 11.312zM86.288 66.224l101.568 101.6 11.312-11.344-101.568-101.568-11.312 11.312zM120.224 32.288l-11.312 11.312 101.568 101.584 11.328-11.312-101.584-101.584z" /> +<glyph unicode="" d="M448 336h-31.328v47.008l-64.672 0.992 0.336-48h-194.336l1.328 48-63.328-0.992v-48l-32 0.992c-17.664 0-32-14.336-32-32v-224c0-17.664 14.336-32 32-32h384c17.664 0 32 14.336 32 32v224c0 17.664-14.336 32-32 32zM368 368h32v-64h-32v64zM160 259.008c19.328 0 35.008-20.592 35.008-46s-15.68-46-35.008-46-35.008 20.592-35.008 46 15.68 46 35.008 46zM112 368h32v-64h-32v64zM90.672 112.832c0 0 3.792 30.432 12.416 36.176 8.608 5.744 33.44 9.568 33.44 9.568s16.096-17.2 22.944-17.2c6.832 0 22.928 17.2 22.928 17.2s24.832-3.808 33.456-9.568c10.128-6.752 12.656-36.176 12.656-36.176h-137.84zM416 128h-144v16h144v-16zM416 160h-144v16h144v-16zM416 192h-144v16h144v-16zM416 224h-144v16h144v-16z" /> +<glyph unicode="" d="M416.544 211.728l-65.44 65.44h38.336c-0.352 0.96-0.72 1.904-1.088 2.848-22.736 57.632-78.928 98.4-144.64 98.4-85.84 0-155.44-69.6-155.44-155.44 0-85.856 69.6-155.456 155.44-155.456 63.152 0 117.504 37.664 141.824 91.728 0.24 0.496 0.384 1.056 0.608 1.584l41.68-41.424c-0.272-0.48-0.464-1.024-0.752-1.536-0.064-0.112-0.128-0.224-0.192-0.32-36.784-63.552-105.504-106.288-184.208-106.288-117.44 0.032-212.672 95.264-212.672 212.736s95.232 212.704 212.704 212.704c98.208 0 180.848-66.528 205.328-156.992 0.24-0.832 0.304-1.712 0.512-2.544h33.456l-65.456-65.44z" /> +<glyph unicode="" d="M352 15.808c0-8.848 7.152-16 16-16h16c8.832 0 16 7.152 16 16v32.992h-48v-32.992zM128 15.808c0-8.848 7.152-16 16-16h16c8.848 0 16 7.152 16 16v32.992h-48v-32.992zM79.76 68.336c0-10.72 8.704-19.44 19.44-19.44h329.536c10.736 0 19.44 8.72 19.44 19.44 0 10.752 0 11.44 0 11.44h-368.416c0 0 0-0.688 0-11.44zM512 319.808v32h-63.84l0.016 17.408c0 38.896-39.824 78.992-191.584 78.992-133.408 0-176.832-40.096-176.832-78.992v-17.408h-63.76v-32h-16v-64h16v-32h63.76v-127.584h368l0.352 239.584h47.888v-16h-16v-64h16v-16h-48v-16h64v32h16v64h-16zM79.76 239.808h-47.76v16h16v64h-16v16h47.76v-96zM200 400.8h128c4.416 0 8-3.584 8-8s-3.584-8-8-8h-128c-4.416 0-8 3.584-8 8s3.584 8 8 8zM112.656 332.336c0 10.736 8.704 19.44 19.44 19.44h104.224c10.736 0 19.44-8.704 19.44-19.44v-57.328c0-10.752-8.704-19.456-19.44-19.456h-104.224c-10.736 0-19.44 8.704-19.44 19.456v57.328zM143.808 132.192c-16.112 0-29.152 13.056-29.152 29.152 0 16.128 13.040 29.152 29.152 29.152s29.168-13.024 29.168-29.152c0.016-16.096-13.056-29.152-29.168-29.152zM192 207.808h144v-16h-144v16zM336.512 128.912h-144.096v15.44h144.096v-15.44zM336.512 160.784h-144.096v15.44h144.096v-15.44zM384.128 131.184c-16.112 0-29.152 13.056-29.152 29.152s13.040 29.152 29.152 29.152 29.168-13.056 29.168-29.152-13.056-29.152-29.168-29.152zM416.080 275.008c0-10.752-8.704-19.456-19.456-19.456h-104.992c-10.752 0-19.456 8.704-19.456 19.456v57.328c0 10.736 8.704 19.44 19.456 19.44h104.992c10.752 0 19.456-8.704 19.456-19.44v-57.328z" horiz-adv-x="528" /> +<glyph unicode="" d="M432.368 16.16h-352.752l0.24 30.32 40.96 35.312c0 0 73.744-24.32 135.008-24.32 60.368 0 136.368 24.32 136.368 24.32l40.192-34.88v-30.752zM130.928 94.096l25.6 81.216h198.608l25.6-81.216c0 0-77.344-23.056-124.32-23.056-45.84-0.016-125.488 23.056-125.488 23.056zM171.68 223.408l25.584 81.2h117.152l25.568-81.2h-168.304zM237.344 431.856h36.96l24.944-79.12h-86.832l24.928 79.12z" /> +<glyph unicode="" d="M384 272.368c-61.856 0-112-50.528-112-112.88 0-35.52 16.32-67.152 41.744-87.856-32.896-24.4-57.744-39.808-57.744-39.808s-224 138.432-224 249.952c0 67.2 41.328 134.384 120 134.384 72 0 104-68.736 104-68.736s28 68.736 104 68.736 118.656-65.84 118.656-134.384c0-15.328-4.352-31.088-11.456-46.912-20.496 22.976-50.144 37.504-83.2 37.504zM384 256.256c53.008 0 96-43.312 96-96.752s-42.992-96.768-96-96.768c-53.024 0-96 43.328-96 96.768s42.976 96.752 96 96.752zM336 143.376h32v-32.256h32v32.256h32v32.256h-32v32.256h-32v-32.256h-32v-32.256z" /> +<glyph unicode="" d="M126.448 367.632c0-8.8 0-31.888 0-31.888h224.224c0 0 0 23.088 0 31.888 0 8.816-7.12 15.952-15.936 15.952h-47.84c0 0 0.544 18.208 0.544 46.112 0 25.904-22.464 49.568-49.376 49.568s-47.648-22.496-47.648-49.424c0-25.904-0.192-46.256-0.192-46.256h-47.824c-8.816 0-15.952-7.136-15.952-15.952zM238.064 431.408c8.8 0 15.952-7.136 15.952-15.936 0-8.816-7.152-15.952-15.952-15.952s-15.952 7.136-15.952 15.952c0 8.8 7.152 15.936 15.952 15.936zM382.576 383.584v-158.416c0 0 13.76 15.184 31.872 22.464v151.888c0 17.616-15.28 31.888-32.88 31.888h-78.736v-31.888h63.776c8.816 0 15.968-7.136 15.968-15.936zM205.168-0.096h-94.672c-8.8 0-15.936 7.12-15.936 15.936v367.744c0 8.8 7.136 15.936 15.936 15.936h64.784v31.888h-80.72c-17.616 0-31.888-14.288-31.888-31.888v-399.616c0-17.616 14.272-31.904 31.888-31.904h145.296c-6.24 10.528-17.392 22.688-34.688 31.904zM382.576 15.84c0-8.816-7.152-15.936-15.952-15.936h-43.664c-8.032-10.752-15.6-21.44-22.56-31.904h81.184c17.6 0 32.88 14.288 32.88 31.904v98.064c-10.56-8.688-21.248-18.496-31.872-29.28v-52.848zM449.328 145.184c-17.968 39.936-7.68 72.368-5.12 109.808-105.264-52.4-172.016-209.648-172.016-209.648l-41.072 77.376-84.72-49.904c35.952-12.464 87.296-52.4 130.944-104.816 30.784 54.912 125.776 167.184 171.984 177.184z" /> +<glyph unicode="" d="M512 184.778l-256 198.713-256-198.714v81.019l256 198.713 256-198.714zM448 192v-192h-128v128h-128v-128h-128v192l192 144z" /> +<glyph unicode="" d="M0-32h256v512h-256v-512zM160 416h64v-64h-64v64zM160 288h64v-64h-64v64zM160 160h64v-64h-64v64zM32 416h64v-64h-64v64zM32 288h64v-64h-64v64zM32 160h64v-64h-64v64zM288 320h224v-32h-224zM288-32h64v128h96v-128h64v288h-224z" /> +<glyph unicode="" d="M288.117 335.365l121.356 40.716 101.792-303.392-121.356-40.716zM0 32h128v352h-128v-352zM32 320h64v-32h-64v32zM160 32h128v352h-128v-352zM192 320h64v-32h-64v32z" /> +<glyph unicode="" d="M256 480l-256-160h512l-256 160zM400 288l16-32v-192h64v192l16 32h-96zM272 288l16-32v-192h64v192l16 32h-96zM144 288l16-32v-192h64v192l16 32h-96zM16 288l16-32v-192h64v192l16 32h-96zM16 32l-16-64h512l-16 64h-480zM288 384c0-17.673-14.327-32-32-32s-32 14.327-32 32 14.327 32 32 32c17.673 0 32-14.327 32-32z" /> +<glyph unicode="" d="M0 384l160 64v-384l-160-64zM352 384v-384l-160 53.333v384zM512 448v-384l-128-51.2v384z" /> +<glyph unicode="" d="M367.497 77.313c-9.476 1.494-9.692 27.327-9.692 27.327s27.844 27.328 33.912 64.076c16.326 0 26.407 39.069 10.082 52.814 0.681 14.47 20.984 113.588-81.799 113.588-102.782 0-82.479-99.118-81.799-113.588-16.327-13.745-6.244-52.814 10.081-52.814 6.067-36.748 33.913-64.076 33.913-64.076s-0.216-25.833-9.692-27.327c-30.524-4.816-144.503-54.658-144.503-109.313h384c0 54.655-113.979 104.497-144.503 109.313zM172.027 68.595c22.047 13.575 48.813 26.154 70.769 33.712-7.876 11.216-16.647 26.468-22.165 44.531-7.703 6.283-13.972 15.266-17.999 26.301-4.033 11.052-5.561 23.426-4.304 34.842 0.902 8.196 3.239 15.833 6.825 22.544-2.175 23.293-3.707 69.017 26.224 102.366 11.607 12.933 26.278 22.23 43.85 27.843-3.137 32.38-19.58 70.385-83.227 70.385-102.782 0-82.479-99.118-81.799-113.588-16.327-13.745-6.244-52.814 10.081-52.814 6.067-36.748 33.913-64.076 33.913-64.076s-0.216-25.833-9.692-27.327c-30.524-4.817-144.503-54.659-144.503-109.314h164.798c2.355 1.537 4.753 3.070 7.229 4.595z" /> +<glyph unicode="" d="M358.774 480c-84.382-139.493-151.15-70.891-248.795-171.215-86.168-88.533-56.291-195.153 16.262-231.872 71.615 36.594 144.884 118.411 199.225 236.862 0 0 48.833-149.572-100.745-293.687 72.634-85.074 195.914-25.886 230.363 109.459 37.449 147.137-60.194 296.948-96.31 350.453zM48.506-3.121c0.058-1.453 1.711-28.879 37.683-28.879 26.172 0 158.916 72.339 227.133 260.102-103.219-182.607-253.060-227.919-264.816-231.223z" /> +<glyph unicode="" d="M192 480l-192-256h192l-128-256 448 320h-256l192 192z" /> +<glyph unicode="" d="M256 384c-111.659 0-208.441-65.021-256-160 47.559-94.979 144.341-160 256-160 111.657 0 208.439 65.021 256 160-47.558 94.979-144.343 160-256 160zM382.225 299.148c30.081-19.187 55.571-44.887 74.717-75.148-19.146-30.261-44.637-55.961-74.718-75.149-37.797-24.108-81.445-36.851-126.224-36.851-44.78 0-88.428 12.743-126.225 36.852-30.080 19.186-55.57 44.886-74.717 75.148 19.146 30.262 44.637 55.962 74.717 75.148 1.959 1.25 3.938 2.461 5.929 3.65-4.979-13.664-7.704-28.411-7.704-43.798 0-70.692 57.308-128 128-128s128 57.308 128 128c0 15.387-2.725 30.134-7.704 43.799 1.99-1.189 3.969-2.401 5.929-3.651zM256 275c0-26.51-21.49-48-48-48s-48 21.49-48 48 21.49 48 48 48 48-21.49 48-48z" /> +<glyph unicode="" d="M287.935-32h-95.935v256h-64v88.225l64 0.029-0.104 51.976c0 71.976 19.517 115.77 104.299 115.77h70.588v-88.242h-44.115c-33.016 0-34.603-12.328-34.603-35.342l-0.131-44.162h79.345l-9.352-88.225-69.927-0.029-0.065-256z" /> +<glyph unicode="" d="M512 382.791c-18.838-8.354-39.082-14.001-60.33-16.54 21.686 13 38.343 33.585 46.186 58.115-20.298-12.039-42.778-20.78-66.705-25.49-19.16 20.415-46.461 33.17-76.673 33.17-58.011 0-105.044-47.029-105.044-105.039 0-8.233 0.929-16.25 2.72-23.939-87.3 4.382-164.701 46.2-216.509 109.753-9.042-15.514-14.223-33.558-14.223-52.809 0-36.444 18.544-68.596 46.73-87.433-17.219 0.546-33.416 5.271-47.577 13.139-0.010-0.438-0.010-0.878-0.010-1.321 0-50.894 36.209-93.348 84.261-103-8.813-2.4-18.094-3.686-27.674-3.686-6.769 0-13.349 0.66-19.764 1.886 13.368-41.73 52.16-72.103 98.126-72.948-35.95-28.175-81.243-44.967-130.458-44.967-8.479 0-16.84 0.497-25.058 1.47 46.486-29.805 101.701-47.197 161.021-47.197 193.211 0 298.868 160.062 298.868 298.872 0 4.554-0.103 9.084-0.305 13.59 20.528 14.81 38.336 33.31 52.418 54.374z" /> +<glyph unicode="" d="M416 416h-320c-52.8 0-96-43.2-96-96v-192c0-52.8 43.2-96 96-96h320c52.8 0 96 43.2 96 96v192c0 52.8-43.2 96-96 96zM192 96v256l160-128-160-128z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM237.248 276.656c-9.424-7.328-18.144-12.32-26.16-14.944v-27.872c15.248 5.024 28.496 12.784 39.744 23.28v-113.776h32.752v160h-26.976c-3.488-9.792-9.952-19.344-19.36-26.688z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM281.024 195.568c9.712 8.896 16.432 15.712 20.16 20.448 5.616 7.152 9.712 14 12.32 20.512 2.576 6.528 3.872 13.408 3.872 20.624 0 12.688-4.528 23.312-13.568 31.84-9.040 8.528-21.472 12.8-37.296 12.8-14.432 0-26.464-3.68-36.096-11.040s-15.36-19.488-17.168-36.4l30.624-3.056c0.576 8.96 2.768 15.36 6.56 19.216 3.776 3.856 8.88 5.776 15.296 5.776 6.48 0 11.568-1.84 15.232-5.52 3.68-3.68 5.536-8.96 5.536-15.808 0-6.192-2.128-12.464-6.336-18.816-3.12-4.592-11.632-13.344-25.472-26.24-17.216-15.968-28.736-28.784-34.56-38.448-5.84-9.664-9.344-19.872-10.496-30.672h107.744v28.496h-61.104c1.616 2.768 3.696 5.616 6.304 8.544 2.56 2.928 8.72 8.832 18.448 17.744z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM275.968 236.496c15.408 8.4 23.088 19.648 23.088 33.728 0 9.936-3.744 18.832-11.28 26.72-9.136 9.632-21.28 14.448-36.4 14.448-8.848 0-16.832-1.664-23.952-4.976s-12.672-7.888-16.672-13.68c-3.968-5.792-6.96-13.552-8.944-23.264l28.368-4.832c0.816 7.024 3.088 12.352 6.816 16.016 3.744 3.664 8.256 5.488 13.52 5.488 5.344 0 9.648-1.616 12.864-4.816 3.216-3.216 4.832-7.536 4.832-12.944 0-6.368-2.208-11.456-6.608-15.312-4.368-3.84-10.768-5.648-19.12-5.424l-3.408-25.040c5.504 1.536 10.208 2.304 14.16 2.304 5.984 0 11.056-2.256 15.232-6.768 4.176-4.512 6.256-10.64 6.256-18.352 0-8.144-2.176-14.624-6.512-19.424-4.352-4.8-9.712-7.2-16.064-7.2-5.92 0-10.976 2-15.12 6-4.176 4-6.72 9.792-7.664 17.376l-29.744-3.616c1.536-13.488 7.072-24.4 16.64-32.752 9.568-8.352 21.6-12.512 36.128-12.512 15.312 0 28.128 4.944 38.416 14.864 10.304 9.904 15.44 21.888 15.44 35.952 0 9.68-2.752 17.952-8.24 24.8-5.536 6.832-12.864 11.248-22.032 13.216z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM290.816 298.608h-25.808l-69.664-101.984v-26.784h65.744v-32.24h29.728v32.256h19.888v26.88h-19.888v101.872zM261.072 196.72h-36.944l36.944 54.944v-54.944z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM260.144 257.776c-7.152 0-14.176-1.712-21.008-5.136l4.88 27.264h57.952v28.752h-81.248l-15.76-83.504 24.912-3.632c7.008 7.84 14.912 11.744 23.744 11.744 7.072 0 12.816-2.464 17.232-7.392s6.624-12.32 6.624-22.176c0-10.512-2.24-18.368-6.672-23.6-4.448-5.232-9.888-7.824-16.32-7.824-5.616 0-10.576 2.016-14.88 6.064-4.32 4.032-6.896 9.52-7.776 16.432l-30.608-3.168c1.824-13.424 7.392-24.096 16.736-32.048 9.344-7.936 21.408-11.904 36.224-11.904 18.528 0 32.992 7.056 43.44 21.232 7.664 10.352 11.472 22.144 11.472 35.36 0 15.824-4.736 28.704-14.224 38.64-9.52 9.936-21.088 14.896-34.72 14.896z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM264.32 245.040c-11.376 0-20.88-4.512-28.544-13.568 1.168 18.416 3.984 30.528 8.464 36.336s9.952 8.72 16.448 8.72c4.88 0 8.848-1.456 11.904-4.368s4.96-7.408 5.68-13.52l29.744 3.28c-2.192 12.96-7.28 22.832-15.264 29.648-7.984 6.8-18.064 10.208-30.24 10.208-17.36 0-31.472-6.48-42.336-19.472-10.864-12.976-16.288-34.16-16.288-63.552 0-28.656 5.2-49.28 15.648-61.856 10.416-12.576 23.728-18.88 39.936-18.88 15.104 0 27.472 4.976 37.088 14.896 9.648 9.936 14.448 23.12 14.448 39.552 0 15.488-4.592 28.112-13.728 37.888-9.136 9.808-20.128 14.688-32.96 14.688zM275.216 170.24c-3.776-4.448-8.528-6.672-14.208-6.672-5.888 0-11.136 2.72-15.728 8.16s-6.88 13.168-6.88 23.184c0 9.056 2.032 15.92 6.112 20.56s9.072 6.976 14.976 6.976c6.112 0 11.216-2.432 15.296-7.296s6.128-12.512 6.128-22.976c0-10.176-1.904-17.488-5.696-21.936z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM203.904 267.344h69.936c-14.432-18.176-25.968-38.8-34.592-61.872-8.64-23.056-13.216-45.696-13.712-67.888h29.632c-0.080 14.16 2.24 30.224 6.944 48.192 4.688 17.984 11.536 34.96 20.48 50.944 8.96 15.968 17.76 28.224 26.448 36.752v22.368h-105.12v-28.496z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM275.296 233.712c6.992 3.056 12.416 7.488 16.288 13.296s5.792 12.416 5.792 19.856c0 11.968-4.224 21.84-12.624 29.648-8.432 7.792-20.272 11.696-35.504 11.696-15.392 0-27.248-3.904-35.6-11.696-8.352-7.808-12.528-17.68-12.528-29.648 0-7.008 1.808-13.44 5.408-19.312 3.632-5.872 9.392-10.48 17.344-13.84-9.248-3.952-16.016-9.552-20.32-16.816-4.288-7.264-6.432-15.248-6.432-23.936 0-15.776 5.712-28.208 17.152-37.248 9.68-7.664 21.824-11.504 36.4-11.504 15.664 0 28.224 4.64 37.664 13.92 9.44 9.264 14.16 21.312 14.16 36.144 0 8.992-2.32 16.912-6.944 23.776s-11.36 12.080-20.256 15.664zM235.504 278.576c3.504 3.504 8.192 5.248 14.096 5.248 5.68 0 10.256-1.728 13.712-5.2 3.456-3.456 5.184-8.080 5.184-13.84 0-6.128-1.744-10.928-5.248-14.384-3.504-3.472-8.16-5.2-13.984-5.2-5.76 0-10.352 1.712-13.824 5.136-3.456 3.424-5.184 8.208-5.184 14.336 0 5.76 1.744 10.4 5.248 13.904zM265.888 175.792c-4.176-4.56-9.424-6.848-15.76-6.848-6.48 0-11.904 2.352-16.256 7.104-4.336 4.752-6.496 11.376-6.496 19.84 0 6.064 1.84 11.696 5.536 16.896 3.68 5.184 9.28 7.776 16.784 7.776 6.496 0 11.856-2.288 16.096-6.848 4.224-4.576 6.336-10.624 6.336-18.128 0-8.608-2.080-15.216-6.24-19.792z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM249.744 298.608c-14.96 0-27.264-4.976-36.944-14.928-9.664-9.952-14.48-23.072-14.48-39.328 0-15.616 4.576-28.288 13.712-38.016 9.152-9.728 20.048-14.608 32.656-14.608 11.6 0 21.248 4.496 28.992 13.472-1.232-18.384-4.080-30.496-8.512-36.336-4.448-5.824-9.824-8.752-16.176-8.752-5.024 0-9.056 1.472-12.128 4.384s-4.96 7.424-5.68 13.488l-29.728-3.28c2.192-13.328 7.136-23.344 14.864-30.032 7.728-6.704 17.872-10.064 30.4-10.064 17.44 0 31.568 6.496 42.432 19.504 10.864 12.992 16.304 34.16 16.304 63.488 0 28.832-5.216 49.536-15.648 62.128-10.432 12.576-23.792 18.88-40.064 18.88zM264.88 221.232c-4.032-4.672-8.992-7.008-14.896-7.008-6.112 0-11.216 2.416-15.296 7.28s-6.112 12.464-6.112 22.816c0 10.208 1.872 17.568 5.616 22.048 3.76 4.48 8.464 6.72 14.16 6.72 5.968 0 11.216-2.736 15.776-8.208 4.544-5.472 6.832-13.168 6.832-23.088 0-9.040-2.016-15.888-6.080-20.56z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM255.904 308.208c-15.568 0-27.664-5.472-36.352-16.416-10.512-13.28-15.76-35.008-15.76-65.184 0-30.768 4.784-52.16 14.336-64.16s22.16-17.984 37.776-17.984c15.536 0 27.664 5.472 36.336 16.4 10.512 13.264 15.776 35.072 15.776 65.408 0 30.4-5.216 52.176-15.664 65.312-8.752 11.072-20.912 16.624-36.448 16.624zM272.72 186.256c-1.632-6.128-3.888-10.368-6.816-12.752-2.944-2.368-6.288-3.552-10-3.552-3.744 0-7.056 1.168-9.952 3.504s-5.296 7.008-7.2 14.048-2.848 19.968-2.848 38.768 1.056 32.192 3.184 40.128c1.6 6.128 3.872 10.368 6.816 12.736 2.928 2.368 6.256 3.552 10 3.552 3.712 0 7.024-1.184 9.936-3.552 2.896-2.368 5.28-7.072 7.184-14.112s2.88-19.968 2.88-38.768-1.056-32.128-3.184-40z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM284.112 119.424h-39.504v148.88c-14.416-13.456-31.424-23.408-51.008-29.872v35.744c10.304 3.376 21.504 9.792 33.584 19.232 12.096 9.44 20.368 20.448 24.88 33.024h32.048v-207.008z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM325.472 153.184v-36.752h-138.496c1.488 13.872 5.984 27.008 13.488 39.44 7.488 12.416 22.288 28.912 44.384 49.44 17.776 16.592 28.688 27.84 32.72 33.744 5.44 8.16 8.16 16.224 8.16 24.192 0 8.816-2.352 15.6-7.056 20.336s-11.2 7.104-19.504 7.104c-8.192 0-14.72-2.496-19.568-7.472s-7.648-13.232-8.368-24.784l-39.504 3.952c2.336 21.744 9.68 37.36 22.048 46.848 12.352 9.472 27.824 14.208 46.368 14.208 20.32 0 36.288-5.488 47.904-16.448 11.616-10.976 17.424-24.608 17.424-40.912 0-9.28-1.664-18.112-4.992-26.496s-8.592-17.184-15.808-26.352c-4.784-6.080-13.424-14.864-25.936-26.304-12.496-11.424-20.416-19.008-23.744-22.752-3.328-3.76-6.016-7.408-8.080-10.976h78.56z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM303.92 138.288c-13.216-12.752-29.664-19.104-49.376-19.104-18.656 0-34.128 5.36-46.4 16.080-12.304 10.72-19.424 24.72-21.392 42.032l38.256 4.624c1.216-9.712 4.496-17.136 9.856-22.288 5.328-5.136 11.808-7.712 19.408-7.712 8.16 0 15.024 3.104 20.624 9.312 5.568 6.192 8.352 14.544 8.352 25.056 0 9.936-2.672 17.84-8.016 23.664-5.36 5.824-11.872 8.72-19.568 8.72-5.072 0-11.12-0.992-18.176-2.944l4.352 31.952c10.688-0.288 18.848 2.032 24.464 6.944 5.616 4.912 8.416 11.44 8.416 19.584 0 6.928-2.048 12.432-6.16 16.56-4.128 4.112-9.584 6.176-16.4 6.176-6.736 0-12.464-2.336-17.232-7.008-4.768-4.688-7.664-11.52-8.704-20.496l-36.496 6.176c2.528 12.512 6.352 22.512 11.472 30s12.24 13.36 21.376 17.648 19.392 6.416 30.736 6.416c19.408 0 34.976-6.192 46.688-18.576 9.664-10.128 14.48-21.568 14.48-34.32 0-18.096-9.904-32.544-29.728-43.328 11.824-2.528 21.28-8.208 28.352-17.008 7.088-8.816 10.624-19.44 10.624-31.904 0.016-18.112-6.592-33.52-19.808-46.256z" /> +<glyph unicode="" d="M261.744 198.672v70.48l-47.536-70.48h47.536zM256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM325.504 164.176h-25.504v-41.52h-38.256v41.52h-84.496v34.352l89.568 131.136h33.184v-130.992h25.504v-34.496z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM312.736 149.12c-13.424-18.192-32.048-27.28-55.872-27.28-19.040 0-34.56 5.104-46.576 15.344-12 10.256-19.184 24.032-21.536 41.312l39.504 4.096c1.12-8.944 4.448-16 9.968-21.184 5.52-5.216 11.872-7.808 19.072-7.808 8.24 0 15.184 3.344 20.912 10.032 5.68 6.688 8.544 16.784 8.544 30.288 0 12.64-2.848 22.128-8.512 28.448-5.68 6.32-13.088 9.488-22.208 9.488-11.36 0-21.568-4.992-30.576-15.008l-31.952 4.624 20.256 107.376h104.496v-36.992h-74.528l-6.352-35.072c8.848 4.368 17.872 6.576 27.088 6.576 17.584 0 32.48-6.384 44.72-19.136 12.224-12.752 18.336-29.312 18.336-49.648-0.016-16.992-4.944-32.144-14.784-45.456z" /> +<glyph unicode="" d="M256.992 223.408c-7.616 0-14.032-2.976-19.28-8.928-5.264-5.952-7.888-14.736-7.888-26.352 0-12.848 2.96-22.752 8.88-29.728 5.904-6.992 12.656-10.48 20.272-10.48 7.312 0 13.424 2.88 18.304 8.592s7.312 15.072 7.312 28.112c0 13.408-2.624 23.216-7.872 29.456s-11.84 9.328-19.728 9.328zM256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM304.752 134.288c-12.368-12.752-28.288-19.104-47.68-19.104-20.832 0-37.952 8.080-51.36 24.256-13.424 16.176-20.128 42.672-20.128 79.52 0 37.776 7.008 65.008 20.992 81.696 13.968 16.688 32.128 25.024 54.464 25.024 15.664 0 28.64-4.4 38.912-13.2 10.288-8.816 16.832-21.584 19.648-38.336l-38.256-4.208c-0.944 7.84-3.392 13.648-7.328 17.376-3.952 3.744-9.072 5.616-15.376 5.616-8.368 0-15.456-3.728-21.232-11.216-5.776-7.472-9.424-23.040-10.928-46.72 9.84 11.616 22.096 17.424 36.752 17.424 16.512 0 30.656-6.272 42.432-18.816s17.664-28.752 17.664-48.608c0-21.088-6.192-37.984-18.576-50.704z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM326.176 290.752c-11.152-10.992-22.48-26.736-34-47.28s-20.304-42.368-26.336-65.504c-6.032-23.12-8.992-43.776-8.912-61.968h-38c0.64 28.496 6.512 57.6 17.616 87.232 11.072 29.648 25.872 56.16 44.4 79.52h-90.016v36.752h135.248v-28.752z" /> +<glyph unicode="" d="M259.424 213.408c-9.664 0-16.848-3.344-21.584-10.064-4.736-6.704-7.088-13.968-7.088-21.808 0-10.976 2.784-19.52 8.352-25.664s12.528-9.216 20.88-9.216c8.16 0 14.912 2.976 20.256 8.88s8.016 14.416 8.016 25.584c0 9.728-2.72 17.552-8.16 23.456-5.44 5.888-12.336 8.832-20.672 8.832zM258.864 244.672c7.472 0 13.44 2.24 17.92 6.688 4.464 4.464 6.72 10.64 6.72 18.528 0 7.424-2.224 13.36-6.656 17.824-4.432 4.464-10.288 6.688-17.568 6.688-7.568 0-13.584-2.256-18.064-6.752-4.48-4.512-6.72-10.48-6.72-17.904 0-7.888 2.224-14.048 6.64-18.464 4.448-4.4 10.352-6.608 17.728-6.608zM256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM309.040 132.816c-12.144-11.936-28.288-17.904-48.416-17.904-18.752 0-34.336 4.944-46.816 14.816-14.704 11.664-22.064 27.632-22.064 47.936 0 11.168 2.768 21.44 8.32 30.784 5.536 9.344 14.272 16.56 26.192 21.648-10.224 4.304-17.664 10.224-22.288 17.76-4.656 7.536-6.976 15.776-6.976 24.768 0 15.344 5.36 28.016 16.096 38.032 10.736 10 26 15.008 45.776 15.008 19.6 0 34.816-5.008 45.632-15.008 10.848-10.016 16.256-22.688 16.256-38.032 0-9.552-2.48-18.032-7.456-25.472-4.992-7.424-11.968-13.12-20.976-17.040 11.408-4.608 20.080-11.328 26.016-20.16 5.936-8.832 8.912-19.024 8.912-30.576 0-19.12-6.080-34.624-18.208-46.56z" /> +<glyph unicode="" d="M254.88 296.912c-7.344 0-13.44-2.88-18.288-8.624-4.848-5.76-7.264-15.184-7.264-28.288 0-13.28 2.64-23.024 7.904-29.248 5.264-6.24 11.856-9.344 19.744-9.344 7.632 0 14.048 3.008 19.264 8.992s7.824 14.784 7.824 26.384c0 12.72-2.944 22.592-8.816 29.616s-12.672 10.512-20.368 10.512zM256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM307.408 143.952c-13.936-16.704-32.096-25.040-54.448-25.040-16.112 0-29.104 4.32-39.024 12.912-9.92 8.624-16.288 21.488-19.088 38.608l38.256 4.24c0.944-7.808 3.376-13.6 7.296-17.36 3.904-3.76 9.088-5.648 15.552-5.648 8.128 0 15.040 3.744 20.752 11.28 5.68 7.536 9.328 23.104 10.928 46.768-9.952-11.536-22.384-17.296-37.312-17.296-16.24 0-30.256 6.256-42.032 18.752-11.776 12.512-17.664 28.784-17.664 48.832 0 20.88 6.224 37.712 18.64 50.496 12.432 12.784 28.272 19.168 47.504 19.168 20.912 0 38.080-8.096 51.504-24.272 13.408-16.176 20.112-42.8 20.112-79.84-0.048-37.712-7.024-64.896-20.976-81.6z" /> +<glyph unicode="" d="M267.808 296.352c-3.728 3.040-8 4.576-12.816 4.576s-9.104-1.536-12.88-4.576c-3.776-3.056-6.704-8.512-8.784-16.384-2.736-10.224-4.096-27.424-4.096-51.616s1.216-40.816 3.664-49.856 5.552-15.056 9.264-18.080c3.728-3.008 8-4.48 12.816-4.48s9.088 1.52 12.88 4.56 6.688 8.512 8.784 16.384c2.72 10.128 4.096 27.28 4.096 51.472s-1.216 40.816-3.68 49.856c-2.448 9.040-5.52 15.088-9.248 18.144zM256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM301.728 144.272c-11.168-14.064-26.752-21.088-46.736-21.088-20.080 0-36.272 7.696-48.56 23.12s-18.432 42.912-18.432 82.464c0 38.816 6.752 66.752 20.272 83.808 11.168 14.064 26.752 21.088 46.736 21.088s35.616-7.12 46.88-21.376c13.408-16.88 20.128-44.848 20.128-83.952-0.016-38.992-6.784-67.024-20.288-84.064z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM234.432 291.664c-10.784 11.824-23.728 17.728-38.896 17.728-15.52 0-28.32-5.376-38.352-16.144-4.048-4.416-7.28-9.616-9.664-15.616-2.368-6-3.568-12.096-3.568-18.256 0-12.704 3.584-23.52 10.72-32.432 7.152-8.912 16.464-14.24 27.952-16l3.984-0.256 3.44-0.544c5.296-0.704 7.952-2.736 7.952-6.080 0-3.536-3.536-9.088-10.608-16.672-7.424-8.112-19.168-16.336-35.248-24.608-6.72-3.536-10.064-7.936-10.064-13.232 0-3.36 1.136-6.144 3.44-8.336 2.288-2.208 5.2-3.296 8.736-3.296 8.816 0 20.992 5.104 36.512 15.344 18.336 12 32.992 26.592 43.92 43.808 10.944 17.184 16.4 34.176 16.4 50.944 0 7.936-1.504 15.824-4.496 23.68-2.992 7.84-7.056 14.496-12.16 19.968zM360.368 291.664c-10.72 11.824-23.568 17.728-38.528 17.728-15.664 0-28.432-5.376-38.288-16.144-4.064-4.416-7.264-9.664-9.648-15.744-2.384-6.096-3.568-12.128-3.568-18.128 0-12.704 3.52-23.568 10.544-32.56s16.288-14.288 27.712-15.872l4.224-0.256 3.152-0.544c5.28-0.704 7.92-2.736 7.92-6.080 0-3.536-3.44-9.088-10.304-16.672-7.216-7.76-18.928-15.968-35.104-24.608-6.704-3.536-10.048-7.936-10.048-13.232 0-3.36 1.152-6.144 3.44-8.336 2.304-2.208 5.2-3.296 8.72-3.296 8.8 0 20.96 5.104 36.432 15.344 18.32 12 32.896 26.592 43.712 43.808 10.816 17.184 16.24 34.176 16.24 50.944 0 7.936-1.488 15.824-4.48 23.68-2.96 7.84-7.008 14.496-12.128 19.968z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 48c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zM233.472 285.216c6.704 3.536 10.048 7.952 10.048 13.248 0 3.344-1.136 6.128-3.424 8.336-2.304 2.208-5.2 3.312-8.72 3.312-8.816 0-20.96-5.12-36.448-15.344-18.32-12-32.88-26.592-43.696-43.792-10.816-17.2-16.24-34.192-16.24-50.96 0-7.936 1.504-15.824 4.496-23.68 2.992-7.84 7.040-14.496 12.144-19.984 10.736-11.824 23.584-17.728 38.544-17.728 15.664 0 28.432 5.392 38.288 16.16 4.048 4.4 7.248 9.664 9.648 15.744 2.368 6.096 3.568 12.128 3.568 18.128 0 12.704-3.52 23.552-10.544 32.56s-16.288 14.288-27.712 15.872l-4.224 0.256-3.168 0.544c-5.264 0.704-7.92 2.736-7.92 6.080 0 3.536 3.44 9.088 10.32 16.672 7.168 7.728 18.848 15.936 35.040 24.576zM359.84 285.216c6.72 3.536 10.064 7.952 10.064 13.248 0 3.344-1.136 6.128-3.44 8.336-2.288 2.208-5.2 3.312-8.736 3.312-8.816 0-20.992-5.12-36.512-15.344-18.336-12-32.976-26.592-43.904-43.792s-16.4-34.192-16.4-50.96c0-7.936 1.504-15.824 4.496-23.68 3.008-7.84 7.040-14.496 12.16-19.984 10.768-11.824 23.712-17.728 38.88-17.728 15.536 0 28.32 5.392 38.368 16.16 4.048 4.4 7.28 9.616 9.664 15.616 2.368 6.016 3.568 12.096 3.568 18.272 0 12.704-3.584 23.504-10.72 32.416-7.152 8.912-16.464 14.24-27.952 16l-3.984 0.256-3.44 0.544c-5.28 0.704-7.936 2.736-7.936 6.080 0 3.536 3.536 9.088 10.592 16.672 7.408 8.096 19.152 16.288 35.232 24.576z" /> +<glyph unicode="" d="M438.32 222.208l-195.6 194.256h-178.256l-0.416-178.032 193.248-197.264c12.704-12.704 33.136-12.88 45.648-0.368l135.744 135.76c12.496 12.496 12.336 32.944-0.368 45.648zM111.712 335.936c0 17.664 14.336 32 32 32s32-14.336 32-32c0-17.68-14.336-32-32-32s-32 14.32-32 32zM285.808 112.768l-124.448 124.448 11.312 11.312 124.448-124.448-11.312-11.312zM319.744 146.704l-124.448 124.448 11.328 11.312 124.432-124.448-11.312-11.312zM353.68 180.656l-124.432 124.448 11.312 11.312 124.432-124.448-11.312-11.312z" /> +<glyph unicode="" d="M462.528 166.784l-148.976-148.976c-12.656-12.656-33.184-12.656-45.84 0l-182.624 182.64-45.12 139.664 32.96 32.96 63.152-63.152c-1.696-12.16 1.984-24.912 11.328-34.256 15.824-15.824 41.472-15.824 57.296 0 15.808 15.824 15.808 41.472 0 57.296-9.344 9.344-22.096 13.008-34.256 11.328l-63.152 63.152 32.224 32.24 140.384-44.4 182.624-182.64c12.656-12.672 12.656-33.184 0-45.856zM181.776 298.576c-3.168-3.168-8.288-3.168-11.456 0l-126.064 126.064c-3.168 3.168-3.168 8.304 0 11.456s8.304 3.168 11.456 0l126.048-126.048c3.184-3.168 3.184-8.304 0.016-11.472z" /> +<glyph unicode="" d="M405.28 322.56l-56-96.992c-8.848-15.296-28.4-20.544-43.712-11.696l-13.84 8 16 27.696c7.648-4.4 17.44-1.792 21.84 5.856l40 69.28c4.416 7.664 1.792 17.44-5.84 21.856l-55.44 32c-7.664 4.416-17.44 1.792-21.84-5.856l-40-69.28c-4.432-7.664-1.808-17.44 5.84-21.856l-16-27.696-13.84 8c-15.312 8.832-20.56 28.4-11.712 43.696l56 96.992c8.848 15.312 28.4 20.544 43.712 11.712l83.12-48c15.312-8.832 20.56-28.4 11.712-43.712zM216 154.72c-7.664 4.416-10.288 14.208-5.856 21.856l64 110.848c4.416 7.664 14.208 10.288 21.856 5.856s10.288-14.208 5.84-21.856l-64-110.848c-4.4-7.648-14.176-10.256-21.84-5.856zM204.288 198.416v0c-7.664 4.416-17.44 1.792-21.856-5.84l-40-69.28c-4.416-7.664-1.792-17.44 5.856-21.856l55.44-32c7.648-4.416 17.44-1.792 21.84 5.856l40 69.28c4.416 7.648 1.792 17.44-5.84 21.856v0l16 27.696 13.84-8c15.312-8.832 20.56-28.384 11.712-43.696l-56-96.992c-8.848-15.312-28.4-20.544-43.712-11.712l-83.136 48c-15.312 8.848-20.56 28.4-11.712 43.712l56 96.992c8.848 15.312 28.416 20.56 43.728 11.712l13.84-8-16-27.728z" /> +<glyph unicode="" d="M225.936 379.92l-120-207.84c-6.624-11.488 15.712-36.784 15.712-36.784l144 249.408c0 0-33.088 6.704-39.712-4.784zM264 237.856c11.472-6.624 26.16-2.688 32.784 8.784l64 110.848c6.624 11.488 2.688 26.16-8.784 32.8-11.472 6.624-26.16 2.688-32.784-8.784l-64-110.848c-6.624-11.488-2.688-26.176 8.784-32.8zM248 210.144c-11.488 6.624-26.16 2.688-32.784-8.784l-64-110.864c-6.624-11.472-2.704-26.16 8.784-32.784 11.472-6.624 26.16-2.688 32.784 8.784l64 110.864c6.624 11.488 2.688 26.16-8.784 32.784zM390.336 312.704l-144-249.408c0 0 33.088-6.704 39.712 4.784l120 207.84c6.64 11.488-15.712 36.784-15.712 36.784z" /> +<glyph unicode="" d="M80 0v384l66.672 64h202.672l66.656-64v-384h-336zM400 128v240h-304v-352h304v112zM384 256h-272v96h272v-96zM288 320h-80v-16h80v16zM384 144h-272v96h272v-96zM288 208h-80v-16h80v16zM384 32h-272v96h272v-96zM288 96h-80v-16h80v16z" /> +<glyph unicode="" d="M80-16v400l66.672 64h202.672l66.656-64v-400h-336zM96 0h304v368h-304v-368zM112 176h272v-160h-272v160zM208 112v-16h80v48h-16v-32h-48v32h-16v-32zM112 352h272v-160h-272v160zM208 272h80v48h-16v-32h-48v32h-16v-48z" /> +<glyph unicode="" d="M432-16h-352c-17.664 0-32 14.336-32 32v352c0 17.68 14.336 32 32 32h32v-16c0-26.512 21.488-48 48-48 26.496 0 48 21.488 48 48v16h96v-16c0-26.512 21.504-48 48-48s48 21.488 48 48v16h32c17.664 0 32-14.32 32-32v-352c0-17.664-14.336-32-32-32zM432 288h-352v-272h352v272zM160 208h-48v48h48v-48zM160 128h-48v48h48v-48zM160 48h-48v48h48v-48zM240 208h-48v48h48v-48zM240 128h-48v48h48v-48zM240 48h-48v48h48v-48zM320 208h-48v48h48v-48zM320 128h-48v48h48v-48zM320 48h-48v48h48v-48zM400 208h-48v48h48v-48zM400 128h-48v48h48v-48zM400 48h-48v48h48v-48zM351.504 352c-17.408 0-31.504 14.112-31.504 31.504v32.992c0 17.408 14.096 31.504 31.504 31.504s31.504-14.096 31.504-31.504v-32.992c0-17.392-14.096-31.504-31.504-31.504zM159.504 352c-17.408 0-31.504 14.112-31.504 31.504v32.992c0 17.408 14.096 31.504 31.504 31.504s31.504-14.096 31.504-31.504v-32.992c0-17.392-14.112-31.504-31.504-31.504z" /> +<glyph unicode="" d="M448 0h-384c-17.664 0-32 14.336-32 32v336c0 17.664 14.336 32 32 32h32v-16c0-26.512 21.488-48 48-48s48 21.488 48 48v16h128v-16c0-26.512 21.504-48 48-48s48 21.488 48 48v16h32c17.664 0 32-14.336 32-32v-336c0-17.664-14.336-32-32-32zM448 288h-384v-256h384v256zM209.104 162.736c3.152 5.024 4.736 10.336 4.736 15.888 0 12.368-6.656 18.56-19.968 18.56-11.568 0-22.624-4.592-33.184-13.776v26.064c11.68 7.568 24.88 11.344 39.568 11.344 13.744 0 24.48-3.456 32.208-10.352s11.584-16.24 11.584-27.984c0-15.68-9.408-31.904-28.224-48.656l-27.664-24.56v-0.56h54.56v-24.56h-88.496v23.056l38.528 36.848c7.744 7.424 13.2 13.648 16.352 18.688zM317.392 109.344c4.224 3.248 6.336 7.776 6.336 13.6 0 6-2.608 10.624-7.824 13.872s-12.384 4.88-21.52 4.88h-12.096v22.688h11.152c17.504 0 26.256 5.808 26.256 17.44 0 10.944-6.72 16.4-20.16 16.4-8.992 0-17.744-2.912-26.256-8.72v24.192c9.44 4.752 20.432 7.12 32.992 7.12 13.744 0 24.448-3.088 32.112-9.28s11.488-14.224 11.488-24.096c0-17.568-8.912-28.56-26.72-32.992v-0.464c9.504-1.184 16.992-4.64 22.496-10.352s8.256-12.736 8.256-21.040c0-12.56-4.592-22.496-13.776-29.808s-21.872-10.976-38.064-10.976c-13.872 0-25.152 2.256-33.84 6.752v25.776c8.992-6.56 19.504-9.84 31.504-9.84 7.552-0.032 13.44 1.6 17.664 4.848zM367.504 352c-17.408 0-31.504 14.096-31.504 31.504v32.992c0 17.408 14.096 31.504 31.504 31.504s31.504-14.096 31.504-31.504v-32.992c0-17.408-14.096-31.504-31.504-31.504zM143.504 352c-17.408 0-31.504 14.096-31.504 31.504v32.992c0 17.408 14.096 31.504 31.504 31.504s31.504-14.096 31.504-31.504v-32.992c0-17.408-14.112-31.504-31.504-31.504z" /> +<glyph unicode="" d="M176 432h-32v-64h32v64zM352 352h-32v-32h32v32zM176 352h-32v-32h32v32zM367.008 384l0.992-80h-64v80h-112v-80h-64v80h-48v-384h336v384h-48.992zM176 48.992h-48v48h48v-48zM176 112.992h-48v48h48v-48zM176 176.992h-48v48h48v-48zM240 48.992h-48v48h48v-48zM240 112.992h-48v48h48v-48zM240 176.992h-48v48h48v-48zM304 48.992h-48v48h48v-48zM304 112.992h-48v48h48v-48zM304 176.992h-48v48h48v-48zM368 48.992h-48v48h48v-48zM368 112.992h-48v48h48v-48zM368 176.992h-48v48h48v-48zM352 432h-32v-64h32v64z" /> +<glyph unicode="" d="M335.008 415.504h-223.008v-383.008h160v32h-128v319.008h160v-48h64v-176h32v192.992l-64.992 63.008zM368 127.504h-32v-32h-32v-32h32v-31.008h32v32h32v31.008h-32v32z" /> +<glyph unicode="" d="M335.008 415.504h-223.008v-383.008h160v32h-128v319.008h160v-48h64v-176h32v192.992l-64.992 63.008zM304 79.504l96 0.992v31.008h-96v-32z" /> +<glyph unicode="" d="M176 240h16v16h-16v-16zM176 192h16v16h-16v-16zM176 288h16v16h-16v-16zM176 144h16v16h-16v-16zM176 96h16v16h-16v-16zM208 192h128v16h-128v-16zM208 288h128v16h-128v-16zM335.008 416h-223.008v-384h288v320l-64.992 64zM368 64.992h-224v319.008h160v-47.008h64v-272zM208 144h128v16h-128v-16zM208 240h128v16h-128v-16zM208 96h128v16h-128v-16z" /> +<glyph unicode="" d="M271.744 223.248h-128v-14.496h128v14.496zM271.744 175.248h-128v-15.504h128v15.504zM192.256 415.744v-48.256h-48.512v-48.256h-47.248v-303.008h223.504v48.496h47.248v47.008h48.256v304h-223.248zM304.496 31.744h-192.496v273.008h192.496v-273.008zM351.744 79.248h-31.744v240h-160.752v32.752h192.496v-272.752zM400 127.248h-32.752v240.256h-159.504v32.752h192.256v-273.008zM271.744 79.504h-128v-15.504h128v15.504zM271.744 127.744h-128v-15.504h128v15.504zM271.984 271.744h-128v-16h128v16z" /> +<glyph unicode="" d="M351.984 416h-192c-17.664 0-31.984-14.336-31.984-32v-320c0-17.664 14.32-32 31.984-32h192c17.68 0 32.016 14.336 32.016 32v320c0 17.664-14.336 32-32.016 32zM208 400h80l0.992-16h-80.992v16zM255.664 56c-8.832 0-16 7.152-16 16s7.168 16 16 16c8.848 0 16-7.152 16-16s-7.168-16-16-16zM351.984 112h-192l0.336 256h191.664v-256z" /> +<glyph unicode="" d="M368.016 416h-240c-17.68 0-32.016-14.336-32.016-32v-320c0-17.664 14.336-32 32.016-32h240c17.664 0 31.984 14.336 31.984 32v320c0 17.664-14.32 32-31.984 32zM248 48c-8.832 0-15.984 7.152-15.984 16s7.152 16 15.984 16c8.848 0 16.016-7.152 16.016-16s-7.168-16-16.016-16zM367.856 96.992h-240.416v286.592h240.416v-286.592z" /> +<glyph unicode="" d="M448 416h-384c-17.68 0-32-14.336-32-32v-320c0-17.664 14.32-32 32-32h384c17.664 0 32 14.336 32 32v320c0 17.664-14.336 32-32 32zM184.992 392c8.832 0 15.984-7.168 15.984-16s-7.152-16-15.984-16c-8.848 0-16 7.168-16 16s7.168 16 16 16zM136 392c8.832 0 16-7.168 16-16s-7.168-16-16-16c-8.848 0-16 7.168-16 16s7.152 16 16 16zM87.984 392c8.848 0 16-7.168 16-16s-7.152-16-16-16c-8.832 0-15.984 7.168-15.984 16s7.152 16 15.984 16zM448 64h-384v271.664h384v-271.664zM448 367.664h-224v16h224v-16z" /> +<glyph unicode="" d="M272 80.992h-48v-24.992l-48-8v-16h143.008v15.008l-47.008 8.992v24.992zM432 416h-368c-17.68 0-32-14.32-32-32v-224c0-17.664 14.32-32 32-32h368c17.68 0 32 14.336 32 32v224c0 17.68-14.32 32-32 32zM246 152c-8.832 0-16 7.168-16 16 0 8.848 7.168 16 16 16 8.848 0 16-7.152 16-16 0-8.832-7.168-16-16-16zM432 208h-368v176h368v-176z" /> +<glyph unicode="" d="M352 416h-192c-17.68 0-32-14.336-32-32v-320c0-17.664 14.32-32 32-32h192c17.664 0 32 14.336 32 32v320c0 17.664-14.336 32-32 32zM256 64c-30.944 0-56 25.072-56 56 0 30.944 25.056 56 56 56 30.928 0 56-25.056 56-56 0-30.928-25.072-56-56-56zM352 208h-192l0.336 176h191.664v-176zM256 152c-17.664 0-32-14.336-32-32s14.336-32 32-32 32 14.336 32 32-14.336 32-32 32z" /> +<glyph unicode="" d="M448.24 16.896h-32.784v-16.896h-48.688v16.896h-222.528v-16.896h-48.688l0.016 16.896h-31.808c-17.568 0-31.792 14.24-31.792 31.792v302.992c0 17.552 14.24 31.792 31.792 31.792h111.264c0 0 7.008 9.728 19.824 18.592l-40.848 40.864 11.248 11.232 44.080-44.064c8.384 3.6 18.096 6.16 29.28 6.16 11.888 0 21.968-2.928 30.56-6.88l44.784 44.784 11.232-11.232-41.824-41.84c11.664-8.592 17.84-17.632 17.84-17.632h147.024c17.568 0 31.792-14.24 31.792-31.792v-302.992c0.016-17.552-14.224-31.776-31.776-31.776zM334.992 319.888c0 8.784-7.12 15.888-15.904 15.888h-222.528c-8.784 0-15.904-7.104-15.904-15.888v-239.424c0-8.784 7.12-15.888 15.904-15.888h222.512c8.784 0 15.904 7.104 15.904 15.888v239.424zM384.672 64.576h46.672v15.888h-46.672v-15.888zM384.672 96.368h46.672v15.872h-46.672v-15.872zM384.672 129.152h46.672v15.888h-46.672v-15.888zM384.672 160.944h46.672v15.904h-46.672v-15.904zM406.896 335.392c-13.152 0-23.84-10.672-23.84-23.84s10.688-23.84 23.84-23.84c13.168 0 23.84 10.672 23.84 23.84s-10.672 23.84-23.84 23.84zM406.896 272c-13.152 0-23.84-10.656-23.84-23.824s10.688-23.84 23.84-23.84c13.168 0 23.84 10.672 23.84 23.84s-10.672 23.824-23.84 23.824z" /> +<glyph unicode="" d="M448 368l-240.064-0.272 0.064 47.28-128 0.992v-48h-32c-17.664 0-32-14.336-32-32v-272c0-17.664 14.336-32 32-32h400c17.664 0 32 14.336 32 32v272c0 17.664-14.336 32-32 32zM112 384h64v-48h-64v48zM192 80.672c-61.856 0-112 50.144-112 112s50.144 112 112 112c61.84 0 112-50.144 112-112 0-61.856-50.16-112-112-112zM408 263.664c-17.68 0-32 14.32-32 32 0 17.664 14.32 32 32 32 17.664 0 32-14.336 32-32 0-17.664-14.336-32-32-32zM192 262c-39.76 0-72-32.24-72-72s32.24-72 72-72 72 32.24 72 72-32.24 72-72 72z" /> +<glyph unicode="" d="M448 352h-95.008c0 0-0.992 1.904-0.992 24s-17.904 40-40 40h-128c-22.096 0-40-17.904-40-40s0.992-24 0.992-24h-96.992c-17.664 0-32-14.336-32-32v-256c0-17.664 14.336-32 32-32h400c17.664 0 32 14.336 32 32v256c0 17.664-14.336 32-32 32zM248.72 96.432c-53.024 0-96 42.976-96 96 0 53.008 42.976 96 96 96 53.008 0 96-42.976 96-96 0-53.024-42.992-96-96-96z" /> +<glyph unicode="" d="M432 207.248l-80 32.048v64.128l80 32.064c8.848 0 16-7.184 16-16.032v-96.192c0-8.848-7.152-16.016-16-16.016zM280 319.472c-39.76 0-72 32.304-72 72.144s32.24 72.144 72 72.144 72-32.304 72-72.144c0-39.856-32.24-72.144-72-72.144zM136 319.472c-39.76 0-72 32.304-72 72.144s32.24 72.144 72 72.144 72-32.304 72-72.144c0-39.856-32.24-72.144-72-72.144zM336 319.472v-144.288h-89.312c-0.832-13.312-6.656-24.784-15.312-31.28h9.024l63.824-143.936h-15.904l-21.28 48h-42.56v-79.968h-15.952v79.968h-43.232l-21.616-48h-15.92l64.832 143.936h6.032c-8.656 6.496-14.48 17.968-15.312 31.28h-103.312v144.288h256zM208.512 138.944c-0.656 0.16-1.264 0.496-1.904 0.72l-34.112-75.712h36.016v74.992zM224.464 140.096v-76.16h35.472l-34.016 76.72c-0.464-0.224-0.944-0.368-1.456-0.56z" /> +<glyph unicode="" d="M485.36 56.88c-2.048 3.536-8.608 4.624-19.696 3.232-20.4-2.64-35.216 4.016-44.448 20.016-6.992 12.096-8.8 24.256-5.424 36.48s13.376 29.664 29.984 52.352l10.384 14.464c30.848 42.608 37.168 79.664 18.976 111.2-18.512 32.096-72 29.392-110.448 12.896-31.104 64.144-96.64 108.48-172.688 108.48-106.048 0-192-85.968-192-192 0-106.032 85.952-192 192-192 106.032 0 192 85.968 192 192 0 23.504-4.432 45.936-12.16 66.736 12.976 4.656 28.496 8.032 43.136 8.576 19.232 0.704 36.64-3.328 43.552-15.296 15.408-26.704 7.968-58.256-22.32-94.608l-6.208-7.456c-35.424-42.512-43.888-79.744-25.456-111.712 7.456-12.896 19.312-22.096 35.6-27.632 16.288-5.52 30.064-4.992 41.36 1.536 5.6 3.232 6.896 7.488 3.856 12.736zM104 183.008c-22.096 0-40 17.904-40 40 0 22.080 17.904 40 40 40s40-17.904 40-40c0-22.096-17.904-40-40-40zM192 95.008c-22.096 0-40 17.904-40 40s17.904 40 40 40 40-17.904 40-40-17.904-40-40-40zM176.32 223.008c0 8.832 7.184 16 16.016 16s16-7.152 16-16c0-8.848-7.168-16-16-16s-16.016 7.152-16.016 16zM192 271.008c-22.096 0-40 17.904-40 40 0 22.080 17.904 40 40 40s40-17.904 40-40c0-22.096-17.904-40-40-40zM280 183.008c-22.096 0-40 17.904-40 40 0 22.080 17.904 40 40 40s40-17.904 40-40c0-22.096-17.904-40-40-40z" /> +<glyph unicode="" d="M64 384v-352h352v352h-352zM128 64h-32v32h32v-32zM128 112h-32v32h32v-32zM128 160h-32v32h32v-32zM128 224h-32v32h32v-32zM128 272h-32v32h32v-32zM128 320h-32v32h32v-32zM320 64h-160v128h160v-128zM320 224h-160v128h160v-128zM384 64h-32v32h32v-32zM384 112h-32v32h32v-32zM384 160h-32v32h32v-32zM384 224h-32v32h32v-32zM384 272h-32v32h32v-32zM384 320h-32v32h32v-32z" /> +<glyph unicode="" d="M384 208c-17.68 0-32-14.32-32-32v-64h-80v224h176v-128h-64zM304 320h-16v-32h16v32zM304 160h-16v-32h16v32zM336 320h-16v-32h16v32zM336 160h-16v-32h16v32zM368 320h-16v-32h16v32zM400 320h-16v-32h16v32zM432 320h-16v-32h16v32zM64 384h208v-32h-208v32zM256 336v-224h-176v224h176zM272 64h-208v32h208v-32z" /> +<glyph unicode="" d="M368 183.424v23.888h-15.936v-23.888c0-57.184-47.344-103.552-104.528-103.568h-0.064c-57.184 0.016-103.536 46.368-103.536 103.568v23.888h-15.936v-23.888c0-60.208 44.656-109.504 102.56-117.792v-48.336c-45.376-3.424-79.664-18.784-79.664-33.024 0-0.368 196.512-0.368 196.512 0 0 14.784-37.056 30.656-84.976 33.248v47.92c58.864 7.408 105.568 57.088 105.568 117.984zM247.488 96.784c48.4 0 88.64 39.248 88.64 87.648v22.896h-176.288v-22.896c0-48.4 39.248-87.648 87.648-87.648zM336.128 360.4c0 48.4-40.24 87.632-88.64 87.632-48.384 0-87.648-39.232-87.648-87.632v-137.152h176.288v137.152zM280 415.808c4.4 0 8-3.584 8-8s-3.6-8-8-8c-4.416 0-8 3.584-8 8s3.584 8 8 8zM248 415.808c4.4 0 8-3.584 8-8s-3.6-8-8-8c-4.416 0-8 3.584-8 8s3.584 8 8 8zM216 415.808c4.4 0 8-3.584 8-8s-3.6-8-8-8c-4.416 0-8 3.584-8 8s3.584 8 8 8zM184 239.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM184 271.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM184 303.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8 0-4.416-3.6-8-8-8zM184 335.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM200 367.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM216 239.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM216 271.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM216 303.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8 0-4.416-3.6-8-8-8zM216 335.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM232 367.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM248 239.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM248 271.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM248 303.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8 0-4.416-3.6-8-8-8zM248 335.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM264 367.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM280 239.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM280 271.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM280 303.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8 0-4.416-3.6-8-8-8zM280 335.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM296 367.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM312 239.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM312 271.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8zM312 303.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8 0-4.416-3.6-8-8-8zM312 335.808c-4.416 0-8 3.584-8 8s3.584 8 8 8c4.4 0 8-3.584 8-8s-3.6-8-8-8z" /> +<glyph unicode="" d="M262.416 65.424v-47.92c47.92-2.592 84.992-18.464 84.992-33.248 0-0.368-196.512-0.368-196.512 0 0 14.256 34.304 29.616 79.664 33.024v48.336c-57.904 8.304-102.56 57.6-102.56 117.808v23.888h15.936v-23.888c0-57.184 46.352-103.552 103.536-103.568h0.064c57.184 0.016 104.528 46.368 104.528 103.568v23.888h15.936v-23.888c0-60.896-46.704-110.576-105.584-118zM247.488 96.784c-48.384 0-87.648 39.248-87.648 87.648v22.896h176.288v-22.896c0-48.4-40.256-87.648-88.64-87.648zM159.84 360.4c0 48.4 39.248 87.632 87.648 87.632s88.64-39.232 88.64-87.632v-137.152h-176.288v137.152z" /> +<glyph unicode="" d="M262.4 65.024v-47.888c47.872-2.576 84.88-18.416 84.88-33.2 0-0.368-196.288-0.368-196.288 0 0 14.224 34.272 29.584 79.568 32.992v48.288c-57.824 8.288-102.432 57.552-102.432 117.664v24.88h15.92v-24.88c0-57.12 46.304-103.44 103.424-103.456h0.064c57.12 0.016 103.424 46.336 103.424 103.456v24.88h16.928v-24.88c-0.016-60.816-46.672-110.448-105.488-117.856zM248 96.72c-48.56 0-87.904 39.344-87.904 87.904v39.632h71.92v15.984h-71.92v15.984h71.92v15.968h-71.92v15.984h71.92v15.984h-71.92v15.984h71.92v15.984h-71.92v25.312c0 48.544 39.344 86.912 87.904 86.912 48.544 0 87.904-38.352 87.904-86.912v-25.312h-71.936v-15.984h71.936v-15.984h-71.936v-15.984h71.936v-15.984h-71.936v-15.968h71.936v-15.984h-71.936v-15.984h71.936v-39.632c0-48.56-39.36-87.904-87.904-87.904z" /> +<glyph unicode="" d="M368.88 337.504c8.912 0 16.128-7.216 16.128-16.128l-29.232-321.488c0-8.912-7.216-16.128-16.128-16.128h-167.312c-8.912 0-16.128 7.216-16.128 16.128l-29.2 321.488c0 8.912 7.216 16.128 16.128 16.128h144.16l17.056 86.976 77.424 39.76-5.568-20.768-57.472-28.816-15.008-77.152h65.152zM280.224 224.624h64.464l-18.144-208.608h-141.088l-18.144 208.608h96.464l20.144 96.752h-140.8l29.216-321.488h167.296l29.232 321.488h-68.512l-20.128-96.752z" /> +<glyph unicode="" d="M391.392 336.304h-287.504l0.288 30.944h22.976l48.624 47.92h145.744l47.632-47.92h22.976l-0.736-30.944zM272.592 383.216h-47.92v-15.968h47.92v15.968zM365.712 207.52h-54.032c-11.92 23.216-35.824 39.264-63.712 39.264s-51.792-16.048-63.696-39.264h-53.088l-10.336 111.808h255.568l-10.704-111.808zM208.704 175.584c0 22.048 17.872 39.936 39.936 39.936 22.048 0 39.92-17.888 39.92-39.936s-17.872-39.936-39.92-39.936c-22.064 0-39.936 17.888-39.936 39.936zM247.968 103.024c28.704 0 53.28 16.944 64.8 41.264h46.896l-12.192-127.456h-198.656l-11.776 127.456h46.144c11.52-24.32 36.080-41.264 64.784-41.264z" /> +<glyph unicode="" d="M400 337.312h-288.72l0.288 31.072h23.056l48.832 48.112h146.368l47.824-48.112h23.056l-0.704-31.072zM280.704 384.416h-48.128v-16.032h48.128v16.032zM378.496 256.096h-243.936l-6.24 64.16h256.64l-6.464-64.16zM371.92 112.752h-231.584l-12.016 127.312h256.64l-13.040-127.312zM355.888 31.536c0-8.848-7.184-16.032-16.048-16.032h-167.408c-8.864 0-16.048 7.184-16.048 16.032l-6.336 65.168h212.384l-6.544-65.168z" /> +<glyph unicode="" d="M424.992 351.664l-167.936-147.408v-191.024l93.456-45.232h-219.024l93.472 45.216v191.040l-169.952 147.408h259.232l51.888 89.904 13.952-8.048-47.248-81.84h92.16zM385.776 336.56l-61.808-0.24-19.040-32.992h43.92l36.928 33.232zM257.056 238.896c9.456 0 17.104 7.664 17.104 17.12s-7.664 17.12-17.104 17.12-17.12-7.664-17.12-17.12c0-9.472 7.68-17.12 17.12-17.12zM94.24 336.56l37.232-33.232h154.864l19.008 32.912-211.104 0.32z" /> +<glyph unicode="" d="M479.744 231.232c-6.048 58.224-65.008 57.888-95.632 56.848 0.144 8.848 0.24 15.984 0.24 15.984l-352.432 0.112c0 0 0-48.224 0-49.424 0-68.496 39.12-127.744 96.176-156.944v-17.088h160.304v17.088c16 8.192 30.352 18.944 43.056 31.376 78.64 18.816 161.12 45.968 148.288 102.048zM356 158.944c17.968 27.6 28.576 60.4 28.576 95.808 0-0.272 0.016 0.464 0.032 1.856 28.56 0.944 60.080 3.792 67.216-24.64 7.168-31.28-45.072-56.752-95.824-73.024zM141.28 368.16c0-16-26.24-33.040-26.24-33.040s51.424 9.184 51.424 33.184-50.992 8-50.992 26 25.232 35.040 25.232 35.040-48.4-10.192-48.4-35.184 48.976-10 48.976-26zM221.28 352.16c0-16-26.24-33.040-26.24-33.040s51.424 9.184 51.424 33.184-50.992 8-50.992 26 25.232 35.040 25.232 35.040-48.416-10.192-48.416-35.184 48.992-10 48.992-26zM285.28 368.16c0-16-26.24-33.040-26.24-33.040s51.424 9.184 51.424 33.184-50.992 8-50.992 26 25.232 35.040 25.232 35.040-48.416-10.192-48.416-35.184 48.992-10 48.992-26zM30.928 65.152c0-22.096 78.8-40 176-40s176 17.904 176 40c0-0.464-352-0.464-352 0z" /> +<glyph unicode="" d="M412.176 79.92h-43.584v-34.624c0-24.736-22.048-44.768-46.784-44.768h-164.928c-24.736 0-44.784 20.032-44.784 44.768v241.6h47.968v-238.48h31.808l0.032 238.48c8.544-6.16 21.344-10.736 32.128-13.168v-225.328h31.808v224.4c11.92 1.968 22.848 6.448 32.256 12.912v-237.312h31.808v238.496h92.256c19.776 0 35.824-16.032 35.824-35.824v-135.312c0.016-19.792-16.032-35.84-35.808-35.84zM415.856 255.84h-47.28v-143.76h47.28v143.76zM339.552 301.728c-15.664 0-29.808 6.256-40.272 16.336-12.992-18.352-34.272-30.432-58.448-30.432-23.312 0-43.808 11.312-56.912 28.544-10.368-9.584-24.128-15.568-39.36-15.568-28.080 0-51.504 19.888-56.992 46.336-8.544 5.6-14.192 15.232-14.192 26.192 0 17.312 14.032 31.344 31.344 31.344 1.28 0 2.512-0.224 3.744-0.368 9.68 7.696 21.744 12.56 35.024 12.816 5.968 17.696 22.528 30.544 42.256 30.544 15.184 0 28.544-7.6 36.656-19.152 5.888 1.6 12.016 2.592 18.416 2.592 6.688 0 13.056-1.12 19.184-2.864 8.080 11.712 21.568 19.424 36.864 19.424 19.312 0 35.616-12.288 41.904-29.408 0.272 0 0.496 0.080 0.768 0.080 32.16 0 58.224-26.064 58.224-58.208s-26.064-58.208-58.208-58.208z" /> +<glyph unicode="" d="M332.864 308.128c23.168 57.92-28.624 67.472-28.624 66.784 16.352 40.896-16.352 68.16-46.336 68.16s-28.624-13.648-28.624-13.648 16.352 3.408 16.352-9.536c0-12.96-15.008-12.272-29.984-27.264-15.008-14.992-7.84-12.96-8.864-12.96 31.168 2.048 49.408-30.16 83.824-18.384-34.080-17.040-42.256 10.048-79.056 11.408-4.768 0-32.032 5.28-32.032-46.848 39.872-4.608 57.248-32.032 111.088-25.904-60.656-22.48-136.64 70.544-147.2-31.344 0-21.808 16.336-32.768 16.336-32.768s188.784 0 188.112 0c37.472 16.352 19.088 75.712-14.992 72.304zM257.152-16l85.248 241.104h-172.368l87.12-241.104z" /> +<glyph unicode="" d="M408 336c-4.72 0-9.28-0.592-13.712-1.552-1.968 29.136-25.984 52.224-55.616 52.224-6.64 0-12.928-1.36-18.832-3.488-18.4 29.248-50.752 48.816-87.84 48.816-56.352 0-101.968-44.912-103.68-100.848-7.504 3.088-15.696 4.848-24.32 4.848-35.344 0-64-28.656-64-64 0-34.432 27.248-62.304 61.328-63.712l25.664 25.664 25.952-25.952h12.128l25.936 25.952 25.936-25.952h12.128l25.936 25.952 25.936-25.952h12.128l25.936 25.952 25.936-25.952h12.128l25.936 25.952 25.856-25.856c34.928 0.464 63.136 28.848 63.136 63.904 0 35.344-28.656 64-64 64zM384 214.944l-22.944-22.944h-20.128l-21.936 21.936-21.936-21.936h-20.128l-21.936 21.936-21.936-21.936h-20.128l-21.936 21.936-21.936-21.936h-20.112l-21.936 21.936-21.952-21.936h-1.056l42.4-176h218l43.6 176h-1.056l-22.944 22.944zM184 32l-33.328 144h16l33.328-144h-16zM216 32l-16.992 144h16l16.992-144h-16zM264 32h-16v144h16v-144zM280 32l16.992 144h16l-16.992-144h-16zM328 32h-16l32.992 144h16l-32.992-144z" /> +<glyph unicode="" d="M345.6 352h-176l-105.6-144v-80c0-17.664 14.336-32 32-32h320c17.664 0 32 14.336 32 32v80l-102.4 144zM359.44 207.632l-32.832-48.032-137.408 0.32-35.232 47.904-65.376 0.384 90.608 127.584h156.8l89.6-127.6-66.16-0.56z" /> +<glyph unicode="" d="M345.6 352h-176l-105.6-144v-80c0-17.664 14.336-32 32-32h320c17.664 0 32 14.336 32 32v80l-102.4 144zM359.44 207.632l-32.832-48.032-137.408 0.32-35.232 47.904-65.376 0.384 90.592 127.6h156.816l89.6-127.6-66.16-0.576zM278 304c0 8.832-5.168 16-14 16-8.848 0-15.008-7.168-15.008-16v-63.008l-38.992-0.992 54-60.992 52.992 60.992-39.008 0.992v63.008z" /> +<glyph unicode="" d="M345.6 352h-176l-105.6-144v-80c0-17.664 14.336-32 32-32h320c17.664 0 32 14.336 32 32v80l-102.4 144zM359.44 207.648l-32.832-48.048-137.424 0.32-35.216 47.92-65.376 0.368 90.592 127.6h156.816l89.6-127.6-66.16-0.56zM210 256l39.008-0.992v-63.008c0-8.848 6.16-16 15.008-16 8.832 0 14 7.152 14 16v63.008l38.976 0.992-52.992 60.992-54-60.992z" /> +<glyph unicode="" d="M345.6 352h-176l-105.6-160v-80c0-17.664 14.336-32 32-32h320c17.664 0 32 14.336 32 32v80l-102.4 160zM359.44 191.632l-32.832-64.032-137.424 0.32-35.216 63.92-65.376 0.368 90.592 143.6h156.816l89.6-143.6-66.16-0.576zM192 144h128v16h-128v-16zM189.328 320.048l-70.656-112.048h278.656l-72 112.048h-136zM176 176h160v16h-160v-16z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM372.128 283.088l-151.776-151.76c-3.808-3.792-9.968-3.792-13.776 0l-3.056 3.056-0.016-0.016-83.504 84.096c-3.808 3.808-3.808 9.984 0 13.792l20.704 20.688c3.808 3.808 9.984 3.808 13.792 0l59.024-59.456 124.096 124.096c3.808 3.808 9.984 3.808 13.792 0l20.704-20.704c3.824-3.792 3.824-9.968 0.016-13.792z" /> +<glyph unicode="" d="M349.12 271.52l-16.032 16.032c-2.96 2.96-7.744 2.96-10.688 0l-96.224-96.208-45.744 46.112c-2.976 2.96-7.744 2.96-10.72 0l-16.032-16.048c-2.96-2.96-2.96-7.744 0-10.688l67.088-67.568c2.96-2.944 7.744-2.944 10.688 0l117.664 117.664c2.976 2.96 2.976 7.744 0 10.704zM256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 64c-88.352 0-160 71.648-160 160 0 88.368 71.648 160 160 160 88.368 0 160-71.632 160-160 0-88.352-71.632-160-160-160z" /> +<glyph unicode="" d="M256 16c-114.88 0-208 93.12-208 208s93.12 208 208 208 208-93.12 208-208-93.12-208-208-208zM351.376 284.656c3.904 3.904 3.904 10.256 0 14.16l-21.248 21.232c-3.904 3.904-10.256 3.904-14.16 0l-60.176-60.176-60.176 60.176c-3.904 3.904-10.256 3.904-14.16 0l-21.248-21.232c-3.904-3.904-3.904-10.256 0-14.16l60.192-60.192-60.192-60.16c-3.904-3.904-3.904-10.256 0-14.16l21.248-21.248c3.904-3.904 10.256-3.904 14.16 0l60.176 60.192 60.176-60.192c3.904-3.904 10.256-3.904 14.16 0l21.248 21.248c3.904 3.904 3.904 10.256 0 14.16l-60.192 60.16 60.192 60.192z" /> +<glyph unicode="" d="M256 16c-114.88 0-208 93.12-208 208s93.12 208 208 208 208-93.12 208-208-93.12-208-208-208zM256 384c-88.352 0-160-71.648-160-160s71.648-160 160-160c88.368 0 160 71.648 160 160s-71.632 160-160 160zM328.592 167.44l-16.224-16.224c-2.976-2.976-7.808-2.976-10.8 0l-45.92 45.92-45.92-45.92c-2.992-2.976-7.808-2.976-10.8 0l-16.224 16.224c-2.976 2.976-2.976 7.808 0 10.8l45.936 45.904-45.936 45.92c-2.976 2.992-2.976 7.824 0 10.816l16.224 16.208c2.992 2.992 7.808 2.992 10.8 0l45.92-45.92 45.92 45.92c2.992 2.992 7.824 2.992 10.8 0l16.224-16.208c2.976-2.992 2.976-7.824 0-10.816l-45.936-45.92 45.936-45.904c2.976-2.992 2.976-7.84 0-10.8z" /> +<glyph unicode="" d="M248 8c-114.88 0-208 93.12-208 208s93.12 208 208 208 208-93.12 208-208-93.12-208-208-208zM351.008 224.992c0 8.832-7.168 16-16 16h-64v64c0 8.832-7.152 16-16 16h-16c-8.848 0-16-7.168-16-16v-64h-64c-8.848 0-16-7.168-16-16v-16c0-8.848 7.152-16 16-16h64v-64c0-8.848 7.152-16 16-16h16c8.848 0 16 7.152 16 16v64h64c8.832 0 16 7.152 16 16v16z" /> +<glyph unicode="" d="M256 16c-114.88 0-208 93.12-208 208s93.12 208 208 208 208-93.12 208-208-93.12-208-208-208zM256 384c-88.352 0-160-71.632-160-160 0-88.352 71.648-160 160-160 88.368 0 160 71.648 160 160 0 88.368-71.632 160-160 160zM319.808 208h-48v-48c0-8.848-7.168-16-16-16-8.848 0-16 7.152-16 16v48h-48c-8.848 0-16 7.168-16 16s7.152 16 16 16h48v48c0 8.848 7.152 16 16 16 8.832 0 16-7.152 16-16v-48h48c8.832 0 16-7.168 16-16s-7.168-16-16-16z" /> +<glyph unicode="" d="M248 424c-114.88 0-208-93.12-208-208s93.12-208 208-208c114.88 0 208 93.12 208 208s-93.12 208-208 208zM352 210c0-8.848-7.168-16-16-16h-176c-8.848 0-16 7.152-16 16v16c0 8.832 7.152 16 16 16h176c8.832 0 16-7.168 16-16v-16z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM256 64c-88.352 0-160 71.648-160 160 0 88.368 71.648 160 160 160 88.368 0 160-71.632 160-160 0-88.352-71.632-160-160-160zM315.808 240h-128c-8.848 0-16-7.168-16-16 0-8.848 7.152-16 16-16h128c8.848 0 16 7.152 16 16 0 8.832-7.152 16-16 16z" /> +<glyph unicode="" d="M248 424c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM248 98c-13.264 0-24 10.752-24 24s10.736 24 24 24c13.248 0 24-10.752 24-24s-10.752-24-24-24zM272 202c0-13.248-10.752-24-24-24-13.264 0-24 10.752-24 24v112c0 13.264 10.736 24 24 24 13.248 0 24-10.736 24-24v-112z" /> +<glyph unicode="" d="M415.92 174.912h-21.184c-3.44-12.464-8.368-24.288-14.688-35.248l19.584-19.568c12.528-12.528 12.528-32.848 0-45.376l-11.344-11.344c-12.528-12.528-32.848-12.528-45.376 0l-19.712 19.696c-10.928-6.224-22.704-11.072-35.104-14.448v-20.544c0-17.712-14.352-32.080-32.080-32.080h-16.032c-17.712 0-32.096 14.352-32.096 32.080v20.544c-12.384 3.376-24.176 8.24-35.104 14.448l-19.696-19.696c-12.512-12.528-32.832-12.528-45.36 0l-11.36 11.344c-12.528 12.528-12.528 32.848 0 45.376l19.584 19.568c-6.32 10.976-11.248 22.784-14.704 35.248h-21.168c-17.728 0-32.080 14.352-32.080 32.064v16.048c0 17.712 14.352 32.080 32.080 32.080h20.928c3.312 12.336 8.048 24.080 14.192 34.976l-18.832 18.816c-12.528 12.528-12.528 32.848 0 45.376l11.344 11.328c12.528 12.528 32.848 12.528 45.36 0l18.448-18.448c11.296 6.576 23.488 11.696 36.352 15.2v21.568c0.016 17.728 14.4 32.080 32.112 32.080h16.032c17.712 0 32.080-14.352 32.080-32.080v-21.552c12.896-3.52 25.072-8.64 36.352-15.216l18.448 18.448c12.528 12.528 32.848 12.528 45.376 0l11.344-11.328c12.528-12.528 12.528-32.848 0-45.376l-18.816-18.816c6.144-10.896 10.88-22.64 14.208-34.992h20.928c17.712 0 32.080-14.368 32.080-32.080v-16.048c-0.016-17.696-14.368-32.048-32.096-32.048zM248 302.72c-48.72 0-88.224-39.504-88.224-88.224s39.504-88.224 88.224-88.224 88.224 39.504 88.224 88.224-39.504 88.224-88.224 88.224zM248 175.408c-22.144 0-40.112 17.936-40.112 40.096 0 22.144 17.968 40.096 40.112 40.096s40.096-17.952 40.096-40.096c0-22.16-17.952-40.096-40.096-40.096z" /> +<glyph unicode="" d="M340.288 127.376l11.344 11.344c12.528 12.528 12.528 32.848 0 45.376l-19.584 19.568c6.304 10.976 11.248 22.784 14.688 35.248h21.184c17.712 0 32.080 14.368 32.080 32.080v16.032c0 17.712-14.352 32.080-32.080 32.080h-20.928c-3.328 12.336-8.048 24.080-14.192 34.976l18.832 18.816c12.528 12.528 12.528 32.848 0 45.376l-11.344 11.328c-12.528 12.528-32.848 12.528-45.376 0l-18.448-18.448c-11.28 6.576-23.472 11.696-36.352 15.216v21.552c-0.016 17.728-14.384 32.080-32.096 32.080h-16.032c-17.712 0-32.096-14.352-32.096-32.080v-21.552c-12.88-3.52-25.056-8.64-36.352-15.216l-18.464 18.464c-12.512 12.528-32.832 12.528-45.36 0l-11.344-11.328c-12.528-12.528-12.528-32.848 0-45.376l18.816-18.832c-6.128-10.896-10.88-22.64-14.192-34.992h-20.912c-17.728 0.016-32.080-14.352-32.080-32.080v-16.032c0-17.712 14.352-32.080 32.080-32.080h21.168c3.456-12.464 8.384-24.272 14.704-35.248l-19.584-19.568c-12.528-12.528-12.528-32.848 0-45.376l11.344-11.344c12.528-12.528 32.848-12.528 45.36 0l19.696 19.696c10.944-6.224 22.704-11.072 35.104-14.448v-20.544c0-17.696 14.368-32.080 32.096-32.080h16.032c17.712 0 32.080 14.368 32.080 32.080v20.544c12.4 3.376 24.192 8.24 35.104 14.448l19.696-19.696c12.56-12.512 32.864-12.512 45.408 0.016zM200 190.288c-48.72 0-88.224 39.488-88.224 88.224 0 48.72 39.504 88.224 88.224 88.224s88.224-39.504 88.224-88.224c0-48.736-39.504-88.224-88.224-88.224zM200 319.6c-22.16 0-40.112-17.952-40.112-40.096s17.952-40.096 40.112-40.096c22.144 0 40.096 17.952 40.096 40.096s-17.952 40.096-40.096 40.096zM400.992 18.208c-10.752 0-19.456-8.704-19.456-19.456 0-10.736 8.704-19.44 19.456-19.44 10.736 0 19.456 8.704 19.456 19.44 0 10.752-8.72 19.456-19.456 19.456zM482.432 17.968h-10.144c-1.616 5.984-3.92 11.68-6.896 16.976l9.12 9.12c6.080 6.080 6.080 15.936 0 22l-5.504 5.504c-6.080 6.080-15.92 6.080-22 0l-8.96-8.944c-5.472 3.184-11.392 5.664-17.632 7.376v10.432c0 8.592-6.976 15.568-15.568 15.568h-7.776c-8.592 0-15.568-6.976-15.568-15.568v-10.432c-6.256-1.712-12.16-4.192-17.632-7.376l-8.96 8.944c-6.080 6.080-15.936 6.080-22 0l-5.504-5.504c-6.080-6.064-6.080-15.92 0-22l9.12-9.12c-2.992-5.28-5.28-10.992-6.896-16.976h-10.144c-8.592 0-15.568-6.976-15.568-15.568v-7.776c0-8.592 6.976-15.568 15.568-15.568h10.272c1.664-6.032 4.064-11.76 7.12-17.088l-9.488-9.488c-6.080-6.080-6.080-15.92 0-22.016l5.504-5.504c6.064-6.064 15.92-6.064 22 0l9.552 9.568c5.312-3.008 11.008-5.376 17.024-7.008v-9.968c0-8.592 6.976-15.568 15.568-15.568h7.776c8.592 0 15.568 6.976 15.568 15.568v9.968c6.016 1.632 11.712 3.984 17.008 7.008l9.568-9.568c6.080-6.064 15.92-6.064 22 0l5.504 5.504c6.080 6.096 6.080 15.936 0 22.016l-9.488 9.488c3.040 5.328 5.456 11.056 7.12 17.088h10.272c8.592 0 15.568 6.976 15.568 15.568v7.776c0.064 8.608-6.912 15.568-15.504 15.568zM400.992-44.512c-23.632 0-42.784 19.152-42.784 42.8 0 23.632 19.152 42.784 42.784 42.784s42.784-19.152 42.784-42.784c0-23.648-19.152-42.8-42.784-42.8z" /> +<glyph unicode="" d="M425.168 248h30.832v-48h-30.832c-2.096-15.296-5.984-30.016-11.744-43.792l26.704-15.424-24-41.568-27.168 15.68c-9.328-11.776-20.16-22.272-32.176-31.328l16-27.696-41.568-24-16.336 28.272c-13.584-5.296-27.92-8.992-42.896-10.768v-33.376h-48v34.288c-14.592 2.256-28.656 6.096-41.824 11.696l-17.392-30.112-41.568 24 17.808 30.848c-11.152 8.944-21.104 19.248-29.792 30.608l-31.376-18.112-24 41.568 31.664 18.288c-5.136 12.976-8.736 26.688-10.688 40.944h-36.816v48h36.832c1.952 14.272 5.552 27.984 10.688 40.944l-31.664 18.288 24 41.568 31.376-18.112c8.688 11.36 18.64 21.664 29.792 30.624l-17.808 30.8 41.568 24 17.392-30.112c13.168 5.6 27.232 9.456 41.824 11.696v34.288h48v-33.36c14.976-1.776 29.312-5.472 42.896-10.768l16.336 28.272 41.568-24-16-27.712c12.016-9.056 22.848-19.552 32.176-31.328l27.168 15.68 24-41.568-26.704-15.424c5.744-13.776 9.632-28.496 11.728-43.792zM247.856 328.144c-57.44 0-104-46.56-104-104s46.56-104 104-104 104 46.56 104 104-46.56 104-104 104zM248 184c-22.096 0-40 17.904-40 40s17.904 40 40 40 40-17.904 40-40-17.904-40-40-40z" /> +<glyph unicode="" d="M488.88 76.496l-200.304 342.976c-16.704 16.704-43.808 16.704-60.512 0l-200.32-342.976c-16.704-16.688-16.704-43.776 0-60.496h461.12c16.736 16.72 16.736 43.808 0.016 60.496zM239.872 296.352c0 13.264 10.752 24 24 24s24-10.736 24-24v-112c0-13.248-10.752-24-24-24s-24 10.752-24 24v112zM264.016 80.224c-13.248 0-24 10.72-24 24 0 13.248 10.752 24 24 24s24-10.752 24-24c0-13.28-10.752-24-24-24z" /> +<glyph unicode="" d="M432 31.504h-32v-31.008h-64v31.008h-176v-31.008h-64v31.008h-32c-17.68 0-32 14.336-32 32v272c0 17.68 14.32 32 32 32h368c17.664 0 32-14.336 32-32v-272c0-17.68-14.336-32-32-32zM335.984 223.504h-63.984v64h-48v-64h-64v-48h64v-64h48v64h63.984v48zM304 415.84h-96v-32.336h-32v15.664h16v48.336h127.328v-48h16.672v-16h-32v32.336z" /> +<glyph unicode="" d="M432 16h-64v336h64c17.664 0 32-14.336 32-32v-272c0-17.664-14.336-32-32-32zM160 352v0 32c0 17.68 14.336 32 32 32h112c17.664 0 32-14.32 32-32v-368h-176v336zM192 352h112c0 0 0 7.168 0 16 0 8.848-7.168 16-16 16h-80c-8.848 0-16-7.152-16-16 0-8.832 0-16 0-16zM32 48v272c0 17.664 14.336 32 32 32h64v-336h-64c-17.664 0-32 14.336-32 32z" /> +<glyph unicode="" d="M432 16h-368c-17.68 0-32 14.336-32 32v192c0 0 83.536-42.96 160-60.544v-19.456c0-8.848 7.152-16 16-16h80c8.832 0 16 7.152 16 16v19.456c76.448 17.584 160 60.544 160 60.544v-192c0-17.664-14.336-32-32-32zM272 208c8.832 0 16-7.152 16-16v-16c0-8.848-7.168-16-16-16h-48c-8.848 0-16 7.152-16 16v16c0 8.848 7.152 16 16 16h48zM304 208c0 8.848-7.168 16-16 16h-80c-8.848 0-16-7.152-16-16v-14.336c-76.464 18.112-160 62.336-160 62.336v64c0 17.664 14.32 32 32 32h96v32c0 17.664 14.336 32 32 32h112c17.664 0 32-14.336 32-32v-32h96c17.664 0 32-14.336 32-32v-64c0 0-83.552-44.224-160-62.336v14.336zM304 368c0 8.848-7.168 16-16 16h-80c-8.848 0-16-7.152-16-16 0-8.832 0-16 0-16h112c0 0 0 7.168 0 16z" /> +<glyph unicode="" d="M313.136 306.288l-50.304-75.712-36.56 36.848-36.576-59.152-27.424 27.152-29.696-59.424h233.152l-52.592 130.288zM64 400v-368h368v368h-368zM400 144h-304v224h304v-224zM167.856 270.864c13.264 0 24 10.736 24 24s-10.736 24-24 24c-13.248 0-24-10.736-24-24s10.752-24 24-24z" /> +<glyph unicode="" d="M443.728 165.84l-21.056-78.624-0.592-0.16-23.008-85.872-148.736 39.84-1.776-0.464-156.608 41.952-0.272 1.024-41.68 11.184 7.888 29.456 0.512-0.144 77.264 288.352-0.512 0.144 8.144 30.352 273.68-73.344 0.256 0.896 75.376-20.192-49.152-183.36 0.272-1.040zM454.112 328.032l-288.368 77.264-56.928-212.48 288.336-77.248 56.96 212.464zM195.744 265.728l19.104-32.72 49.712 46.8 25.328-44.256 66.96 59.024 16.752-136.944-221.152 59.296 43.296 48.8zM210.032 297.92c-12.56 3.376-20.032 16.304-16.656 28.864 3.36 12.576 16.288 20.048 28.864 16.672 12.56-3.376 20.032-16.304 16.656-28.864-3.36-12.576-16.288-20.048-28.864-16.672zM346.24 408.336l-6.624-1.776-60.72 16.272 89.568 24 13.856-51.696-35.040 9.392-1.040 3.808zM57.872 331.056l19.872-74.16-16.272-60.704-42.080 157.088 90.688 24.304-9.392-35.040-42.816-11.488zM112.928 4.224l-16.288 60.768 121.552-32.576-105.264-28.192z" /> +<glyph unicode="" d="M425.664 6.608l-41.984 11.52-0.096 116.128 40.16-11.296 57.904 216.144-293.312 78.592-19.328-72.096h-33.088l29.808 111.232 355.088-95.136-95.152-355.088zM368.624-32h-368.624v367.632h368.624v-367.632zM336.656 303.664h-304.688v-223.76h304.688v223.76zM125.584 144.112l36.528 59.072 36.528-36.816 50.224 75.632 52.528-130.144h-232.896l29.68 59.36 27.408-27.104zM103.744 206.624c-13.248 0-23.984 10.72-23.984 23.968s10.736 23.968 23.984 23.968 23.968-10.72 23.968-23.968-10.72-23.968-23.968-23.968z" horiz-adv-x="520" /> +<glyph unicode="" d="M368 160c-8.848 0-16 7.168-16 16v96c0 8.848 7.152 16 16 16 8.832 0 16-7.152 16-16v-96c0-8.832-7.168-16-16-16zM319.968 364.656c15.968-27.552 16.032-60.656 16.032-60.656h-160c0 0-0.624 33.536 15.504 61.184l-30.128 30.128c-3.12 3.12-3.12 8.192 0 11.312s8.192 3.12 11.312 0l28.256-28.256c11.84 13.104 29.296 22.624 55.056 22.624 25.44 0 42.736-9.776 54.56-23.104l28.752 28.736c3.12 3.12 8.192 3.12 11.312 0s3.12-8.192 0-11.312l-30.656-30.656zM216 352c-4.416 0-8-3.584-8-8s3.584-8 8-8c4.4 0 8 3.584 8 8s-3.6 8-8 8zM296 352c-4.416 0-8-3.584-8-8s3.584-8 8-8c4.4 0 8 3.584 8 8s-3.6 8-8 8zM160 176c0-8.832-7.168-16-16-16-8.848 0-16 7.168-16 16v96c0 8.848 7.152 16 16 16 8.832 0 16-7.152 16-16v-96zM336 144c0-20.88-13.408-38.432-32-45.056v-50.944c0-8.832-7.168-16-16-16-8.848 0-16 7.168-16 16v48h-32v-48c0-8.832-7.168-16-16-16-8.848 0-16 7.168-16 16v50.944c-18.608 6.624-32 24.192-32 45.056v144h160v-144z" /> +<glyph unicode="" d="M256 416c-106.032 0-192-85.968-192-192 0-106.048 85.968-192 192-192 106.048 0 192 85.952 192 192 0 106.032-85.952 192-192 192zM377.2 194.944l-37.824-42.080-8.144 59.152c-48.992 15.008-104.992 15.152-156.992 0.16l-5.056-59.888c0 0-41.056 42.256-41.792 42.256-19.216-6.832-40.048-21.872-40.048-21.872l-0.992 12.992c0 0 158.672 110.672 332.016 0l-0.992-12.992c-0.032-0.016-19.168 16.272-40.176 22.272z" /> +<glyph unicode="" d="M277.792 216.992l133.424-135.728c-34-30.528-78.8-49.264-128.096-49.264-106.032 0-192 85.968-192 192 0 106.032 85.968 192 192 192 54.080 0 102.848-22.432 137.744-58.4l-143.072-140.608zM290.784 352.672c-13.248 0-23.984-10.752-23.984-24 0-13.264 10.736-24 23.984-24 13.264 0 24.016 10.736 24.016 24 0 13.248-10.752 24-24.016 24z" /> +<glyph unicode="" d="M448.272 31.744h-33.040l-32.032 96.128h-271.376l-32.048-96.128h-32.048c-26.528 0-48.064 21.536-48.064 48.064v288.384c0 26.544 21.536 48.048 48.064 48.048h400.528c26.544 0 48.064-21.52 48.064-48.048v-288.384c0.016-26.528-21.504-48.064-48.048-48.064zM447.264 368.192h-399.536v-208.272h399.536v208.272zM416.224 191.968h-336.448v144.176h336.432v-144.176zM151.808 304.368c-22.128 0-40.048-17.936-40.048-40.048s17.92-40.048 40.048-40.048 40.064 17.936 40.064 40.048-17.936 40.048-40.064 40.048zM271.024 280.064h-47.056v-32.032h47.056v32.032zM344.208 304.368c-22.128 0-40.048-17.936-40.048-40.048s17.92-40.048 40.048-40.048c22.112 0 40.048 17.936 40.048 40.048s-17.936 40.048-40.048 40.048zM343.12 248.032c-8.848 0-16.016 7.168-16.016 16.016 0 8.848 7.168 16.016 16.016 16.016s16.032-7.168 16.032-16.016c0-8.848-7.184-16.016-16.032-16.016zM152.88 248.032c-8.848 0-16.016 7.168-16.016 16.016 0 8.848 7.168 16.016 16.016 16.016 8.864 0 16.032-7.168 16.032-16.016 0-8.848-7.184-16.016-16.032-16.016zM372.16 111.856l28.048-79.44h-305.408l27.024 79.44h250.336zM352.144 63.792h16.016v16.016h-16.016v-16.016zM320.096 63.792h16.032v16.016h-16.032v-16.016zM207.952 63.792h79.104v16.016h-79.104v-16.016zM159.888 63.792h16.016v16.016h-16.016v-16.016zM127.84 63.792h16.016v16.016h-16.016v-16.016z" /> +<glyph unicode="" d="M112.016 240h16v-16h-16v-48h32v16h-16v16h16v48h-32v-16zM208.032 192h16v16h-16v-16zM160.016 240h16v-16h-16v-16h16v-16h-16v-16h32v80h-32v-16zM208.032 224h16v16h-16v-16zM240.032 176h48v80h-48v-80zM256.032 240h16v-48h-16v48zM320.032 256h-16v-48h32v-32h16v80h-16v-32h-16v32zM448.032 256h-16.016l0.080 64.464-90.080 95.376-21.984 0.016v32.144h-176v-31.968l-22.464 0.016-89.376-94.064-0.224-195.456 89.072-93.376 22.992-0.016v-33.136h176v32.96l21.456-0.016 90.384 94.080 0.064 48.976h16.096c8.848 0 16 7.152 16 16v48c0 8.832-7.152 16-16 16zM399.312 139.296l-72.032-75.76-191.952 0.176-70.768 75.024 0.176 170.96 70.048 74.784 193.952-0.192 70.768-76.032-0.192-168.96z" /> +<glyph unicode="" d="M448.864 182.864c0-110.928-89.92-200.864-200.864-200.864-110.928 0-200.864 89.936-200.864 200.864 0 107.552 84.576 195.072 190.832 200.336v34.656h-15.056c-8.88 0-16.080 7.2-16.080 16.080s7.2 16.064 16.080 16.064h48.192c8.88 0 16.080-7.184 16.080-16.064s-7.2-16.080-16.080-16.080h-17.056v-34.448c108.112-3.2 194.816-91.664 194.816-200.544zM237.968 321.456v36.656c-49.744-2.816-93.856-26.24-124.256-61.728l26.448-26.448-11.36-11.376-25.040 25.056c-20.384-28.768-32.512-63.792-32.512-101.744 0-1.696 0.24-4.016 0.24-4.016h38.912v-16.080h-37.76c3.904-32.832 16.912-63.792 36.288-88.544l19.888 19.888 11.36-11.36-20.736-20.752c30.064-31.936 71.808-52.752 118.528-55.392v43.664h16.064v-43.872c47.824 1.632 90.72 22.288 121.584 54.56l-22.784 22.784 11.36 11.36 22.032-22.016c19.84 24.96 33.184 56.336 37.152 89.664h-40.8v16.080h41.936c0.048 1.664 0.256 2.32 0.256 4.016 0 39.008-12.8 74.896-34.208 104.080l-26.368-26.368-11.36 11.36 27.616 27.6c-31.152 35.248-76.048 58.096-126.4 59.792v-36.864h-16.080zM255.024 177.84h56.256c4.432 0 8.032-3.616 8.032-8.032 0-4.432-3.6-8.048-8.032-8.048h-64.288c-4.432 0-8.032 3.616-8.032 8.048v111.472c0 4.432 3.6 8.032 8.032 8.032s8.032-3.6 8.032-8.032v-103.44z" /> +<glyph unicode="" d="M435.664 243.6c-21.984 60.912-75.6 107.664-142.256 122.544 17.072 24.512 45.376 40.624 77.52 40.624 52.224 0 94.544-42.336 94.544-94.56 0-27.104-11.552-51.376-29.808-68.608zM253.824 403.216v-59.456c90.72-3.696 163.184-78.208 163.184-169.824 0-38.272-12.784-73.472-34.080-101.872l39.424-68.304-32.752-18.928-33.744 58.464c-29.536-24.688-67.536-39.584-109.024-39.584-41.264 0-79.088 14.704-108.544 39.12l-34.64-59.952-32.752 18.928 40.256 69.696c-21.568 28.512-34.496 63.92-34.496 102.432 0 91.008 71.488 165.104 161.344 169.728v59.552c-9.168 3.28-15.824 11.84-15.824 22.16 0 13.12 10.64 23.744 23.744 23.744 13.12 0 23.76-10.64 23.76-23.744-0.016-10.32-6.672-18.88-15.856-22.16zM114.448 173.936c0-73.12 59.264-132.368 132.368-132.368 73.088 0 132.368 59.248 132.368 132.368 0 73.088-59.28 132.352-132.368 132.352-73.104 0.016-132.368-59.264-132.368-132.352zM286.496 145.312h-47.504c-8.752 0-15.84 7.088-15.84 15.84v63.344c0 8.752 7.088 15.84 15.84 15.84 8.736 0 15.824-7.088 15.824-15.84v-47.504h31.664c8.752 0 15.84-7.088 15.84-15.84s-7.072-15.84-15.824-15.84zM60.352 243.6c-18.272 17.248-29.824 41.504-29.824 68.608 0 52.224 42.336 94.56 94.56 94.56 32.128 0 60.416-16.112 77.52-40.624-66.656-14.88-120.272-61.632-142.256-122.544z" /> +<glyph unicode="" d="M624 287.168l-32-0.336v32.672c0 26.512-21.504 48-48 48h-496c-26.512 0-48-21.488-48-48v-176c0-26.496 21.488-48 48-48h63.664l-0.336-15.008h368.672l-0.336 15.008h64.336c26.496 0 48 21.504 48 48v32.992h32.656l-0.656 110.672zM576 143.504c0-17.664-14.336-32-32-32h-496c-17.664 0-32 14.336-32 32v176c0 17.664 14.336 32 32 32h496c17.664 0 32-14.336 32-32v-176zM544 335.504h-496c-8.848 0-16-7.152-16-16v-176c0-8.848 7.152-16 16-16h496c8.832 0 16 7.152 16 16v176c0 8.832-7.168 16-16 16zM515.952 287.776l-12.8-12h-38.896l-10.88 12h62.576zM501.28 237.776l5.6-5.936-6.72-5.936h-41.792l-5.296 5.936 6.4 5.936h41.808zM450.992 285.664l10.864-12-2.704-32-8.16-7.52-4.16 4.48 4.16 47.040zM347.152 285.664l10.864-12-2.704-32-8.16-7.52-4.16 4.48 4.16 47.040zM397.392 237.776l5.616-5.936-6.736-5.936h-41.744l-5.28 5.936 6.384 5.936h41.76zM187.28 285.664l10.864-12-2.8-32-8.080-7.536-4.112 4.48 4.128 47.056zM237.504 237.776l5.616-5.936-6.72-5.936h-41.808l-5.216 5.936 6.384 5.936h41.744zM148.4 287.776l-12.816-12h-38.88l-10.88 12h62.576zM83.44 285.664l10.88-12-2.816-32-8.080-7.536-4.112 4.48 4.128 47.056zM78.112 225.024l4.8 4.624 6.88-7.504-2.688-32.016-13.088-12 4.096 46.896zM76 175.904l13.12 12h38.816l10.704-12h-62.64zM141.040 178.16l-10.752 11.984 2.688 32.016 8.176 7.504 4-4.624-4.112-46.88zM146.336 238.624l-4.688-4.48-6.96 7.536 2.8 32 12.992 12-4.144-47.056zM181.952 225.024l4.8 4.624 6.88-7.504-2.688-32.016-13.088-11.984 4.096 46.88zM179.824 175.904l13.12 12h38.832l10.704-12h-62.656zM244.88 178.144l-10.72 12 2.704 32 8.176 7.52 4.016-4.624-4.176-46.896zM239.44 275.776h-38.88l-10.896 12h62.56l-12.784-12zM297.2 175.904h-12l1.104 12h12l-1.104-12zM304.24 257.152h-12l1.12 12h12l-1.12-12zM339.792 175.904l12.96 12h38.88l10.72-12h-62.56zM404.752 178.16l-10.736 11.984 2.72 32 8.176 7.52 4-4.624-4.16-46.88zM399.312 275.776h-38.88l-10.896 12h62.56l-12.784-12zM443.632 175.904l12.976 12h38.88l10.72-12h-62.576zM508.592 178.16l-10.752 11.984 2.688 32.016 8.176 7.504 4-4.624-4.112-46.88zM513.904 238.624l-4.704-4.48-6.96 7.536 2.816 32 12.992 12-4.144-47.056z" horiz-adv-x="624" /> +<glyph unicode="" d="M256 424c-114.896 0-208-93.12-208-208s93.104-208 208-208c114.864 0 208 93.12 208 208s-93.12 208-208 208zM254.32 47.568c-92.784 0-168 75.216-168 168s75.216 168 168 168c92.768 0 168-75.216 168-168 0-92.784-75.232-168-168-168zM302.88 205.904h-47.68v80.512c0 8.736-7.088 15.84-15.824 15.84-8.752 0-15.84-7.088-15.84-15.84v-96.336c0-8.752 7.088-15.824 15.84-15.824h63.504c8.752 0 15.84 7.072 15.84 15.824 0 8.736-7.088 15.824-15.84 15.824z" /> +<glyph unicode="" d="M384 32v32h-0.4c0.144 2.656 0.4 5.296 0.4 8v176c0 75.104-60.896 136-136 136s-136-60.896-136-136v-176c0-2.704 0.256-5.344 0.4-8h-0.4v-32c0 0-80 1.344-80 88 0 49.152 25.712 70.832 48 80.4v47.6c0 92.784 75.216 168 168 168s168-75.216 168-168v-47.6c22.288-9.584 48-31.248 48-80.4 0-86.656-80-88-80-88zM144 32h-16v176h16v-176zM368 32h-16v176h16v-176z" /> +<glyph unicode="" d="M463.968 343.504l-34.144 34.144c-6.304 6.288-16.48 6.288-22.768 0l-204.72-204.72-97.376 98.080c-6.288 6.288-16.464 6.288-22.768 0l-34.144-34.144c-6.288-6.304-6.288-16.48 0-22.768l142.784-143.744c6.288-6.288 16.48-6.288 22.768 0l250.368 250.384c6.288 6.272 6.288 16.48 0 22.768z" /> +<glyph unicode="" d="M313.392 223.984l97.536-97.536c6.336-6.336 6.336-16.624 0-22.96l-34.416-34.416c-6.336-6.336-16.608-6.336-22.96 0l-97.552 97.536-97.552-97.536c-6.336-6.336-16.608-6.336-22.944 0l-34.432 34.416c-6.336 6.336-6.336 16.608 0 22.96l97.552 97.536-97.552 97.552c-6.336 6.336-6.336 16.624 0 22.96l34.448 34.416c6.336 6.336 16.608 6.336 22.944 0l97.536-97.552 97.552 97.552c6.336 6.336 16.608 6.336 22.96 0l34.416-34.432c6.336-6.336 6.336-16.608 0-22.96l-97.536-97.536z" /> +<glyph unicode="" d="M274.592 410.544c-168.992 0-274.592-186.544-274.592-186.544s104.592-186.544 274.592-186.544c159.008 0 279.696 186.544 279.696 186.544s-119.696 186.544-279.696 186.544zM276.096 139.984c-46.304 0-83.808 37.52-83.808 83.808s37.52 83.824 83.808 83.824 83.824-37.536 83.824-83.824-37.536-83.808-83.824-83.808zM276.608 265.696c-23.040 0-41.712-18.688-41.712-41.712 0-23.040 18.672-41.712 41.712-41.712s41.712 18.672 41.712 41.712c0.016 23.024-18.656 41.712-41.712 41.712z" horiz-adv-x="560" /> +<glyph unicode="" d="M384 48h-48c-8.848 0-16 7.152-16 16v32c0 8.848 7.152 16 16 16h32v96h-112v-96h16c8.832 0 16-7.152 16-16v-32c0-8.848-7.168-16-16-16h-48c-8.848 0-16 7.152-16 16v32c0 8.848 7.152 16 16 16h16v96h-112v-96h32c8.832 0 16-7.152 16-16v-32c0-8.848-7.168-16-16-16h-48c-8.848 0-16 7.152-16 16v32c0 8.848 7.152 16 16 16v112h128v112h-16c-8.848 0-16 7.168-16 16v32c0 8.832 7.152 16 16 16h48c8.832 0 16-7.168 16-16v-32c0-8.832-7.168-16-16-16h-16v-112h128v-112c8.832 0 16-7.152 16-16v-32c0-8.848-7.168-16-16-16z" /> +<glyph unicode="" d="M383.552 48.56h-47.84c-8.8 0-15.952 7.12-15.952 15.936v31.904c0 8.784 7.152 15.936 15.952 15.936h31.888v79.744h-111.632v-79.744h15.936c8.816 0 15.952-7.152 15.952-15.936v-31.904c0-8.816-7.136-15.936-15.952-15.936h-47.84c-8.8 0-15.936 7.12-15.936 15.936v31.904c0 8.784 7.136 15.936 15.936 15.936h15.968v79.744h-111.648v-79.744h31.888c8.816 0 15.952-7.152 15.952-15.936v-31.904c0-8.816-7.136-15.936-15.952-15.936h-47.824c-8.816 0-15.952 7.12-15.952 15.936v31.904c0 8.784 7.136 15.936 15.952 15.936v95.68h127.584v63.792h-47.84c-8.816 0-15.952 7.136-15.952 15.952v79.744c0 8.8 7.136 15.952 15.952 15.952h111.632c8.816 0 15.936-7.136 15.936-15.952v-79.728c0-8.8-7.12-15.952-15.936-15.952h-47.84v-63.792h127.584v-95.68c8.8 0 15.952-7.152 15.952-15.936v-31.904c-0.016-8.832-7.184-15.952-15.968-15.952zM112.448 96.4v-31.904h47.824v31.904h-47.824zM303.808 287.76v79.744h-111.632v-79.728h111.632zM224.064 96.4v-31.904h47.84v31.904h-47.84zM383.552 96.4h-47.84v-31.904h47.84v31.904z" /> +<glyph unicode="" d="M445.968 32c0 0 88.32-0.096 100.72 86.32 5.904 94.496-85.376 113.12-85.376 113.12s10.384 139.888-117.776 155.84c-109.84 11.216-143.264-90.864-143.264-90.864s-33.088 31.808-77.968 5.824c-40.176-24.8-33.072-70.208-33.072-70.208s-89.232-17.344-89.232-108.288c2-90.832 96.912-91.744 96.912-91.744z" horiz-adv-x="560" /> +<glyph unicode="" d="M470.816 231.44c0 0 10.384 139.888-117.776 155.84-109.84 11.216-143.28-90.864-143.28-90.864s-33.072 31.808-77.952 5.824c-40.176-24.8-33.072-70.208-33.072-70.208s-89.216-17.344-89.216-108.288c1.984-90.832 96.864-91.744 96.864-91.744h149.616v96h-48l80 80 80-80h-48v-96h135.472c0 0 88.32-0.096 100.72 86.32 5.904 94.496-85.376 113.12-85.376 113.12z" horiz-adv-x="560" /> +<glyph unicode="" d="M239.84 209.36c0 0 0.656 208.144 0.16 208.144-108.464 0-192-94.544-192-204.992 0-110.448 89.552-196.992 200-196.992 110.432 0 200 82.544 200 192.992 0 0.928-208.16 0.848-208.16 0.848zM464 225.504c0 110.464-98.544 207.008-208.992 207.008 1.536 0 0-207.008 0-207.008s208.992-0.608 208.992 0z" /> +<glyph unicode="" d="M271.968 240.928c0 0 1.536 191.776 0 191.776 110.336 0 191.776-81.44 191.776-191.776 0-0.608-191.776 0-191.776 0zM447.776 201.568c0-114.736-93.024-207.76-207.76-207.76-114.752 0-207.76 93.024-207.76 207.76 0 114.752 93.008 207.76 207.76 207.76 5.392 0 10.688-0.384 15.984-0.8v-183.584h190.528c0.8-7.36 1.248-15.808 1.248-23.376zM430.8 207.968h-190.784v185.376c-105.92 0-191.776-85.872-191.776-191.792s85.856-191.76 191.776-191.76 191.776 85.84 191.776 191.76c0 20.64-0.992 6.416-0.992 6.416z" /> +<glyph unicode="" d="M63.792 416h-15.792v-384h416v15.408l-399.936 0.8-0.272 367.792zM176 400c0 8.848-7.168 16-16 16h-48c-8.848 0-16-7.152-16-16v-320h80v320zM272 304c0 8.848-7.168 16-16 16h-48c-8.848 0-16-7.152-16-16v-224h80v224zM368 208c0 8.848-7.168 16-16 16h-48c-8.848 0-16-7.152-16-16v-128h80v128zM448 128h-48c-8.848 0-16-7.152-16-16v-32h80v32c0 8.848-7.168 16-16 16z" /> +<glyph unicode="" d="M63.792 416h-15.792v-384h416v15.408l-399.936 0.8-0.272 367.792zM272 400c0 8.848-7.168 16-16 16h-48c-8.848 0-16-7.152-16-16v-320h80v320zM176 304c0 8.832-7.168 16-16 16h-48c-8.848 0-16-7.168-16-16v-224h80v224zM368 208c0 8.848-7.168 16-16 16h-48c-8.848 0-16-7.152-16-16v-128h80v128zM448 128h-48c-8.848 0-16-7.152-16-16v-32h80v32c0 8.848-7.168 16-16 16z" /> +<glyph unicode="" d="M432 143.504h-320v-80h320c8.832 0 16 7.152 16 16v48c0 8.832-7.168 16-16 16zM352 175.504v48c0 8.832-7.168 16-16 16h-224v-80h224c8.832 0 16 7.152 16 16zM256 271.504v48c0 8.832-7.168 16-16 16h-128v-80h128c8.832 0 16 7.168 16 16zM160 367.504v48c0 8.848-7.168 16-16 16h-32v-80h32c8.832 0 16 7.168 16 16zM80 431.504h-16v-415.008h384v16h-368v399.008z" /> +<glyph unicode="" d="M432 239.504h-320v-80h320c8.832 0 16 7.152 16 16v48c0 8.832-7.168 16-16 16zM352 79.504v48c0 8.848-7.168 16-16 16h-224v-80h224c8.832 0 16 7.152 16 16zM256 271.504v48c0 8.832-7.168 16-16 16h-128v-80h128c8.832 0 16 7.168 16 16zM160 367.504v48c0 8.848-7.168 16-16 16h-32v-80h32c8.832 0 16 7.168 16 16zM80 431.504h-16v-415.008h384v16h-368v399.008z" /> +<glyph unicode="" d="M178.608 295.136c0 42.48 34.656 76.912 77.392 76.912s77.392-34.432 77.392-76.912-34.656-76.896-77.392-76.896-77.392 34.432-77.392 76.896zM124.432 285.536c0-32.176 39.264-100 39.264-100l92.304-153.824 87.008 153.808c0 0 44.56 68.32 44.56 100 0 72.208-58.912 130.736-131.568 130.736s-131.568-58.512-131.568-130.72z" /> +<glyph unicode="" d="M470.816 231.44c0 0 10.368 139.888-117.776 155.84-109.856 11.216-143.28-90.864-143.28-90.864s-33.072 31.808-77.968 5.824c-40.16-24.8-33.072-70.208-33.072-70.208s-89.216-17.328-89.216-108.288c2-90.832 96.88-91.744 96.88-91.744h181.616l-80 80h48v96h64v-96h48l-80-80h167.472c0 0 88.32-0.096 100.72 86.32 5.904 94.496-85.376 113.12-85.376 113.12z" horiz-adv-x="560" /> +<glyph unicode="" d="M0 256v48h60l120.496 120.512c-0.8 2.384-1.488 4.816-1.488 7.488 0 13.264 10.736 24 24 24 13.248 0 24-10.736 24-24 0-13.248-10.752-24-24-24-1.776 0-3.344 0.656-4.992 1.008l-105.024-105.008h309.664l-104.4 105.264c-2.064-0.576-4.032-1.264-6.256-1.264-13.248 0-24 10.752-24 24 0 13.264 10.752 24 24 24s24-10.736 24-24c0-2.448-0.72-4.688-1.408-6.928l121.072-121.072h60.336v-48h-496zM397.904 17.568c-4.688-18.752-17.68-17.712-17.68-17.712l-265.52-0.512c-13.536 0-17.168 17.152-17.168 17.152l-70.192 223.28 441.184 0.416-70.624-222.624zM159.984 208h-16v-80h16v80zM159.984 112h-16v-80h16v80zM191.984 208h-15.984v-80h15.984v80zM191.984 112h-15.984v-80h15.984v80zM223.984 208h-16v-80h16v80zM223.984 112h-16v-80h16v80zM256 208h-16v-80h16v80zM256 112h-16v-80h16v80zM288 208h-16v-80h16v80zM288 112h-16v-80h16v80zM320 208h-16v-80h16v80zM320 112h-16v-80h16v80zM352 208h-16v-80h16v80zM352 112h-16v-80h16v80z" /> +<glyph unicode="" d="M134.896 333.52h335.328c34.528 0 34.528 35.808 1.344 35.808h-231.776c-13.28 0-19.904 19.904-19.904 19.904s-9.296 29.2-27.888 29.2h-172.624c-25.216 0-18.592-29.2-18.592-29.2s38.512-327.52 41.168-347.44 23.248-25.792 23.248-25.792l45.136 289.648c3.328 21.232 17.92 27.2 24.56 27.872zM538.528 320.928h-393.008c-11.728 0-21.248-9.504-21.248-21.232l-41.152-262.4c0-11.744 9.52-21.248 21.248-21.248h393.008c11.712 0 21.248 9.504 21.248 21.248l41.152 262.4c0 11.728-9.488 21.232-21.248 21.232z" horiz-adv-x="559" /> +<glyph unicode="" d="M368.224 408.656c-22.656 0-66.656-32-104-32-37.328 0-84 32-104 32-137.328 0-216-369.312-113.328-369.312 86.672 0 98.336 108 216.992 108 96 0 152.336-106.688 216.336-106.688 102.656 0 25.344 368-112 368zM152.208 200.656c-39.76 0-72 32.256-72 72 0 39.76 32.24 72 72 72s72-32.24 72-72c0-39.744-32.224-72-72-72zM343.216 240.656c-8.848 0-16 7.152-16 16s7.152 16 16 16 16-7.152 16-16-7.152-16-16-16zM392.224 192.656c-8.848 0-16 7.152-16 16s7.152 16 16 16 16-7.152 16-16-7.168-16-16-16zM392.224 288.656c-8.848 0-16 7.152-16 16s7.152 16 16 16 16-7.152 16-16-7.168-16-16-16zM440.224 240.656c-8.848 0-16 7.152-16 16s7.152 16 16 16 16-7.152 16-16-7.168-16-16-16zM152.208 312.656c-22.080 0-40-17.904-40-40s17.92-40 40-40c22.096 0 40 17.904 40 40s-17.904 40-40 40z" horiz-adv-x="527" /> +<glyph unicode="" d="M432.208 75.552v-29.2h-352.416v29.2c0 0-7.536 16.144 33.36 54.864 40.864 38.704 35.488 138.752 35.488 206.512s95.168 69.2 95.168 69.2h3.264c0-0.032 0 0.464 0 11.008 0 6.768-22.72 31.28-22.72 31.28l-0.336 14.832h64.16l-0.432-15.392c0 0-24.624-24.496-24.624-31.712 0-6.976 0-9.312 0-10h5.072c0 0 95.168-1.44 95.168-69.2s-5.376-167.824 35.504-206.544 33.344-54.848 33.344-54.848zM296.192 30.88c0-22.16-17.952-46.128-40.096-46.128s-40.096 23.968-40.096 46.128c0-0.496 80.192 0.512 80.192 0z" /> +<glyph unicode="" d="M444.672 75.552l0.016-29.2h-333.92l264.912 264.928c-0.48-65.264-0.336-146.816 35.648-180.88 40.88-38.72 33.344-54.848 33.344-54.848zM66.784 48.32l340.24 340.224 11.328-11.344-340.224-340.224-11.344 11.344zM125.632 130.4c40.88 38.72 35.504 138.752 35.504 206.528s95.168 69.2 95.168 69.2h3.248c0-0.032 0 0.464 0 11.008 0 6.768-22.72 31.28-22.72 31.28l-0.336 14.832h64.16l-0.448-15.392c0 0-24.608-24.496-24.608-31.712 0-6.976 0-9.312 0-10h5.072c0 0 60.816-1.024 85.168-36.080l-254.544-254.56c3.984 4.56 8.576 9.456 14.336 14.896zM308.672 30.88c0-22.16-17.952-46.128-40.096-46.128-22.16 0-40.112 23.968-40.112 46.128 0-0.496 80.208 0.512 80.208 0z" /> +<glyph unicode="" d="M245.296 163.84c-0.416 0.288-48.544 81.2-48.704 82.24-9.952 21.744-17.984 43.984-1.248 53.856l-69.456 117.12c-18-13.456-68.912-86.48 26.384-251.968 100.384-174.4 195.92-167.152 215.072-155.344l-67.68 114.32c-16-9.408-29.472 6.096-54.368 39.776zM413.792 54.128l0.016 0.096c0 0-52.848 89.056-52.88 89.088-4.192 7.056-13.2 9.28-20.224 5.184l-32.384-19.152 67.872-114.656c0 0 32.384 19.056 32.368 19.12h0.064c7.44 4.416 9.152 13.536 5.168 20.32zM236.576 324.224v0.064c7.44 4.4 9.184 13.52 5.2 20.24l0.032 0.096c0 0-54.368 91.664-54.4 91.68-4.176 7.088-13.216 9.28-20.208 5.184l-32.384-19.152 69.376-117.184c0 0 32.368 19.024 32.384 19.072z" /> +<glyph unicode="" d="M416-32h-336c-17.68 0-32 14.336-32 32v384c0 17.68 14.32 32 32 32v-384c0-17.664 14.336-32 32-32h64c17.68 0 32 14.336 32 32v384h208c17.68 0 32-14.336 32-32v-384c0-17.664-14.32-32-32-32zM336 16h32v32h-32v-32zM336 64h32v32h-32v-32zM336 112h32v32h-32v-32zM336 160h32v32h-32v-32zM288 16h32v32h-32v-32zM288 64h32v32h-32v-32zM288 112h32v32h-32v-32zM288 160h32v32h-32v-32zM416 368c0 8.848-7.152 16-16 16h-144c-8.832 0-16-7.152-16-16v-64c0-8.832 7.168-16 16-16h144c8.848 0 16 7.168 16 16v64zM416 192h-32v-32h32v32zM416 144h-32v-32h32v32zM416 96h-32v-32h32v32zM416 48h-32v-32h32v32zM176 16h-64c-8.832 0-16 7.152-16 16v400c0 8.848 7.168 16 16 16h31.008v32h16.992v-32h16c8.832 0 16-7.152 16-16v-400c0-8.848-7.168-16-16-16z" /> +<glyph unicode="" d="M448-16h-384c-26.512 0-48 21.504-48 48v224c0 26.512 21.488 48 48 48h384c26.496 0 48-21.488 48-48v-224c0-26.496-21.504-48-48-48zM128 191.344c-26.512 0-48-25.072-48-56 0-30.944 21.488-56 48-56 26.496 0 48 25.056 48 56 0 30.928-21.504 56-48 56zM252.48 177.632c-1.84 3.792-4.304 6.752-7.328 8.848-3.040 2.112-6.816 3.536-11.312 4.288-3.2 0.592-7.84 0.88-13.92 0.88h-28.528v-110.624h16.128v32.256h13.472c12.96 0 21.888 5.696 26.864 11.088 4.944 5.408 7.424 28.992 7.424 36.784-0.016 4.512-0.944 12.688-2.8 16.48zM336.384 96.88h-48.928v32.128h47.296v14.88h-47.296v32.88h48.8v14.88h-63.92v-110.624h64.048v15.856zM431.264 191.632h-14.624v-84.96l-48.192 84.96h-16.432v-110.624h15.632v80.976l48.192-80.976h15.44v110.624zM221.168 129.12h-13.648v47.632h13.408c5.488 0 9.248-0.272 11.296-0.816 3.152-0.88 5.712-2.656 7.648-5.376 1.936-2.72 2.912-6 2.912-9.808 0-5.28-1.648-24.352-4.944-27.264-3.296-2.912-8.848-4.368-16.672-4.368zM128 94c-17.664 0-32 17.904-32 40s14.336 40 32 40 32-17.904 32-40-14.336-40-32-40zM400 304l-117.152 87.2c-5.504-4.432-12.4-7.2-20-7.2-10.592 0-19.904 5.2-25.712 13.136l-125.136-93.136h-16l135.888 104.288c-0.608 2.48-1.040 5.040-1.040 7.712 0 17.664 14.336 32 32 32 17.68 0 32-14.336 32-32 0-5.744-1.648-11.072-4.304-15.744l125.456-96.256h-16z" /> +<glyph unicode="" d="M448-16h-384c-26.512 0-48 21.504-48 48v224c0 26.512 21.488 48 48 48h32l135.888 104.288c-0.608 2.48-1.024 5.040-1.024 7.712 0 17.664 14.336 32 32 32s31.984-14.336 31.984-32c0-5.744-1.632-11.072-4.304-15.744l125.456-96.256h32c26.496 0 48-21.488 48-48v-224c0-26.496-21.504-48-48-48zM273.136 86.672h64.496v12.128h-50.88v91.008h-13.632v-103.136zM180.848 86.672l11.296 31.248h43.328l11.872-31.248h15.552l-42.048 103.12h-14.784l-39.648-103.12h14.432zM85.472 177.696c-2.944-4.544-4.416-9.424-4.416-14.624 0-4.752 1.2-9.024 3.616-12.864s6.080-7.024 10.992-9.632c3.776-2.016 10.384-4.16 19.824-6.432s15.536-3.952 18.304-5.024c4.304-1.664 7.392-3.664 9.296-6.080s2.864-5.216 2.864-8.448c0-3.168-0.976-6.128-2.912-8.832s-4.896-4.832-8.88-6.384c-3.968-1.568-8.544-2.336-13.728-2.336-5.84 0-11.088 1.008-15.76 3.072-4.688 2.032-8.128 4.72-10.336 8.048s-3.648 7.584-4.256 12.752l-12.88-1.12c0.192-6.896 2.080-13.056 5.664-18.512 3.584-5.472 8.512-9.568 14.8-12.288 6.304-2.72 14.096-4.080 23.408-4.080 7.328 0 13.936 1.344 19.808 4.048 5.872 2.688 10.368 6.432 13.504 11.296 3.136 4.848 4.704 10 4.704 15.488 0 5.52-1.44 10.384-4.304 14.624-2.864 4.256-7.296 7.744-13.312 10.496-4.144 1.872-11.728 4.064-22.768 6.56-11.056 2.512-17.888 4.976-20.496 7.376-2.672 2.368-4 5.424-4 9.12 0 4.288 1.888 7.92 5.648 10.944 3.76 3.024 9.744 4.544 17.968 4.544 7.904 0 13.872-1.664 17.904-4.96 4.048-3.312 6.4-8.208 7.104-14.672l13.12 0.992c-0.24 6.048-1.92 11.456-5.040 16.224-3.136 4.768-7.616 8.384-13.44 10.848s-12.544 3.68-20.176 3.68c-6.928 0-13.216-1.168-18.88-3.52-5.696-2.336-10-5.76-12.944-10.304zM282.848 391.2c-5.504-4.432-12.384-7.2-19.984-7.2-10.592 0-19.904 5.2-25.728 13.136l-125.136-93.136h288l-117.152 87.2zM430.976 98.8h-63.248v35.12h56.992v12.128h-56.992v31.632h60.88v12.128h-74.496v-103.12h76.88v12.112zM213.024 179.040c1.664-5.648 4.096-12.8 7.312-21.488l10.864-28.512h-35.184l11.44 30.192c2.352 6.512 4.208 13.12 5.568 19.808z" /> +<glyph unicode="" d="M319.76 31.2l112.528 51.424v334.176l-112.528-51.408v-334.192zM192.24 82.624l111.68-46.288v334.192l-111.68 46.272v-334.176zM63.696 365.392v-334.192l112.688 46.272v334.192l-112.688-46.272z" /> +<glyph unicode="" d="M15.552 271.088c22.864 110 117.328 192.512 230.496 192.512 113.184 0 207.648-82.496 230.496-192.496h-460.992zM265.104 376.16l-18.272 37.28-18.784-37.28h-36.784l29.264-29.008-7.776-39.2 33.024 16.112 37.248-15.84-11.472 37.584 30.32 30.368h-36.768zM112.144 21.136c-44.064 32.576-79.728 82.448-93.984 138.080h93.984v-138.080zM143.936 191.744h-16.272v64.080h16.272v-64.080zM160.208 255.824h15.264v-64.080h-15.264v64.080zM160.208 176.48h-16.272v15.264h16.272v-15.264zM223.008-23.248c-22.8 2.336-43.632 8.064-64.064 16.592v165.872h64.064v-182.464zM208 176.48v15.264h16.272v-15.264h-16.272zM191.728 191.744v47.808h16.272v-47.808h-16.272zM208 255.824h16.272v-16.272h-16.272v16.272zM239.552 239.568v-47.808h-15.28v47.808h15.28zM303.616 255.824v-16.272h-15.264v-63.072h-16.272v63.072h-16.272v16.272h47.808zM335.888-5.52c-20.4-8.816-41.248-14.832-64.080-17.392v182.128h64.080v-164.736zM319.888 255.824h47.776v-16.272h-31.536v-16.272h31.536v-16.288h-31.536v-15.264h31.536v-15.264h-47.776v79.36zM383.664 23.184v136.032h90.256c-13.968-54.464-47.552-103.504-90.256-136.032z" /> +<glyph unicode="" d="M309.312 175.344c0 0-26.624-34-60.64 0-32.992 32-56.992 0-56.992 0l-79.472-156.64c-2.304-8.528 2.768-17.296 11.296-19.584h263.952c8.528 2.288 13.6 11.040 11.312 19.584l-89.456 156.64zM431.024 26.72l-127.664 214.848v0.4l-0.224 125.904h8.816c13.216 0 23.968 10.736 23.968 23.984 0 13.232-10.752 23.968-23.968 23.968h-127.92c-13.232 0-23.968-10.736-23.968-23.968 0-13.248 10.736-23.984 23.968-23.984h7.712l-0.256-125.936-110.528-215.216c-6.848-25.584 8.336-51.872 33.904-58.72h282.256c25.6 6.848 40.784 33.136 33.904 58.72zM392.848-15.968l-273.728 0.304c-17.040 4.576-27.152 22.112-22.592 39.136l111.152 217.856 0.336 142.528h-23.968c-4.4 0-7.984 3.584-7.984 8 0 4.4 3.584 7.984 7.984 7.984h127.92c4.4 0 7.968-3.584 7.968-7.984 0-4.416-3.568-8-7.968-8h-23.968l0.4-142 127.024-218.656c4.576-17.072-5.552-34.608-22.576-39.168zM263.68 439.808c0-8.832 7.168-16 16-16s16 7.168 16 16-7.152 16-16 16-16-7.152-16-16zM279.68 479.808c13.248 0 24 10.736 24 24s-10.752 24-24 24-24-10.736-24-24 10.752-24 24-24zM215.68 439.808c8.848 0 16 7.168 16 16s-7.152 16-16 16-16-7.168-16-16 7.152-16 16-16z" /> +<glyph unicode="" d="M270.432 336.512l19.968 94.784h-101.584l20.752-94.784h60.864zM209.136 318.768l-67.2-214.128 101.6-84.4 93.776 84.4-65.664 214.128h-62.512zM301.344 289.056l46.912-128.96h28.128v28.928l-75.040 100.032z" /> +<glyph unicode="" d="M356.848 57.712c-133.904-77.312-285.44-65.552-338.464 26.288-53.008 91.84 12.56 228.976 146.48 306.288 133.92 77.312 285.44 65.568 338.48-26.288 53.024-91.824-12.56-228.96-146.496-306.288zM40.16 204.288c-12.528-37.696-11.696-74.592 5.84-104.992 17.552-30.384 49.072-49.552 88-57.536l-93.84 162.528zM327.344 408.464c-46.4-3.040-97.584-18.336-146.576-46.608-49.84-28.8-89.232-66.272-115.056-105.696l126-218.24c47.056 2.656 99.2 18.016 149.072 46.8 48.976 28.288 87.808 64.976 113.664 103.648l-127.104 220.096zM480.912 240.912c13.024 38.192 12.4 75.616-5.344 106.384-17.776 30.784-49.872 50.016-89.472 57.824l94.816-164.208zM275.28 179.024l-12.976-7.504-15.52 26.848-0.064-0.032-14.656-8.464 15.504-26.848-12.992-7.504-15.504 26.848-0.064-0.032-14.656-8.464 15.504-26.848-12.992-7.504-15.504 26.864-0.064-0.048-27.712-16-8 13.856 27.776 16.048-16.192 28.048 12.992 7.504 16.208-28.048 14.72 8.496-16.208 28.080 12.992 7.488 16.208-28.048 14.72 8.496-16.192 28.064 12.992 7.488 16.208-28.048 14.72 8.496-16.192 28.064 12.992 7.488 16.192-28.048 14.72 8.496-16.192 28.048 12.976 7.504 16.224-28.048 14.72 8.496-16.224 28.064 12.992 7.488 16.192-28.048 28.944 16.688 8-13.856-28.944-16.704 15.504-26.848-12.976-7.504-15.504 26.848-14.72-8.496 15.504-26.848-12.992-7.504-15.504 26.848-0.064-0.032-14.656-8.464 15.504-26.848-12.992-7.504-15.504 26.848-0.064-0.032-14.656-8.464 15.472-26.864z" horiz-adv-x="521" /> +<glyph unicode="" d="M256 416c-106.048 0-192-85.968-192-192s85.952-192 192-192c106.032 0 192 85.968 192 192 0 106.032-85.968 192-192 192zM256 119.008c-57.44 0-104 46.56-104 104s46.56 104 104 104 104-46.56 104-104-46.56-104-104-104zM269.328 227.776c4.544 1.696 7.952 4.128 10.192 7.264s3.36 6.832 3.36 11.072c0 6.656-2.432 12.304-7.312 16.928-4.864 4.64-11.28 6.96-19.28 6.96-7.952 0-14.32-2.272-19.088-6.8-4.8-4.528-7.184-10.128-7.184-16.768 0-4.4 1.12-8.176 3.408-11.344 2.256-3.152 5.744-5.6 10.432-7.296-5.632-1.472-9.968-4.208-13.008-8.224-3.040-4.032-4.576-9.024-4.576-14.992 0-8 2.768-14.688 8.32-20.048 5.536-5.344 12.832-8.032 21.872-8.032 9.024 0 16.336 2.672 21.872 8 5.536 5.344 8.32 11.936 8.32 19.76 0 5.664-1.472 10.544-4.416 14.64s-7.264 7.040-12.912 8.88zM241.632 246.816c0 3.808 1.392 7.088 4.192 9.824 2.784 2.736 6.336 4.112 10.624 4.112 4.256 0 7.776-1.392 10.592-4.208 2.816-2.8 4.224-6.256 4.224-10.352 0-3.936-1.376-7.264-4.096-9.984s-6.256-4.080-10.592-4.080c-4.464 0-8.064 1.376-10.816 4.112s-4.128 6.256-4.128 10.576zM269.808 190.944c-3.472-3.472-7.888-5.184-13.28-5.184-3.44 0-6.672 0.816-9.664 2.464-3.008 1.648-5.264 3.968-6.752 6.976s-2.24 6.112-2.24 9.312c0 5.248 1.712 9.632 5.152 13.12s7.808 5.248 13.12 5.248c5.44 0 9.936-1.776 13.504-5.312s5.344-8.032 5.344-13.44c0.016-5.344-1.728-9.744-5.184-13.184z" /> +<glyph unicode="" d="M256 424c-110.464 0-200-89.536-200-200 0-110.448 89.536-200 200-200 110.448 0 200 89.552 200 200 0 110.464-89.552 200-200 200zM226.656 272c-13.248 0-24 10.752-24 24 0 13.264 10.752 24 24 24 13.264 0 24-10.736 24-24 0-13.248-10.736-24-24-24zM266.656 349.328c0 13.264 10.752 24 24 24 13.264 0 24-10.736 24-24s-10.736-24-24-24c-13.248 0-24 10.752-24 24zM312 232c-17.664 0-32 14.336-32 32s14.336 32 32 32 32-14.336 32-32-14.336-32-32-32z" /> +<glyph unicode="" d="M302.528 378.592h-91.968c0 0-61.088-114.656-61.088-213.040 0-52.272 22.208-138.96 22.448-138.96 15.936-63.456 27.28-58.496 87.6-58.496 55.6 0 71.408-5.008 83.952 58.432-0.288-0.272 19.056 85.84 19.056 139.008 0 107.168-60 213.056-60 213.056zM298.752 450.656c0 0 14.752 48.8 14.752 78.784s-15.216 74.752-55.936 74.752c-40.736 0-59.536-44.32-59.536-74.32 0-29.984 16.112-79.216 16.112-79.216h84.608zM295.152 403.664v25.072h-78.32v-25.056h78.32z" /> +<glyph unicode="" d="M214.848 351.2c27.44 0 34.304-13.712 52.576-11.424 18.288 2.288 2.288 34.288-13.712 57.136s-52.56 11.424-80-4.576c-27.424-16-173.136-104.576-173.136-104.576h127.424c0 0.016 59.424 63.44 86.848 63.44zM0 271.216v-208c0-17.664 14.32-32 32-32 0 0 123.36 0 257.328 0 24.032 0 46 74.672 70.672 74.672 21.424 0 37.536-74.672 58.656-74.672 142.288 0 269.328 0 269.328 0 17.68 0 32.016 14.336 32.016 32v208h-720zM288 127.2c0-26.496-21.504-48-48-48h-144c-26.512 0-48 21.504-48 48v48c0 26.512 21.488 48 48 48h144c26.496 0 48-21.488 48-48v-48zM672 127.2c0-26.496-21.504-48-48-48h-144c-26.512 0-48 21.504-48 48v48c0 26.512 21.488 48 48 48h144c26.496 0 48-21.488 48-48v-48zM452.56 339.776c18.288-2.288 25.136 11.424 52.576 11.424 27.424 0 86.864-63.424 86.864-63.424h127.424c0 0-145.712 88.576-173.136 104.576-27.44 16-64 27.424-80 4.576s-32-54.864-13.728-57.152z" horiz-adv-x="720" /> +<glyph unicode="" d="M560 32h-127.984v368h127.984c8.848 0 16-7.152 16-16v-336c0-8.832-7.152-16-16-16zM496.016 96h16v16h-16v-16zM496.016 128h16v16h-16v-16zM496.016 160h16v16h-16v-16zM464.016 96h15.984v16h-15.984v-16zM464.016 128h15.984v16h-15.984v-16zM464.016 160h15.984v16h-15.984v-16zM544.016 336h-80v-48h80v48zM544.016 176h-16v-16h16v16zM544.016 144h-16v-16h16v16zM544.016 112h-16v-16h16v16zM0 48v336c0 8.848 7.168 16 16.016 16h400v-368h-400c-8.848 0-16.016 7.168-16.016 16zM384.624 199.856c8.848 0 16 7.168 16 16 0 8.848-7.152 16-16 16-8.832 0-16-7.152-16-16 0-8.832 7.168-16 16-16zM64 112c0-8.832 7.168-16 16.016-16h255.984c8.848 0 16 7.168 16 16v208c0 8.848-7.152 16-16 16h-255.984c-8.848 0-16.016-7.152-16.016-16v-208z" horiz-adv-x="576" /> +<glyph unicode="" d="M128 48c0-8.848 7.152-16 16-16h16v-16h32v16h128v-16h32v16h16c8.832 0 16 7.152 16 16v128h-256v-128zM144 160h16v-48h-16v48zM368 416h-224c-8.848 0-16-7.168-16-16v-208h256v208c0 8.832-7.152 16-16 16zM160 208h-16v48h16v-48z" /> +<glyph unicode="" d="M480 16h-464c-8.848 0-16 7.168-16 16v272h496v-272c0-8.832-7.168-16-16-16zM432 256c0 8.848-7.168 16-16 16h-336c-8.848 0-16-7.152-16-16v-192c0-8.832 7.152-16 16-16h336c8.832 0 16 7.168 16 16v192zM144 240h208v-16h-208v16zM0 384c0 8.848 7.152 16 16 16h32c0 0 3.584 16 7.984 16h128.016c4.4 0 8-16 8-16h112c0 0 3.584 16 8 16h128c4.4 0 8-16 8-16h32c8.832 0 16-7.152 16-16v-64h-496v64zM455.664 335.664c13.264 0 24 10.736 24 24 0 13.248-10.736 24-24 24-13.248 0-24-10.752-24-24 0-13.264 10.736-24 24-24zM392.656 335.664c13.248 0 24 10.736 24 24 0 13.248-10.752 24-24 24s-24-10.752-24-24c0-13.264 10.752-24 24-24zM328.656 335.664c13.264 0 24 10.736 24 24 0 13.248-10.736 24-24 24-13.248 0-24-10.752-24-24 0-13.264 10.752-24 24-24zM264.656 335.664c13.248 0 24 10.736 24 24 0 13.248-10.752 24-24 24s-24-10.752-24-24c0-13.264 10.752-24 24-24z" /> +<glyph unicode="" d="M64 272v-240c0-8.848 7.152-16 16-16h336c8.832 0 16 7.152 16 16v240c0 0-90.288 32.992-184.16 32.992-90.048 0-183.84-32.992-183.84-32.992zM344 158c0-50.816-41.184-92-92-92s-92 41.184-92 92 41.184 92 92 92 92-41.184 92-92zM416 416h-336c-8.848 0-16-7.152-16-16v-112c0 0 92.992 32 183.84 32 93.152 0 184.16-32 184.16-32v112c0 8.848-7.168 16-16 16zM176 352h-80v32h80v-32zM295.984 352c-8.832 0-15.984 7.168-15.984 16s7.152 16 15.984 16c8.848 0 16.016-7.168 16.016-16s-7.168-16-16.016-16zM344 352c-8.848 0-16 7.168-16 16s7.152 16 16 16c8.832 0 16-7.168 16-16s-7.168-16-16-16zM391.008 352c-8.848 0-16 7.168-16 16s7.152 16 16 16c8.832 0 16-7.168 16-16s-7.184-16-16-16zM176.992 158c0-41.424 33.584-75.008 75.008-75.008s75.008 33.584 75.008 75.008c0 0.096-25.664-26.336-75.008 3.008-49.344 29.328-75.008-2.912-75.008-3.008z" /> +<glyph unicode="" d="M367.296-15.552h-79.744c-52.864 0-95.696 42.848-95.696 95.696v143.552h96.704v-31.904c0-17.616 13.28-31.888 30.912-31.888h15.936c17.632 0 31.904 14.288 31.904 31.888v31.904h96.688v-143.552c0-52.848-43.856-95.696-96.704-95.696zM367.296 255.6c0 17.616-14.288 31.904-31.904 31.904v0 94.704c0 0-20.928 0.992 30.912 0.992 51.84 0 97.696-33.888 97.696-95.696 0-31.728 0-43.168 0-46.848h-96.704v14.944zM320.608 394c0 30.832-14.512 48-43.568 48-30.736 0-54.256-22.144-70.544-66.416l-3.344-9.072c-19.056-51.76-46.992-77.648-83.76-77.648-14.848 0-28.704 5.664-41.584 16.96-12.88 11.312-19.312 23.456-19.312 36.464 0 6.432 3.008 9.664 9.056 9.664 4.080 0 8.288-5.136 12.624-15.392 7.872-18.944 21.024-28.416 39.424-28.416 13.936 0 25.328 4.496 34.208 13.52 8.88 9.008 18.976 26.336 30.272 51.984l7.296 16.176c21.424 47.872 50.288 71.808 86.544 71.808 41.552 0 62.32-23.712 62.32-67.632h-19.632zM351.344 247.632v-47.84c0-13.216-10.704-23.92-23.92-23.92s-23.92 10.704-23.92 23.92v47.84c0 13.216 10.704 23.936 23.92 23.936s23.92-10.72 23.92-23.936zM288.544 383.2c51.824 0 31.888-0.992 31.888-0.992v-94.704c-17.616 0-31.888-14.288-31.888-31.904v-14.96h-96.704c0 3.68 0 15.12 0 46.848 0 61.824 44.864 95.712 96.704 95.712z" /> +<glyph unicode="" d="M256 416c-106.048 0-192-85.968-192-192s85.952-192 192-192c106.032 0 192 85.968 192 192s-85.968 192-192 192zM320 323.008c13.248 0 24-14.336 24-32s-10.752-32-24-32-24 14.336-24 32 10.752 32 24 32zM190.8 322.8c13.248 0 24-14.336 24-32s-10.752-32-24-32-24 14.336-24 32 10.752 32 24 32zM254 107.008c-65.68 0-109.712 42.992-117.632 114.496h15.504c12.56-55.328 46.56-83.008 102-83.008s89.44 27.664 102 83.008h16c-7.904-71.52-52.192-114.496-117.872-114.496z" /> +<glyph unicode="" d="M256 416c-106.048 0-192-85.952-192-192 0-106.032 85.952-192 192-192 106.032 0 192 85.968 192 192 0 106.048-85.968 192-192 192zM319.008 324.992c13.248 0 24-14.336 24-32s-10.752-32-24-32-24 14.336-24 32 10.736 32 24 32zM191.008 324.992c13.248 0 24-14.336 24-32s-10.752-32-24-32-24 14.336-24 32 10.736 32 24 32zM254.88 155.856c-74 0-96.928-38.704-96.928-38.704s21.328 66.88 97.040 66.88c76.16 0 95.008-69.168 95.008-69.168s-21.12 40.992-95.12 40.992z" /> +<glyph unicode="" d="M256 24.496c-110.192 0-199.504 89.312-199.504 199.504s89.312 199.504 199.504 199.504c110.176 0 199.504-89.312 199.504-199.504s-89.328-199.504-199.504-199.504zM191.952 328.432c-13.776 0-24.944-14.88-24.944-33.248 0-18.352 11.152-33.248 24.944-33.248 13.76 0 24.944 14.896 24.944 33.248 0 18.384-11.184 33.248-24.944 33.248zM189.584 185.744l-8.32-14.4 58.544-33.808-59.6-34.384 8.32-14.384 67.904 39.184 67.904-39.184 8.32 14.384-59.6 34.384 58.544 33.808-8.32 14.4-66.864-38.608-66.832 38.608zM320.752 328.304c-13.744 0-24.928-14.896-24.928-33.248 0-18.368 11.168-33.248 24.928-33.248 13.776 0 24.96 14.88 24.96 33.248-0.016 18.352-11.184 33.248-24.96 33.248z" /> +<glyph unicode="" d="M334.448 95.776l47.344 63.744 55.6 53.12c0 0-18.528 22.096-41.44 22.096-10.288 0-19.712-2.944-28.32-8.832-8.56-5.872-16.368-14.688-23.408-26.48-9.84-3.44-17.504-6.72-23.008-9.84-1.216 12.256-2.688 21.328-4.4 27.2l31.936 123.968c7.568 29.888 9.376 44.992-8.624 52.992s-36.4-14.064-45.872-42.192l-30.288-95.728 0.912 123.104c0 30.224-9.536 45.328-28.608 45.328-19.264 0-28.88-13.392-28.88-40.16v-123.072l-30.976 107.808c-7.68 19.072-21.2 37.856-39.2 31.856s-17.152-35.616-12.16-54.576l27.6-105.104-44.512 73.52c-13.616 23.6-37.104 28.16-42.416 22.656-8.464-8.784-14.128-27.472 1.232-54.304l49.104-85.488 43.84-151.872v-29.52h128v38.064c14.864 10.192 27.712 24.096 46.544 41.712v0z" /> +<glyph unicode="" d="M495.472 290.304c-2.864 62.304-27.808 124.464-76.288 172.048-48.56 47.648-112.016 72.144-175.6 74.88l-3.504 35.408c73.552-4.4 145.152-32.976 201.52-88.272 56.48-55.44 85.936-125.584 90.336-197.92l-36.464 3.856zM447.6 282.656l-35.104 4.848c0.576 43.232-15.584 87.008-49.2 120-32.96 32.336-76.464 48.224-119.664 48.32l-6.336 34.736c53.504-1.296 106.96-21.632 147.792-61.68 41.536-40.832 61.92-92.752 62.512-146.224zM362.912 284.736l-31.152 8.624c3.664 22.048-8.096 41.312-25.424 58.336-15.728 15.44-36.864 22.368-57.424 20.832l-12.048 34.56c32.864 2.128 66.432-9.136 91.552-33.792 24.768-24.32 36.272-56.736 34.496-88.56zM296.896 303.856c0-22.416-18.512-40.592-41.36-40.592-7.888 0-15.184 2.288-21.456 6.048l-17.776-17.472 128.64-124.896c-3.152-3.712-6.448-7.44-10.256-11.168-72.128-70.784-189.072-70.784-261.216 0-72.144 70.816-72.144 185.584 0 256.368 3.296 3.264 6.592 6 9.888 8.768l121.168-117.648 17.392 17.072c-4.848 6.64-7.76 14.72-7.76 23.52 0 22.416 18.528 40.592 41.376 40.592s41.36-18.16 41.36-40.592zM139.040 61.632c-1.52 0 42.032-93.632 42.032-93.632h-181.072l62.464 144.656c0 0 18.96-27.632 76.576-51.024z" /> +<glyph unicode="" d="M0 146.192l178.192-178.192c0 0 42.544 100.976-17.328 160.848-59.216 59.216-160.864 17.344-160.864 17.344zM478 132.032l-90.496-90.496 11.312-11.312 90.496 90.496-11.312 11.312zM523.248 109.408l-101.808 101.84c-12.496 12.464-32.784 12.464-45.248 0l-8.928-8.928-24.96 24.96 44.752 44.752c12.496 12.496 11.088 34.176-1.408 46.672l-55.152 55.152c-12.496 12.496-32.752 12.496-45.248 0l-40.688-39.264-21.44 21.44 1.456 1.44c12.496 12.496 12.496 32.768 0 45.264l-101.824 101.84c-12.496 12.496-32.752 12.496-45.264 0l-67.872-67.888c-12.496-12.496-12.496-32.768 0-45.264l101.824-101.824c12.496-12.496 32.752-12.496 45.264 0l22.256 22.256 22.048-22.24-40.944-40.944c-12.496-12.496-7.776-82.048-7.776-82.048l27.568-27.568c0 0 69.536-4.72 82.032 7.776l35.424 35.408 24.96-24.96-13.984-13.984c-12.496-12.496-12.496-32.752 0-45.248l101.84-101.808c12.496-12.496 32.752-12.496 45.248 0l67.872 67.872c12.496 12.544 12.496 32.8 0 45.296zM20.928 425.376l67.888 67.888c6.24 6.256 16.368 6.256 22.624 0l-90.512-90.512c-6.256 6.24-6.256 16.384 0 22.624zM32.24 391.44l90.512 90.512 11.312-11.312-90.512-90.512-11.312 11.312zM54.864 368.816l90.512 90.512 11.312-11.328-90.496-90.496-11.328 11.312zM77.504 346.176l90.496 90.512 11.328-11.312-90.512-90.512-11.312 11.312zM100.128 323.552l90.512 90.512 11.312-11.312-90.512-90.512-11.312 11.312zM145.376 300.928c-6.24-6.256-16.368-6.256-22.624 0l90.512 90.512c6.256-6.256 6.256-16.384 0-22.624l-67.888-67.888zM190.528 216.032l-8.48 8.496 116.96 116.96 8.496-8.48-116.976-116.976zM319.6 132.032l67.904 67.904c6.256 6.224 16.368 6.224 22.624 0l-90.528-90.528c-6.256 6.256-6.256 16.368 0 22.624zM511.936 75.472l-67.872-67.872c-6.256-6.256-16.368-6.256-22.624 0l-67.888 67.888 90.496 90.496-11.312 11.312-90.528-90.496-11.312 11.312 90.528 90.528 90.496-90.528c6.272-6.272 6.272-16.4 0.016-22.64zM500.624 109.408l-90.496-90.496 11.312-11.312 90.496 90.496-11.312 11.312zM455.376 154.656l-90.496-90.496 11.312-11.312 90.496 90.496-11.312 11.312z" horiz-adv-x="532" /> +<glyph unicode="" d="M255.984 263.504c-72.688 0-131.632-58.944-131.632-131.632s58.944-131.632 131.632-131.632c72.704 0 131.632 58.944 131.632 131.632s-58.928 131.632-131.632 131.632zM255.984 19.472c-61.504 0-111.376 49.872-111.376 111.408 0 61.504 49.872 111.36 111.376 111.36 61.536 0 111.376-49.856 111.376-111.36 0-61.536-49.84-111.408-111.376-111.408zM322.176 368.8l45.184 78.96h-222.752l45.872-78.96h131.696zM345.808 234.384l80.672 132.768-54.096 78.304-101.6-178.64c44.576-3.728 75.024-32.432 75.024-32.432zM240.848 267.808l-101.248 177.648-54.080-78.304 78.304-135.104c-0.016 0 28.416 29.312 77.024 35.76zM237.888 161.216c-6.128-4.784-11.776-8-16.992-9.712v-18.096c9.904 3.248 18.512 8.288 25.808 15.12v-75.376h20v104.784h-16.224c-2.272-6.336-6.464-11.936-12.592-16.72z" /> +<glyph unicode="" d="M147.088 159.408c-20 0-22.656 9.344-22.656 9.344l-78-153.28 62.544 7.008 34.592-52c0 0 72 150.288 72 149.28-37.28 0.896-22.48 38.64-68.48 39.648zM322.912 142.96c9.712 16.32 24.064 24.592 43.056 24.848 18.976 0.256 28.592 9.872 28.848 28.864 0.256 18.976 8.528 33.328 24.848 43.024 16.32 9.696 19.84 22.848 10.56 39.408s-9.28 33.136 0 49.696 5.744 29.696-10.56 39.408-24.592 24.048-24.848 43.040c-0.256 18.976-9.872 28.592-28.848 28.848-19.008 0.256-33.344 8.528-43.056 24.848-9.68 16.32-22.848 19.84-39.408 10.56s-33.12-9.28-49.68 0-29.696 5.744-39.408-10.56c-9.712-16.32-24.048-24.592-43.040-24.848-18.976-0.272-28.592-9.888-28.848-28.864-0.256-18.992-8.528-33.328-24.848-43.040s-19.84-22.848-10.56-39.408c9.28-16.56 9.28-33.136 0-49.696-9.28-16.56-5.744-29.696 10.56-39.408 16.32-9.712 24.592-24.064 24.848-43.024 0.256-18.992 9.872-28.608 28.848-28.864 18.992-0.256 33.328-8.528 43.040-24.848 9.696-16.32 22.848-19.824 39.408-10.56s33.12 9.264 49.68 0 29.712-5.744 39.408 10.576zM280.288 223.936h-28.496v107.616c-10.416-9.744-22.72-16.944-36.88-21.616v25.872c7.44 2.432 15.536 7.040 24.272 13.84s14.72 14.72 17.968 23.776h23.136v-149.488zM386.56 162.752c-56.992-6-45.408-20.096-58.4-31.088-15.008-16-33.712-12.912-33.712-12.912l88-151.28 21.6 56 61.536-8-79.024 147.28z" /> +<glyph unicode="" d="M64 448v-448h368v448h-368zM104 23.344c-8.848 0-16 7.152-16 16 0 8.832 7.152 16 16 16 8.832 0 16-7.168 16-16 0-8.848-7.168-16-16-16zM104.336 392c-8.832 0-16 7.168-16 16 0 8.848 7.168 16 16 16 8.848 0 16-7.152 16-16 0-8.832-7.168-16-16-16zM336 64h-176v320h176v-320zM391.328 24.672c-8.832 0-16 7.168-16 16s7.168 16 16 16 16-7.168 16-16-7.168-16-16-16zM391.664 392c-8.832 0-16 7.168-16 16 0 8.848 7.168 16 16 16 8.848 0 16-7.152 16-16 0-8.832-7.168-16-16-16zM304 352h-112v-160h112v160zM304 176h-112v-80h112v80z" /> +<glyph unicode="" d="M285.392 199.328l-160.784-160.784c-12.448-12.448-32.688-12.416-45.184 0.080-12.496 12.48-12.528 32.72-0.080 45.168l12.224 12.224-34.64 34.656c-6.256 6.24-6.272 16.352-0.048 22.592 6.24 6.24 16.336 6.208 22.592-0.048l34.656-34.656 11.28 11.28-12.032 12.032c-6.256 6.256-6.272 16.352-0.032 22.592 6.224 6.224 16.336 6.224 22.592-0.032l12.016-12.032 11.28 11.28-34.656 34.656c-6.256 6.256-6.272 16.336-0.032 22.576 6.224 6.24 16.336 6.224 22.592-0.032l34.64-34.656 58.384 58.384c-37.84 52.72-42.544 115.648-7.68 150.496 40.48 40.48 118.896 27.712 175.12-28.528s69.008-134.64 28.512-175.12c-34.896-34.896-97.952-30.112-150.72 7.872zM373.584 332.768c-24.992 24.992-57.888 32.64-73.456 17.056s-7.936-48.448 17.056-73.456c24.992-24.992 57.872-32.624 73.456-17.056s7.92 48.464-17.056 73.456z" /> +<glyph unicode="" d="M430.672 183.712l-214.96 214.96c-9.376 9.376-9.376 24.576 0 33.936 9.376 9.376 24.56 9.376 33.936 0l50.912-50.912 62.24 62.224c9.376 9.376 24.56 9.376 33.936 0 9.376-9.36 9.376-24.56 0-33.936l-62.224-62.224 45.248-45.248 62.224 62.224c9.376 9.376 24.576 9.376 33.952 0 9.36-9.376 9.36-24.56 0-33.936l-62.24-62.24 50.928-50.912c9.36-9.376 9.36-24.56 0-33.936-9.376-9.376-24.576-9.376-33.952 0zM334.512 98.864c-20.752-20.736-113.136-22.624-113.136-22.624l-113.136 113.136c0 0 1.888 92.384 22.624 113.136 20.752 20.736 79.2 79.184 79.2 79.184l203.648-203.648c-0.016 0.016-58.464-58.432-79.2-79.184zM108.24 166.752l90.512-90.512c6.256-6.256 6.256-16.368 0-22.624s-16.384-6.256-22.64 0l-90.496 90.512c-6.256 6.256-6.256 16.368 0 22.624s16.368 6.24 22.624 0zM153.488 53.616c0 0-7.6-7.616-16.976-16.976-9.376-9.376-24.56-9.376-33.936 0l-5.664 5.664-45.264-45.248-22.624 22.624 45.264 45.248-5.648 5.648c-9.376 9.376-9.376 24.576 0 33.952s17.904 16.016 17.904 16.016l66.944-66.928z" /> +<glyph unicode="" d="M64-16v256h48v80c0 70.688 57.296 128 128 128h16c70.688 0 128-57.312 128-128v-80h48v-256h-368zM235.904 115.408l-11.904-83.408h48l-11.92 83.408c11.664 4.768 19.92 16.208 19.92 29.6 0 17.664-14.336 32-32 32-17.68 0-32-14.336-32-32 0-13.392 8.24-24.832 19.904-29.6zM336 312c0 48.608-39.408 88-88 88-48.608 0-88-39.392-88-88v-72h176v72z" /> +<glyph unicode="" d="M464 240v72c0 48.608-39.408 88-88 88-48.608 0-88-39.392-88-88v-73.136h80v-254.864h-368v256h240v80c0 70.688 57.296 128 128 128h16c70.688 0 128-57.312 128-128v-80h-48zM184 176.992c-17.68 0-32-14.336-32-32 0-13.392 8.24-24.832 19.904-29.6l-11.904-83.392h48l-11.92 83.408c11.664 4.768 19.92 16.208 19.92 29.6 0 17.664-14.336 31.984-32 31.984z" /> +<glyph unicode="" d="M256-16c-83.952 0-152 68.064-152 152 0 54.56 28.832 102.256 72 129.072v94.928c0 48.608 39.408 88 88 88s88-39.392 88-88v-106.192c34.16-27.872 56-70.272 56-117.808 0-83.936-68.048-152-152-152zM320 360c0 30.928-25.056 56-56 56-30.928 0-56-25.072-56-56v-79.856c15.104 5.024 31.2 7.856 48 7.856 22.912 0 44.528-5.2 64-14.272v86.272zM256 264c-70.688 0-128-57.312-128-128s57.312-128 128-128 128 57.312 128 128-57.312 128-128 128zM256 16c-66.288 0-120 53.712-120 120s53.712 120 120 120c66.288 0 120-53.712 120-120s-53.712-120-120-120zM280 168c0 13.248-10.752 24-24 24s-24-10.752-24-24c0-11.376 8.064-20.432 18.672-22.944l-18.672-73.056h48.992l-21.024 72.816c11.28 1.936 20.032 11.344 20.032 23.184z" /> +<glyph unicode="" d="M448 256v104c0 30.928-25.072 56-56 56s-56-25.072-56-56v-94.928c43.152-26.816 72-74.512 72-129.072 0-83.952-68.048-152-152-152s-152 68.048-152 151.984c0 83.952 68.048 152 152 152 16.8 0 32.896-2.832 48-7.856v79.872c0 48.592 39.408 88 88 88s88-39.408 88-88v-104h-32zM256 264c-70.688 0-128-57.312-128-128s57.312-127.984 128-127.984 128 57.296 128 127.984c0 70.688-57.312 128-128 128zM256 16c-66.288 0-120 53.712-120 119.984 0 66.304 53.712 120.016 120 120.016s120-53.712 120-120.016c0-66.272-53.712-119.984-120-119.984zM280 167.984c0 13.264-10.752 24-24 24s-24-10.736-24-24c0-11.344 8.064-20.432 18.672-22.912l-18.672-73.072h48.992l-21.024 72.8c11.28 1.968 20.032 11.344 20.032 23.184z" /> +<glyph unicode="" d="M466.496 0.624l-11.344-11.344c-12.56-12.544-32.88-12.544-45.408 0l-90.816 90.784c-10.496 10.528-11.664 26.304-4.496 38.592l-49.664 49.632c-26.704-19.808-59.648-31.664-95.44-31.664-88.64 0-160.496 71.856-160.496 160.496 0 88.656 71.856 160.512 160.496 160.512 88.656 0 160.496-71.856 160.496-160.512 0-41.264-15.68-78.768-41.28-107.2l48.56-48.56c12.288 7.152 28.064 6 38.56-4.528l90.816-90.784c12.544-12.56 12.544-32.896 0.016-45.424zM289.408 297.776c0 66.48-53.904 120.368-120.384 120.368s-120.384-53.872-120.384-120.368 53.888-120.368 120.368-120.368 120.4 53.888 120.4 120.368z" /> +<glyph unicode="" d="M466.496 0.624l-11.344-11.344c-12.56-12.544-32.88-12.544-45.408 0l-90.816 90.784c-10.496 10.528-11.664 26.304-4.496 38.592l-49.664 49.632c-26.704-19.808-59.648-31.664-95.44-31.664-88.64 0-160.496 71.856-160.496 160.496 0 88.656 71.856 160.512 160.496 160.512 88.656 0 160.496-71.856 160.496-160.512 0-41.264-15.68-78.768-41.28-107.2l48.56-48.56c12.288 7.152 28.064 6 38.56-4.528l90.816-90.784c12.544-12.56 12.544-32.896 0.016-45.424zM289.408 297.776c0 66.48-53.904 120.368-120.384 120.368s-120.384-53.872-120.384-120.368 53.888-120.368 120.368-120.368 120.4 53.888 120.4 120.368zM176.032 256.656h-16.048v31.088h-32.096v16.048h32.096v32.112h16.048v-32.112h32.112v-16.048h-32.112v-31.088z" /> +<glyph unicode="" d="M127.888 303.792h80.256v-16.048h-80.256zM466.496 46.032l-90.816 90.784c-10.496 10.528-26.288 11.68-38.56 4.528l-48.56 48.56c25.6 28.432 41.28 65.936 41.28 107.2 0 88.656-71.84 160.512-160.496 160.512-88.64 0-160.496-71.856-160.496-160.512 0-88.64 71.856-160.496 160.496-160.496 35.792 0 68.736 11.856 95.44 31.664l49.664-49.632c-7.152-12.304-6-28.064 4.496-38.592l90.816-90.784c12.528-12.544 32.848-12.544 45.408 0l11.344 11.344c12.512 12.544 12.512 32.88-0.016 45.424zM169.008 177.408c-66.48 0-120.368 53.888-120.368 120.368s53.888 120.368 120.368 120.368 120.384-53.888 120.384-120.368-53.888-120.368-120.384-120.368z" /> +<glyph unicode="" d="M143.744 335.248v48.256h304v-223.248h-48.256l0.992-48.496h-49.248v-47.248h-302.976v223.488h47.504v48.256l47.984-1.008zM431.248 368h-272v-32.752l241.248 0.992-0.992-160.496h31.744v192.256zM384 319.744h-272.752v-31.744h240v-159.744h32.752v191.488zM63.744 272.496v-192.496h272v192.496h-272z" /> +<glyph unicode="" d="M48 64h304v224h-304v-224zM95.008 304h272.992v-192h32v224h-304l-0.992-32zM144 384l-0.992-32h272.992v-192h32v224h-304z" /> +<glyph unicode="" d="M457.728 300.064l-201.728 138.112-201.728-138.112 201.728-138.096 201.728 138.096zM256 131.152l-178.064 117.408-23.664-24.56 201.728-138.096 201.728 138.096-23.984 25.088-177.744-117.936zM256 55.056l-178.064 117.408-23.664-24.56 201.728-138.096 201.728 138.096-23.984 25.088-177.744-117.936z" /> +<glyph unicode="" d="M256 368.64l29.968-48.64h-59.92l29.952 48.64zM396.784 139.776h-59.6l29.648 48.288 29.952-48.288zM115.232 139.776l29.952 48.288 29.648-48.288h-59.6zM191.904 112l64.096-104 64.112 104h127.888l-64.096 103.84 64.096 104.16h-127.888l-64.112 104-64.096-104h-127.904l64.112-104.16-64.112-103.84h127.904zM396.784 292.224l-29.952-48.56-29.648 48.56h59.6zM256 63.376l-29.952 48.624h59.92l-29.968-48.624zM162.256 215.84l46.72 76.384h94.064l46.736-76.384-47.024-76.064h-93.76l-46.736 76.064zM115.232 292.224h59.6l-29.648-48.56-29.952 48.56z" /> +<glyph unicode="" d="M95.664 304.416v-80.336h112.656v-191.84h80.672v191.84h111.328v80.336h-111.328v111.328h-80.672v-111.328h-112.656z" /> +<glyph unicode="" d="M306.912 58.752c-90.16 0-164.16 74.496-164.16 165.248 0 91.44 72.624 165.248 165.968 165.248 32 0 64-12.896 64-12.896-36.432 25.6-74.32 38.384-113.664 38.384-53.472 0-98.88-18.512-136.256-55.552s-56.048-82.096-56.048-135.184c0-52.752 18.608-97.728 55.808-134.944s82.176-55.808 134.944-55.808c68.192 0 109.952 35.216 115.216 38.656 0 0-33.808-13.152-65.808-13.152zM344.848 213.44l-17.024-52.864 44.912 32.48 44.656-32.48-17.024 52.864 44.912 32.32h-55.52l-17.040 52.768-17.28-52.768h-55.504l44.912-32.32z" /> +<glyph unicode="" d="M401.84 395.76l0.72 23.28c-43.104 21.568-90.976 34.48-143.568 34.48s-106.448-12.912-149.552-34.48l0.72-23.28 145.84-95.696 145.84 95.696zM256 407.104c30 0 55.168-9.616 55.168-9.616l-55.168-37.072-55.168 37.072c0 0 25.168 9.616 55.168 9.616zM289.168 96.368v112.32l7.488 96.56-40.656-26.736-39.664 26.736 8.48-96.56v-112.32h64.352zM198.24 315.584l-108.624 72.416-0.72 28.176h-63.936l9.488-136.8 77.6-55.456h94.832l-8.64 91.664zM74.96 309.552l102.592-48.288 1.712-15.824-101.712 46-2.592 18.112zM70.64 358.688l101.728-49.136 2.576-17.104-102.576 47.28-1.728 18.96zM68.928 55.216l75.76-38.784v150.592l-44.736 27.84v17.248l-43.968 30.176 12.944-187.072zM208.864 80.128v112.192l-49.136-24.992v-162.976l22.144-13.776 30.176 73.568h87.936l30.176-73.568 23.136 13.776v162.96l-49.136 24.992v-112.192h-95.296zM226.688 46.88l-22.416-62.912h103.456l-22.4 62.912h-58.64zM305.136 223.936h94.832l77.6 55.456 9.488 136.8h-63.936l-0.736-28.192-108.64-72.416-8.608-91.648zM434.448 291.44l-102.736-48 2.736 17.824 102.592 48.288-2.592-18.112zM439.632 339.728l-102.592-48.288 2.592 18.112 101.728 49.136-1.728-18.96zM456 242.304l-43.952-30.176v-17.248l-44.080-27.84v-150.592l75.104 38.784 12.928 187.072z" /> +<glyph unicode="" d="M312 412c-172.32 0-312-84.176-312-188s139.68-188 312-188 312 84.176 312 188-139.68 188-312 188zM488.88 103.52c0-0.992 31.216 37.712 6.24 63.696-29.984 33.984-81.856-16.896-81.856-16.896-40.992 80.944-102.784-50.32-102.784-50.32s-53.568 123.696-99.536 48.752c0.992 0-38.128 44.688-77.104 23.696-27.984-27.984 0-65.456 0-65.456-145.904 50.976-155.392 199.872 47.232 260.576-57.216-71.696 105.44-170.384 93.44 5.504l34.48-30.24c0 0 34.736 28.736 34.736 30.736-4-175.888 149.904-72.704 97.936-7.744 182.864-52.928 214.096-179.36 47.216-262.304z" horiz-adv-x="624" /> +<glyph unicode="" d="M479.408 80.288v95.152h-46.56v-95.504h-48.592v-47.248h-112.768v47.6h112.768v47.552h-239.856v-47.568l96.48-0.336v-47.568h-96.816v47.216h-48.576v96.16h-46.576v-95.152h-48.912v144.064h47.92v46.256h47.568v48.912h48.912v47.904h47.904v-48.048l143.728-0.384v48.432h47.904v-48.576h48.912v-47.584h47.248v-47.568h48.224v-143.712h-48.912zM192.304 271.92h-47.904v-47.92h47.904v47.92zM383.936 271.92h-47.904v-47.92h47.904v47.92zM95.488 415.632h48.912v-47.904h-48.912v47.904zM432.848 415.632v-47.904h-48.912v47.904h48.912z" horiz-adv-x="528" /> +<glyph unicode="" d="M319.536 246.368c9.248 1.408 26.656 7.552 32.784 12.336 6.688 3.904 10.16 8.544 10.368 13.952 0.656 8.24 0.288 16.24-1.12 24.016-1.408 7.792-2.992 16.656-4.72 26.608-18.816-29.648-44.336-49.648-76.576-60.032l-3.584-7.776c15.152-9.744 29.44-12.768 42.848-9.104v0zM214.72 263.248c-32.448 10.384-58.096 30.384-76.912 60.032-1.52-9.952-3.024-18.816-4.544-26.608-1.52-7.776-1.84-15.776-0.976-24.016 0.432-5.632 3.888-10.272 10.384-13.952 4.896-4.032 24.176-11.568 32.448-12.336 13.408-3.664 27.68-0.64 42.848 9.088l-3.248 7.792zM224.288 207.76c-2.48-6.496-2-16.592 1.472-25.248h15.056v47.648c-6.288-8.448-14.048-15.904-16.528-22.4zM256.848 182.512h14.528c0.864 2.368 1.52 7.008 1.952 8.864s0.656 3.84 0.656 6c0 5.84-1.264 11.136-3.76 15.904-2.496 4.752-9.024 10.368-13.376 16.88v-47.648zM425.088 341.536c3.248-12.768 4.336-25.744 3.248-38.944-2.16-26.4-13.408-52.896-33.744-73.664l17.856-34.080-26.304-29.856c-37.216 17.76-49.008-0.704-49.008-26.608v-106.384h-16.752v95.424h-15.136v-95.424h-17.408v95.424h-15.008v-95.424h-16.544v95.424h-15.008v-95.424h-16.528v95.136l-15.024 0.288v-95.424h-17.44v95.424h-15.088v-95.424h-16.56v106.384c0 26-13.872 45.68-51.168 26.608l-26.928 29.856 18.816 34.080c-20.336 20.768-31.216 47.216-33.6 73.808-1.2 13.328-0.224 26.352 2.912 39.12 15.952 64.896 71.936 75.168 82.912 76.912 62.48 8.656 125.088 8.656 187.792 0 10.704-1.84 67.408-13.104 83.712-77.232z" /> +<glyph unicode="" d="M273.168 240.048v-64.096c8.848 0 16.016-7.168 16.016-16.032v-16.016c0 0 49.072-20.032 49.072-63.088s-35.392-81.12-35.392-81.12h-91.792c0 0-34.048 38.064-35.040 81.12 0 44.064 49.056 63.088 49.056 63.088v16.016c0 8.864 7.168 16.032 16.016 16.032v64.096h-100.128v-106.976c6.864-1.808 12.032-7.776 12.032-15.216 0-8.848-7.184-16.016-16.032-16.016s-16.016 7.168-16.016 16.016c0 7.44 5.152 13.408 12.016 15.216v106.976h-52.080l122.16 192.272h109.536l118.512-192.272h-157.936z" /> +<glyph unicode="" d="M281.12 190.112c-25.568 20.896-41.888 52.672-41.888 88.272 0 17.888 4.48 34.592 11.824 49.664l-17.568 17.552-106.72-106.736c19.84-15.616 17.84-30.88-5.376-45.76l142.576-142.56h69.872c8.992 0 16.288-7.296 16.288-16.288v-16.288h-76.288l-0.176-0.176-0.176 0.176h-118.688v16.272c0 8.992 7.296 16.288 16.288 16.288h69.872l-134.496 134.48c-26.576-11.392-39.696-0.384-39.136 33.44 0.608 35.984 15.856 45.584 45.424 29.392l109.264 109.264-10.816 10.8c-6.352 6.336-6.352 16.656 0 23.008l34.528 34.528c6.352 6.352 16.672 6.352 23.024 0l41.6-41.632c13.248 5.392 27.664 8.48 42.848 8.48 37.472 0 70.752-16.080 91.504-44.032 0.704-0.176-162.992-158.4-163.584-158.144zM407.088 291.936c0 0 27.472-34.576 0-62.048s-61.712 0.336-61.712 0.336l61.712 61.712z" /> +<glyph unicode="" d="M429.44 210.816c0 0-17.904 29.328-37.808 29.328-19.872 0-40.752-30.32-40.752-30.32s-21.872 30.288-39.776 30.288c-15.152 0-32.992-20.832-38.16-27.264v-115.84c0-11.6-1.184-21.408-3.568-29.504-2.368-8.064-5.888-14.624-10.544-19.68-4.64-5.056-10.432-8.752-17.376-11.024-6.928-2.288-14.96-3.408-24.080-3.408-8.304 0-15.728 1.248-22.304 3.744-6.576 2.528-12.112 6.096-16.624 10.752s-7.984 10.256-10.4 16.848c-2.4 6.56-3.632 13.904-3.632 22v11.184h31.68c0-10.496-0.080-24.256 3.744-29.6 3.824-5.312 9.664-8 17.52-8 5.296 0 12.864 2.624 12.864 2.624s5.792 4.16 7.536 7.312c1.728 3.12 3.488 11.344 3.488 11.344s0.896 9.28 0.896 14.592v118.496c-7.088 8.016-24.48 25.952-38.416 25.952-17.888 0-42.752-29.824-42.752-29.824s-23.856 29.824-39.776 29.824c-15.904 0-38.768-29.824-38.768-29.824s-6.976 156.096 151.12 172l22.88 31.808 21.888-31.808c163.024-9.936 151.12-172 151.12-172z" /> +<glyph unicode="" d="M531.648 353.152l52.544-7.424-46.72-24.736 33.872-30.944-49.040 6.192 30.352-63.12-60.72 45.792-50.224-60.64 23.36 75.472-73.584-39.6 51.376 55.68-3.52 13.696c-13.872-6.912-33.52-13.968-54.064-13.152-27.248 0-61.088 19.008-101.52 52.992 0 0-45.776 48.416-84.256 48.416-39.584 0-35.712-59.552-35.664-60.144h44.832v-40.512c56.992-21.952 95.504-77.088 95.504-141.84 0-84-68.096-152.096-152.096-152.096s-152.080 68.128-152.080 152.128c0 64.736 39.504 119.888 96.496 141.84v40.512h40.064c-0.048 0.304-4.608 43.904 18.4 68.096 12.272 12.896 27.264 19.344 45.008 19.344 53.392 0 101.312-56.192 101.312-56.192 35.12-30.144 63.76-45.2 85.92-45.2 8.992 0 27.296 5.664 36.704 8.784l-28.912 22.752 50.224-3.696-38.528 59.392 63.056-44.544 7.008 42.080 11.664-38.368 46.72 55.68-10.512-61.872 53.712 12.368-46.688-37.136z" horiz-adv-x="584" /> +<glyph unicode="" d="M209.12 396.768l-92.736 24.848c-8.528 2.288-17.296-2.784-19.584-11.312l-95.248-355.456c-2.288-8.544 2.784-17.312 11.328-19.616l92.72-24.848c8.528-2.288 17.312 2.784 19.6 11.312l95.248 355.472c2.272 8.528-2.784 17.312-11.328 19.6zM124.48 80.912c-6.864-25.616-33.168-40.8-58.784-33.936s-40.8 33.168-33.936 58.784 33.168 40.816 58.784 33.936c25.616-6.864 40.8-33.184 33.936-58.784zM142.864 149.488l-92.72 24.848 49.68 185.456 92.736-24.864-49.696-185.44zM303.008 112c-13.264 0-24-10.752-24-24s10.736-24 24-24c13.248 0 24 10.752 24 24s-10.752 24-24 24zM172.976 323.632l-61.84 16.56-4.128-15.456 61.824-16.56 4.144 15.456zM160.528 277.264l4.16 15.456-61.824 16.56-4.144-15.456 61.808-16.56zM84.080 115.552c-12.8 3.44-25.968-4.176-29.392-16.976-3.44-12.816 4.16-25.968 16.976-29.392 12.8-3.44 25.968 4.16 29.392 16.976 3.424 12.8-4.176 25.952-16.976 29.392zM479.008 336h-64v-16h64v16zM479.008 272h-64v-16h64v16zM479.008 304h-64v-16h64v16zM447.008 112c-13.264 0-24-10.752-24-24s10.736-24 24-24c13.248 0 24 10.752 24 24s-10.752 24-24 24zM495.008 416h-96c-8.848 0-16-7.152-16-16v-368c0-8.832 7.152-16 16-16h96c8.832 0 16 7.168 16 16v368c0 8.848-7.184 16-16 16zM447.008 40c-26.512 0-48 21.504-48 48 0 26.512 21.488 48 48 48 26.496 0 48-21.488 48-48 0-26.496-21.504-48-48-48zM495.008 160h-96v192h96v-192zM335.008 336h-64v-16h64v16zM335.008 272h-64v-16h64v16zM351.008 416h-96c-8.848 0-16-7.152-16-16v-368c0-8.832 7.152-16 16-16h96c8.832 0 16 7.168 16 16v368c0 8.848-7.184 16-16 16zM303.008 40.992c-26.512 0-48 21.504-48 48 0 26.512 21.488 48 48 48 26.496 0 48-21.488 48-48 0-26.496-21.504-48-48-48zM351.008 160h-96v192h96v-192zM335.008 304h-64v-16h64v16zM90.432 262.928l61.808-16.56 4.16 15.456-61.824 16.56-4.144-15.456z" /> +<glyph unicode="" d="M448 256c-8.848 0-16 0-16 0v16c0 17.664-14.336 32-32 32h-320c-17.664 0-32-14.336-32-32v-112c0-17.664 14.336-32 32-32h320c17.664 0 32 14.336 32 32v16c0 0 7.152 0 16 0 8.832 0 16 7.168 16 16v48c0 8.848-7.168 16-16 16zM416 160c0-8.832-7.168-16-16-16h-320c-8.848 0-16 7.168-16 16v112c0 8.848 7.152 16 16 16h320c8.832 0 16-7.152 16-16v-112zM80 160h96v112h-96v-112zM192 160h96v112h-96v-112zM304 160h96v112h-96v-112z" /> +<glyph unicode="" d="M448 256c-8.848 0-16 0-16 0v16c0 17.664-14.336 32-32 32h-320c-17.68 0-32-14.336-32-32v-112c0-17.664 14.32-32 32-32h320c17.664 0 32 14.336 32 32v16c0 0 7.152 0 16 0 8.832 0 16 7.168 16 16v48c0 8.848-7.168 16-16 16zM416 160c0-8.832-7.168-16-16-16h-320c-8.848 0-16 7.168-16 16v112c0 8.848 7.152 16 16 16h320c8.832 0 16-7.152 16-16v-112zM80 160h96v112h-96v-112zM192 160h96v112h-96v-112z" /> +<glyph unicode="" d="M448 256c-8.848 0-16 0-16 0v16c0 17.664-14.336 32-32 32h-320c-17.68 0-32-14.336-32-32v-112c0-17.664 14.32-32 32-32h320c17.664 0 32 14.336 32 32v16c0 0 7.152 0 16 0 8.832 0 16 7.168 16 16v48c0 8.848-7.168 16-16 16zM416 160c0-8.832-7.168-16-16-16h-320c-8.848 0-16 7.168-16 16v112c0 8.848 7.152 16 16 16h320c8.832 0 16-7.152 16-16v-112zM80 160h96v112h-96v-112z" /> +<glyph unicode="" d="M448 176c-8.848 0-16 0-16 0v-16c0-17.664-14.32-32-32-32h-320c-17.68 0-32 14.336-32 32v112c0 17.664 14.32 32 32 32h320c17.68 0 32-14.336 32-32v-16c0 0 7.152 0 16 0s16-7.152 16-16v-48c0-8.832-7.152-16-16-16zM416 272c0 8.848-7.152 16-16 16h-320c-8.848 0-16-7.152-16-16v-112c0-8.832 7.152-16 16-16h320c8.848 0 16 7.168 16 16v112z" /> +<glyph unicode="" d="M304.176 16.176h-112.336c-17.584 0-31.808 14.24-31.808 31.808v304.224c0 17.568 14.24 31.808 31.808 31.808h16.912c0 0 0-0.832 0 7.952s6.128 23.856 14.912 23.856h47.712c8.784 0 15.904-15.072 15.904-23.856s0-7.952 0-7.952h16.912c17.584 0 31.808-14.256 31.808-31.808v-304.224c-0.016-17.584-14.256-31.808-31.824-31.808zM271.36 335.296h-15.904v15.904h-14.912v-15.904h-15.904v-15.904h15.904v-15.904h14.912v15.904h15.904v15.904zM320.080 272.672h-144.16v-224.688c0-8.8 7.12-15.904 15.904-15.904h112.336c8.784 0 15.904 7.104 15.904 15.904v224.688zM223.648 80.8h48.72v-16.912h-48.72v16.912z" /> +<glyph unicode="" d="M449.2 190.064v-126.336c0-8.832-4.992-15.984-15.968-15.984-2.656 0-9.232 5.664-17.312 14.192v339.104c8.080 8.528 14.656 14.192 17.312 14.192 11.968 0 15.968-7.152 15.968-15.968v-129.536c21.648-0.608 41.808-18.16 41.808-39.824 0-21.68-20.16-39.232-41.808-39.84zM192.24 159.264c0.992 0 0 144.464 0 144.464 109.712 0 174.752 48.16 209.024 81.184v-306.832c-34.272 33.008-99.312 81.184-209.024 81.184zM128.336 32.768l-31.952 126.832h-31.968c0 0-9.504 21.568-13.824 47.936-8.144 0-15.264 0-18.144 0-8.816 0-15.968 7.152-15.968 15.984v15.968c0 8.832 7.152 15.984 15.968 15.984 2.88 0 10 0 18.144 0 4.336 26.368 13.824 47.92 13.824 47.92h111.84v-143.792h-31.952l4.032-15.968h15.952l7.984-31.968h-15.904l19.888-78.896h-47.92z" /> +<glyph unicode="" d="M456 48c-13.248 0-24 10.752-24 24v288c0 13.248 10.752 24 24 24s24-10.752 24-24v-288c0-13.248-10.752-24-24-24zM336 80c0-17.664-14.336-32-32-32h-144c-17.664 0-32 14.336-32 32v63.344l-63.856 14.208v115.664l352.384 77.648v-271.744l-80.528 17.904v-17.024zM320 100.592l-176 39.184v-59.776c0-8.832 7.168-16 16-16h144c8.848 0 16 7.168 16 16v20.592zM32 144c-8.832 0-16 7.168-16 16v112c0 8.848 7.168 16 16 16s16-7.152 16-16v-112c0-8.832-7.168-16-16-16z" /> +<glyph unicode="" d="M44.336 136.816c-18.752-18.752-18.752-49.136 0-67.888l56.576-56.56c18.736-18.752 49.12-18.752 67.872 0l79.2 79.184-124.432 124.448-79.216-79.184zM134.864 227.312l124.448-124.448 101.808 101.824-124.432 124.448-101.824-101.824zM192 208h-16v16h16v-16zM224 176h-16v16h16v-16zM224 208h-16v16h16v-16zM224 240h-16v16h16v-16zM304 224h16v-16h-16v16zM272 256h16v-16h-16v16zM272 224h16v-16h-16v16zM272 192h16v-16h-16v16zM240 288h16v-16h-16v16zM240 256h16v-16h-16v16zM240 224h16v-16h-16v16zM240 192h16v-16h-16v16zM240 160h16v-16h-16v16zM451.664 363.072l-56.576 56.56c-18.752 18.752-49.136 18.752-67.888 0l-79.2-79.184 124.432-124.448 79.216 79.2c18.736 18.736 18.736 49.136 0.016 67.872z" /> +<glyph unicode="" d="M89.616 182.064c-31.232-31.248-31.232-81.904 0-113.152l11.328-11.312c31.232-31.216 81.888-31.216 113.136 0l90.496 90.528-124.448 124.448-90.512-90.512zM202.752 68.912c-24.992-24.992-65.52-24.992-90.496 0l-11.312 11.312c-24.992 24.992-24.992 65.536 0 90.528l79.184 79.184 101.824-101.808-79.2-79.216zM406.4 363.072l-11.312 11.312c-31.232 31.248-81.888 31.248-113.136 0l-90.512-90.496 124.448-124.448 90.512 90.496c31.248 31.248 31.248 81.904 0 113.136z" /> +<glyph unicode="" d="M386.56 332.688c6.048-6.032 6.048-15.824 0-21.872-6.048-6.032-10.96-10.944-10.96-10.944l10.96-10.944c12.080-12.080 12.080-31.664 0-43.76l-164.080-164.048c-12.096-12.096-31.68-12.096-43.76 0l-10.944 10.944-43.744-43.776 21.872-21.872c6.048-6.032 6.048-15.808 0-21.872-6.048-6.032-15.84-6.032-21.872 0l-87.52 87.536c-6.032 6.032-6.032 15.808 0 21.872 6.048 6.032 15.84 6.032 21.872 0l21.872-21.872 43.76 43.744-10.944 10.944c-12.096 12.064-12.096 31.664 0 43.744l164.096 164.064c12.096 12.096 31.664 12.096 43.744 0l10.944-10.944c0 0 4.912 4.912 10.944 10.944 6.048 6.048 15.84 6.048 21.872 0l5.472-5.472 87.52 87.52v-21.872l-76.576-76.576 5.472-5.488zM309.984 343.632c-6.032 6.048-15.824 6.048-21.872 0l-32.816-32.816 21.872-21.872-10.944-10.944-21.872 21.872-32.816-32.816 21.872-21.888-10.944-10.944-21.888 21.888-10.944-10.944 43.76-43.744-10.944-10.944-43.76 43.744-32.784-32.784 43.744-43.744-10.944-10.944-43.744 43.744-10.944-10.944c-6.048-6.032-6.048-15.84 0-21.872l65.632-65.632c6.048-6.064 15.84-6.064 21.888 0l164.064 164.064c6.064 6.032 6.064 15.824 0 21.872l-65.616 65.648zM266.24 321.76l10.944 10.944 43.744-43.744-10.944-10.944-43.744 43.744zM266.24 234.256l-43.744 43.76 10.944 10.944 43.744-43.76-10.944-10.944zM156.848 212.368l10.944 10.944 21.872-21.872-10.944-10.944-21.872 21.872zM479.072 329.824c0-11.6-9.408-20.992-20.992-20.992-11.616 0-21.008 9.408-21.008 20.992 0 11.616 21.008 43.328 21.008 43.328s20.992-31.728 20.992-43.328z" /> +<glyph unicode="" d="M303.344 193.392v14.672h49.008v-14.672h-49.008zM303.344 240.4h49.008v-15.664h-49.008v15.664zM303.344 271.76h49.008v-15.68h-49.008v15.68zM303.344 304.112h49.008v-15.664l-49.008 0.992v14.672zM303.344 337.456h49.008v-16.672h-49.008v16.672zM303.344 368.8h49.008v-15.68h-49.008v15.68zM331.728 93.552c0-51.936-42.112-94.048-94.048-94.048s-94.048 42.112-94.048 94.048c0 35.616 18.8 66.576 47.984 82.544v209.392c0 25.968 22.048 47.008 48.016 47.008s47.024-21.040 47.024-47.008v-211.76c27.008-16.544 45.072-46.208 45.072-80.176zM270.992 164.24v221.248c0 17.312-14.032 31.344-31.344 31.344s-31.344-14.032-31.344-31.344v-219.376c-28.704-11.648-48.992-39.68-48.992-72.56 0-43.28 35.088-78.368 78.368-78.368 43.28 0 78.352 35.088 78.352 78.368 0.016 31.328-18.48 58.128-45.040 70.688zM237.68 30.848c-34.64 0-62.704 28.080-62.704 62.704 0 29.904 20.976 54.816 48.992 61.088v149.472h31.36v-150.688c25.968-7.664 45.056-31.424 45.056-59.872 0-34.624-28.064-62.704-62.704-62.704z" /> +<glyph unicode="" d="M258.080 451.504c-85.936 0-131.040-67.776-131.040-129.44 0-69.184 64.384-112.688 64.384-225.824h65.2c0 0 61.232-0.288 63.088-0.288 1.856 113.968 65.248 158.8 65.248 226.656 0.016 57.904-40.944 128.896-126.88 128.896zM311.584 79.504h-112c-4.416 0-8-3.584-8-8s3.584-8 8-8h112c4.4 0 8 3.584 8 8s-3.6 8-8 8zM311.584 47.504h-112c-4.416 0-8-3.584-8-8s3.584-8 8-8h112c4.4 0 8 3.584 8 8s-3.6 8-8 8zM207.584 15.504c0 0 0-7.152 0-16 0-8.832 7.152-16 16-16h64.224c8.848 0 16 7.168 16 16 0 8.848 0 16 0 16h-96.224z" /> +<glyph unicode="" d="M340.88 329.52c8.528 2.304 13.6 11.056 11.312 19.6s-11.056 13.616-19.6 11.312l-161.456-49.68c-8.544-2.288-13.6-11.056-11.328-19.6 2.288-8.528 11.056-13.616 19.6-11.312l13.328 4.096 15.264-27.808h-16c-17.664 0-32-14.336-32-32v-66.672l32-45.328h128l32 45.328v66.672c0 17.664-14.336 32-32 32h-16l32.24 71.968 4.64 1.424zM272 256.128h-32l-19.888 36.224 79.008 24.32-27.12-60.544zM332.592 408.416l-161.456-49.68c-8.544-2.288-13.6-11.056-11.328-19.6 2.288-8.528 11.056-13.616 19.6-11.312l161.456 49.68c8.528 2.304 13.6 11.056 11.312 19.6s-11.056 13.616-19.584 11.312zM179.408 375.824l161.456 49.68c8.528 2.304 13.6 11.056 11.312 19.6-2.288 8.544-11.056 13.616-19.6 11.312l-161.44-49.68c-8.544-2.288-13.6-11.056-11.328-19.6 2.288-8.528 11.072-13.6 19.6-11.312zM312 96.128h-112c-4.416 0-8-3.584-8-8s3.584-8 8-8h112c4.4 0 8 3.584 8 8s-3.6 8-8 8zM312 64.128h-112c-4.416 0-8-3.584-8-8s3.584-8 8-8h112c4.4 0 8 3.584 8 8s-3.6 8-8 8zM312 32.128h-112c-4.416 0-8-3.584-8-8s3.584-8 8-8h112c4.4 0 8 3.584 8 8s-3.6 8-8 8zM232 0.128c-1.616-13.152 10.752-24 24-24s24 10.752 24 24c0-0.688-48-1.696-48 0zM180.336 423.104l106.88 33.488c8.432 2.64 13.12 11.632 10.48 20.048-2.64 8.432-11.616 13.136-20.048 10.496l-106.88-33.488c-8.432-2.64-13.12-11.632-10.48-20.064 2.64-8.416 11.616-13.12 20.048-10.48z" /> +<glyph unicode="" d="M283.952 255.728c-20-8.992-64.352 13.040-64.352 13.040-51.968 31.152 19.52-97.168 19.52-97.168s1.488-40.048 10.48-45.040c74.992 105.008 54.352 138.176 34.352 129.168zM256.96 156.16c-6.064 0-31.552 76.464-28.544 92.464 20.016-2 38.544-9.552 49.552-3.552 30.992 14.048-14.016-88.912-21.008-88.912zM319.232 96.848c1.84 116.88 64.736 161.856 64.736 231.456 0 59.392-40.64 135.2-125.92 135.2-85.264 0-130.016-72.528-130.016-135.744 0-70.976 63.888-115.584 63.888-231.648h64.688c0 0 60.768 0.736 62.624 0.736zM204.944 111.68c0 108.336-61.888 149.968-61.888 216.208 0 59.008 40.16 120.896 114.768 120.896s111.168-64.96 111.168-120.384c0-64.96-61.024-107.872-62.656-216.96-1.632 0-49.776 0.256-49.776 0.256h-51.616zM312.080 79.776h-112c-4.416 0-8-3.584-8-8s3.584-8 8-8h112c4.4 0 8 3.584 8 8s-3.6 8-8 8zM312.080 47.776h-112c-4.416 0-8-3.584-8-8s3.584-8 8-8h112c4.4 0 8 3.584 8 8s-3.6 8-8 8zM207.952 15.312c0 0 0-5.344 0-14.4s7.104-16.4 15.872-16.4h64.496c8.784 0 15.872 7.344 15.872 16.4s-0.992 14.4-0.992 14.4h-95.248z" /> +<glyph unicode="" d="M247.232 431.904l-213.792-92.112 214-91.392 216.208 91.6-216.416 91.904zM256 236.896v-220.8l207.92 98.704v210.416l-207.92-88.32zM32.080 114.8l208.624-98.704v220.8l-208.624 88.32v-210.416z" /> +<glyph unicode="" d="M27.76 194.688l192.864-97.296 34.432 97.296-192.848 92.128-34.448-92.128zM259.376 194.688l32.72-96.432 199.744 97.296-38.752 91.264-193.712-92.128zM-3.952 364.608l66.304-77.488 192.848 98.144-62.848 80.080-196.304-100.736zM515.952 362.896l-192.016 102.448-65.44-80.080 194.592-98.144 62.864 75.776zM50.8 170.352l-0.656-93.424 203.408-94.288v175.68l-29.056-75.776-173.696 87.808zM260.656 158.32v-175.664l202.784 94.288v92.784l-175.84-87.36-26.944 75.952z" /> +<glyph unicode="" d="M32.080 114.8l208.624-98.704v220.8l-208.624 88.32v-210.416zM96.096 243.344l80.416-37.392-0.464-29.472-80.4 37.376 0.448 29.488zM256 236.896v-220.8l207.904 98.704v210.416l-207.904-88.32zM247.248 431.904l-213.808-92.112 214-91.392 216.224 91.6-216.416 91.904z" /> +<glyph unicode="" d="M33.648 287.168l214.368-266.064-85.968 266.064h-128.4zM185.344 287.168l75.92-266.608 65.328 266.608h-141.248zM272.816 21.104l206.368 266.064h-127.408l-78.96-266.064zM479.664 304.576l-61.872 105.792-61.904-105.792h123.776zM398.336 416.432h-123.776l61.872-109.424 61.904 109.424zM317.408 304.576l-61.872 105.792-61.888-105.792h123.76zM237.424 416.432h-123.76l61.888-109.424 61.872 109.424zM94.224 410.368l-61.872-105.792h123.76l-61.888 105.792z" /> +<glyph unicode="" d="M286.256 323.12h-60.64c0 0-98.72-77.296-98.72-193.728s103.776-117.552 103.776-117.552 27.008-2 50 0c0-0.992 104.4 13.84 104.4 117.648 0.016 103.776-98.816 193.632-98.816 193.632zM225.616 330.72h60.752v22.784h-60.752v-22.784zM285.44 361.088l30.848 75.952c0 0-19.472-16.144-30.848-16.144-11.408 0-29.44 15.664-29.44 15.664s-19.456-15.664-30.848-15.664-29.904 15.184-29.904 15.184l31.328-75.008h58.864z" /> +<glyph unicode="" d="M224.272 331.168h62.944v23.616h-62.944v-23.616zM286.752 323.312h-62.48c0 0-102.8-101.328-102.8-200.672 0-105.264 107.712-113.632 107.712-113.632s32.128-5.328 52.112 0c0 0 109.216 12.8 109.216 113.12 0.016 100.352-103.76 201.184-103.76 201.184zM291.376 110.032c-2.528-5.12-5.936-9.408-10.288-12.832-4.336-3.44-9.408-6.016-15.184-7.744-0.736-0.224-1.536-0.304-2.288-0.496v-17.472h-15.728v15.424c-0.192-0.016-0.384-0.048-0.576-0.048-4.464 0-8.608 0.352-12.448 1.072-3.824 0.736-7.2 1.616-10.144 2.624-2.944 1.024-5.392 2.096-7.344 3.216-1.968 1.12-3.392 2.112-4.256 2.976-0.88 0.864-1.488 2.112-1.856 3.744-0.352 1.648-0.544 3.984-0.544 7.056 0 2.064 0.064 3.792 0.208 5.2s0.336 2.528 0.656 3.408c0.304 0.88 0.688 1.488 1.184 1.856 0.496 0.352 1.088 0.544 1.744 0.544 0.944 0 2.256-0.544 3.952-1.648 1.696-1.104 3.872-2.32 6.544-3.648 2.672-1.344 5.84-2.544 9.552-3.664 3.696-1.088 7.984-1.648 12.848-1.648 3.2 0 6.064 0.384 8.592 1.152s4.688 1.84 6.448 3.248c1.776 1.408 3.12 3.136 4.048 5.2 0.944 2.080 1.408 4.368 1.408 6.928 0 2.928-0.816 5.44-2.4 7.552-1.6 2.096-3.696 3.952-6.256 5.6-2.56 1.632-5.472 3.152-8.736 4.592s-6.64 2.96-10.096 4.544c-3.472 1.6-6.832 3.408-10.096 5.456-3.264 2.032-6.192 4.448-8.752 7.28s-4.64 6.192-6.256 10.048c-1.6 3.856-2.384 8.496-2.384 13.888 0 6.208 1.152 11.648 3.44 16.336 2.304 4.688 5.408 8.592 9.296 11.68 3.904 3.088 8.496 5.408 13.792 6.944 2.72 0.784 5.536 1.36 8.416 1.728v16.56h15.728v-16.544c0.64-0.080 1.264-0.048 1.888-0.144 3.056-0.464 5.936-1.088 8.592-1.888 2.656-0.784 5.024-1.68 7.088-2.672s3.44-1.808 4.096-2.48c0.688-0.656 1.12-1.216 1.376-1.68 0.224-0.464 0.4-1.088 0.592-1.856 0.16-0.768 0.288-1.728 0.336-2.912 0.064-1.152 0.096-2.608 0.096-4.336 0-1.936-0.064-3.584-0.16-4.928-0.096-1.328-0.256-2.432-0.496-3.296-0.224-0.88-0.56-1.504-0.992-1.904s-0.992-0.592-1.744-0.592c-0.72 0-1.904 0.448-3.504 1.376-1.6 0.944-3.568 1.936-5.872 3.024-2.336 1.088-5.024 2.080-8.096 2.992-3.088 0.896-6.448 1.328-10.096 1.328-2.88 0-5.376-0.336-7.504-1.040-2.144-0.688-3.92-1.664-5.36-2.88-1.424-1.232-2.496-2.72-3.184-4.432-0.704-1.712-1.040-3.552-1.040-5.472 0-2.88 0.784-5.36 2.336-7.456s3.664-3.968 6.304-5.6c2.624-1.648 5.616-3.168 8.96-4.592 3.328-1.44 6.72-2.96 10.192-4.544 3.472-1.616 6.848-3.424 10.192-5.456s6.32-4.464 8.912-7.296 4.688-6.16 6.288-9.984c1.6-3.84 2.4-8.336 2.4-13.552-0.016-6.752-1.296-12.704-3.824-17.84zM286.256 362.656l31.968 78.704c0 0-20.16-16.736-31.968-16.736s-30.512 16.24-30.512 16.24-20.16-16.24-31.968-16.24c-11.792 0-30.992 15.744-30.992 15.744l32.464-77.712h61.008z" /> +<glyph unicode="" d="M128 288h64v64h-64v-64zM224 288h64v64h-64v-64zM320 352v-64h64v64h-64zM128 192h64v64h-64v-64zM224 192h64v64h-64v-64zM320 192h64v64h-64v-64zM128 96h64v64h-64v-64zM224 96h64v64h-64v-64zM320 96h64v64h-64v-64z" /> +<glyph unicode="" d="M128 240h112v112h-112v-112zM272 352v-112h112v112h-112zM272 96h112v112h-112v-112zM128 96h112v112h-112v-112z" /> +<glyph unicode="" d="M128 352v-64h256v64h-256zM128 192h256v64h-256v-64zM128 96h256v64h-256v-64z" /> +<glyph unicode="" d="M128 288h64v64h-64v-64zM128 192h64v64h-64v-64zM128 96h64v64h-64v-64zM224 352v-64h160v64h-160zM224 192h160v64h-160v-64zM224 96h160v64h-160v-64z" /> +<glyph unicode="" d="M0 112.176v207.648h31.824v-95.536h31.52v95.536h33.168v-31.84h31.168v31.84h32.192v-63.68h31.84v63.68h32.496v-31.168h31.184v31.168h33.168v-63.68h31.168v63.68h32.512v-95.536h30.496v95.536h33.52v-31.168h31.52v31.168h32.848v-63.68h30.176v63.68h33.52v-31.168h30.832v31.168h32.848v-63.68h31.52v63.68h32.512v-207.664h-672.032z" /> +<glyph unicode="" d="M368.368 15.904v32.464h-16.208v-32.464h-16.224v32.464h-16.256v-32.464h-15.216v48.688h-16.224v-48.688h-16.224v32.464h-16.224v-32.464h-15.216v32.464h-16.224v-32.464h-16.24v48.688h-16.224v-48.688h-16.224v32.464h-15.184v-32.464h-16.224v32.464h-16.24v-32.464h-16.208v48.688h-15.216v-48.688h-48.672v400.176l400.176-400.176h-79.728zM111.808 262.656v-181.84h181.824l-181.824 181.84z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM176 32h-112v368h112v-368zM432 32h-240v368h240v-368z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM304 32h-240v368h240v-368zM432 32h-112v368h112v-368z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM240 32h-176v368h176v-368zM432 32h-176v368h176v-368z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM176 32h-112v368h112v-368zM304 32h-112v368h112v-368zM432 32h-112v368h112v-368z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM432 32h-368v112h368v-112zM432 160h-368v112h368v-112zM432 288h-368v112h368v-112z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM240 32h-176v176h176v-176zM240 224h-176v176h176v-176zM432 32h-176v176h176v-176zM432 224h-176v176h176v-176z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM176 32h-112v112h112v-112zM176 160h-112v112h112v-112zM176 288h-112v112h112v-112zM304 32h-112v112h112v-112zM304 160h-112v112h112v-112zM304 288h-112v112h112v-112zM432 32h-112v112h112v-112zM432 160h-112v112h112v-112zM432 288h-112v112h112v-112z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM432 32h-368v272h368v-272zM432 320h-368v80h368v-80z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM176 32h-112v272h112v-272zM432 32h-240v272h240v-272zM432 320h-368v80h368v-80z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM304 32h-240v272h240v-272zM432 32h-112v272h112v-272zM432 320h-368v80h368v-80z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM176 32h-112v368h112v-368zM432 32h-240v176h240v-176zM432 224h-240v176h240v-176z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM176 32h-112v272h112v-272zM432 32h-240v128h240v-128zM432 176h-240v128h240v-128zM432 320h-368v80h368v-80z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM240 32h-176v272h176v-272zM432 32h-176v272h176v-272zM432 320h-368v80h368v-80z" /> +<glyph unicode="" d="M48 416v-400h400v400h-400zM127.008 32h-63.008v272h63.008v-272zM352 32h-208v272h208v-272zM432 32h-64v272h64v-272zM432 320h-368v80h368v-80z" /> +<glyph unicode="" d="M444.528 353.024c15.344-37.008 8.032-81.184-22.064-111.28-33.136-33.136-83.216-38.32-122.144-16.352l-28.144-30.736 20.080-20.16 12 12c6.128 6.144 16.080 6.144 22.208 0l97.312-98.304c6.144-6.128 6.144-16.080 0-22.208l-44.416-44.416c-6.128-6.144-16.080-6.144-22.208 0l-97.312 98.304c-6.144 6.128-6.144 16.080 0 22.208l10.96 10.96-19.136 19.184-134.576-147.024c-12.272-12.272-32.16-12.272-44.416 0l-11.104 11.104c-12.272 12.272-12.272 32.16 0 44.416l153.312 128.4-101.824 102.096-32.16 0.016-37.216 59.84 29.952 30 61.2-37.456 0.4-31.488 103.008-103.408 29.968 25.088c-29.296 39.936-26.24 96.192 9.856 132.288 29.952 29.952 73.888 37.392 110.8 22.336l-65.984-65.072 55.536-55.536 66.112 65.2zM98.4 65.056c-6.128 6.128-16.064 6.128-22.208 0-6.144-6.144-6.144-16.080 0-22.224 6.144-6.128 16.080-6.128 22.208 0 6.144 6.16 6.144 16.096 0 22.224z" /> +<glyph unicode="" d="M416 272h-160v-32h-32v48h192v96h-16v-48c0-8.832-7.168-16-16-16h-288c-8.848 0-16 7.168-16 16v64c0 8.848 7.152 16 16 16h288c8.832 0 16-7.152 16-16h32v-128h-16zM368 400h-256v-16h256v16zM272 64c0-17.664-14.336-32-32-32s-32 14.336-32 32v160h64v-160zM240 86.672c-8.848 0-16-7.168-16-16 0-8.848 7.152-16 16-16 8.832 0 16 7.152 16 16 0 8.832-7.168 16-16 16z" /> +<glyph unicode="" d="M196.992 319.76l-54.064 40.224 54.064 38.8h170.496v-79.008h-170.496zM256.512 431.952h46.848v-15.952h-46.848v15.952zM303.088 302.416l17.664-281.664c0-11.44-9.248-20.688-20.688-20.688h-40.368c-11.44 0-20.688 9.248-20.688 20.688l16.72 281.664h47.36zM280.432 22.368c8.8 0 15.936 7.12 15.936 15.936s-7.136 15.936-15.936 15.936c-8.816 0-15.952-7.12-15.952-15.936s7.152-15.936 15.952-15.936z" /> +<glyph unicode="" d="M440.88 345.28c-21.68-26.352-81.12-99.12-128.336-156.96l-59.952 60.864c54.224 48.256 121.344 107.904 145.6 129.264 43.152 38.032 80.992 60.656 89.216 51.408 5.152-5.12-8.528-38.336-46.528-84.576zM302.064 175.52c-18.288-22.384-34.032-41.664-43.664-53.488l-70.976 69.168c11.504 10.24 30.656 27.28 52.864 47.024l61.776-62.704zM247.824 109.072v0.192c-41.2-158.080-224.288-67.2-224.288-67.2s76.816-9.68 76.816 61.968c0 69.456 70.592 75.728 74.928 76.048l72.688-70.832c0-0.016-0.144-0.176-0.144-0.176z" /> +<glyph unicode="" d="M106 191.296l-52.208-158.976 69.776 70.032c-4.8 12.112-3.616 32.8 6.192 42.592 13.136 13.152 34.768 12.848 47.904-0.304 13.152-13.152 13.856-35.168 0.72-48.32-10-10-31.968-10.576-44.224-5.392l-69.168-69.36 155.216 54.528 56.528 101.824-68.864 67.936-101.872-54.56zM367.696 426.416c0 0-96.176-96.16-111.008-111.008-14.864-14.848-22.624-70.704-22.624-70.704l43.12-43.136c0 0 54.448 7.776 70 23.344 15.568 15.552 111.008 111.008 111.008 111.008l-90.496 90.496z" /> +<glyph unicode="" d="M400.672 181.248v199.792c0 19.744-16 35.776-35.776 35.776h-313.136c-19.76 0.016-35.776-16.016-35.776-35.776v-199.792c0-19.76 16.016-35.776 35.776-35.776h59.664v-82.192l91.264 82.192h162.192c19.792 0 35.792 16.016 35.792 35.776zM460.24 338.272h-44.768c0 0 0-159.552 0-174.544s-19.456-34.272-34.448-34.272-175.12-0.88-175.12-0.88c0-19.76 16.016-31.776 35.776-31.776h68.944l89.952-81.632-0.112 81.632h59.776c19.776 0 35.776 12.016 35.776 31.776v174.912c0 19.744-16 34.784-35.776 34.784z" /> +<glyph unicode="" d="M402.112 269.36c0 82.64-90.032 149.632-201.056 149.632-111.040 0-201.056-66.992-201.056-149.632 0-49.664 32.512-93.664 82.56-120.88-0.144-0.432-39.872-72.72-39.872-72.72s121.312 46.272 121.648 46.464c11.904-1.648 24.176-2.48 36.72-2.48 111.024 0 201.056 66.992 201.056 149.616zM550.16 222.608c0 82.624-84.752 149.024-176.496 149.616 131.52-131.008-23.376-270.592-149.616-270.592 0 0 14.032-28.64 125.056-28.64 12.528 0 24.816 0.864 36.72 2.496 0.336-0.224 121.664-46.464 121.664-46.464s-39.744 72.272-39.872 72.704c50.032 27.216 82.544 71.232 82.544 120.88z" horiz-adv-x="550" /> +<glyph unicode="" d="M412.56 400.768h-313.12c-19.76 0-35.776-16.032-35.776-35.776v-199.808c0-19.744 16.016-35.776 35.776-35.776h59.664l0.016-82.192 91.264 82.192h162.192c19.776 0 35.776 16.032 35.776 35.776v199.808c-0.016 19.744-16.016 35.776-35.792 35.776zM160 256.496c-8.848 0-16 7.168-16 16 0 8.848 7.152 16 16 16 8.832 0 16-7.152 16-16 0-8.832-7.168-16-16-16zM224 257.168c-8.848 0-16 7.168-16 16 0 8.848 7.152 16 16 16 8.832 0 16-7.152 16-16 0-8.832-7.168-16-16-16zM288.32 256.832c-8.832 0-16 7.152-16 16 0 8.832 7.168 16 16 16 8.848 0 16-7.168 16-16 0-8.832-7.168-16-16-16zM352 256.496c-8.848 0-16 7.168-16 16 0 8.848 7.152 16 16 16 8.832 0 16-7.152 16-16 0-8.832-7.168-16-16-16z" /> +<glyph unicode="" d="M256 395.616c-111.024 0-201.040-66.992-201.040-149.632 0-49.664 32.512-93.664 82.56-120.88-0.144-0.432-39.872-72.72-39.872-72.72s121.328 46.272 121.664 46.464c11.904-1.648 24.176-2.48 36.704-2.48 111.024 0 201.040 66.992 201.040 149.616-0.016 82.64-90.032 149.632-201.056 149.632zM159.488 230c-8.832 0-16 7.168-16 16 0 8.848 7.168 16 16 16s16-7.152 16-16c0-8.832-7.152-16-16-16zM223.152 229.328c-8.832 0-16 7.168-16 16 0 8.848 7.168 16 16 16 8.848 0 16-7.152 16-16 0-8.832-7.152-16-16-16zM287.808 229.328c-8.832 0-16 7.168-16 16 0 8.848 7.168 16 16 16 8.848 0 16-7.152 16-16 0-8.832-7.152-16-16-16zM351.808 229.328c-8.832 0-16 7.168-16 16 0 8.848 7.168 16 16 16 8.848 0 16-7.152 16-16 0-8.832-7.152-16-16-16z" /> +<glyph unicode="" d="M373.2 17.056l-134.080 93.44v212.016l134.080 92.432c17.68 0 43.024-13.376 43.024-29.872v-338.128c0.016-16.512-25.328-29.888-43.024-29.888zM224.208 113.632h-96.432c-17.68 0-32 21.152-32 37.664v129.44c0 16.48 14.336 39.92 32 39.92h96.432v-207.024z" /> +<glyph unicode="" d="M378.72 310.672l-15.84-32.304c15.152-12.992 24.752-32.272 24.752-53.776 0-23.712-5.376-45.152-23.248-58.016l15.312-27.312c23.376 20.976 38.096 51.408 38.096 85.296-0.016 34.32-15.136 65.136-39.072 86.112zM496.288 423.792l-22.288-27.040c41.568-45.376 67.872-105.84 67.872-172.224 0-66.272-26.256-126.656-67.68-172.016l22.256-27.6c47.408 53.376 76.128 122.368 76.128 199.616-0.016 77.040-29.104 145.92-76.288 199.264zM437.152 368.544l-19.84-28.528c29.472-29.6 48.16-70.4 48.16-115.472 0-45.984-19.44-87.504-49.968-117.264l20.624-27.376c36.88 37.664 59.088 87.744 59.088 144.624 0 55.824-22.368 106.528-58.064 144.016zM0 287.888v-129.44c0-16.496 14.336-37.664 32-37.664h96.432v207.024h-96.432c-17.664 0-32-23.44-32-39.92zM277.456 422.096l-134.096-92.432v-212l134.096-93.44c17.664 0 43.008 13.376 43.008 29.872v338.128c0 16.496-25.344 29.872-43.008 29.872z" horiz-adv-x="572" /> +<glyph unicode="" d="M459.44 225.024l35.84-35.872c2.336-2.32 2.336-6.096 0-8.432l-12.656-12.656c-2.32-2.32-6.096-2.32-8.432 0l-35.84 35.872-35.872-35.872c-2.336-2.32-6.096-2.32-8.432 0l-12.656 12.656c-2.32 2.336-2.32 6.128 0 8.432l35.872 35.872-35.872 35.872c-2.32 2.336-2.32 6.096 0 8.432l12.656 12.656c2.336 2.336 6.112 2.336 8.432 0l35.872-35.856 35.84 35.856c2.336 2.336 6.128 2.336 8.432 0l12.656-12.656c2.336-2.336 2.336-6.112 0-8.432l-35.84-35.872zM292.4 25.056l-134.064 93.44v212.016l134.064 92.432c17.68 0 43.024-13.376 43.024-29.872v-338.128c0.016-16.512-25.328-29.888-43.024-29.888zM14.976 158.288v130.448c0 16.48 14.336 39.92 32 39.92h96.432v-208.016h-96.432c-17.68-0.016-32 21.136-32 37.648z" /> +<glyph unicode="" d="M96 32h48v144h-48v-144zM288 192h-80c-8.848 0-16-7.152-16-16v-48c0-8.832 7.152-16 16-16h80c8.832 0 16 7.168 16 16v48c0 8.848-7.168 16-16 16zM224.496 128.496h-16v47.008h16v-47.008zM255.504 128.496h-16v47.008h16v-47.008zM288.496 128.496h-16v47.008h16v-47.008zM272 416h-48v-208h48v208zM400 416h-48v-80h48v80zM144 416h-48v-128h48v128zM352 32h48v192h-48v-192zM224 32h48v64h-48v-64zM160 272h-80c-8.848 0-16-7.152-16-16v-48c0-8.832 7.152-16 16-16h80c8.832 0 16 7.168 16 16v48c0 8.848-7.168 16-16 16zM96.496 208.496h-16v47.008h16v-47.008zM128.496 208.496h-16v47.008h16v-47.008zM160.496 208.496h-16v47.008h16v-47.008zM416 320h-80c-8.848 0-16-7.152-16-16v-48c0-8.832 7.152-16 16-16h80c8.832 0 16 7.168 16 16v48c0 8.848-7.168 16-16 16zM352.496 256.496h-16v47.008h16v-47.008zM383.504 256.496h-16v47.008h16v-47.008zM416.496 256.496h-16v47.008h16v-47.008z" /> +<glyph unicode="" d="M415.84 383.328l-0.064-155.76-59.712 59.728-71.264-71.28-42.64 42.64 71.264 71.264-54.144 54.128 156.56-0.72zM183.904 115.12l51.808-50.912-155.552-0.272 0.064 154.88 61.040-61.040 78.8 78.784 42.64-42.64-78.8-78.8z" /> +<glyph unicode="" d="M438.512 353.888l-42.64 42.64-78.8-78.8-61.040 61.040-0.064-154.88 155.568 0.272-51.808 50.928 78.784 78.8zM137.232 153.872l-71.248-71.248 42.64-42.656 71.248 71.28 59.712-59.712 0.064 155.744-156.544 0.72 54.128-54.128z" /> +<glyph unicode="" d="M460.704 216.752l-76.56 77.472v-54.336h-111.648v176.112h-48v-176.112h-111.648v54.336l-77.552-77.472 77.168-77.808 0.384 53.632h111.648v-176.576h48v176.576h111.648l-0.624-53.632z" /> +<glyph unicode="" d="M368.336 239.888v54.336l-77.552-77.472 77.168-77.808 0.368 53.648h111.44v47.312h-111.424zM224 16h48v400h-48v-400zM128.64 239.888h-112.416v-47.312h112.416l-0.624-53.648 77.184 77.808-76.56 77.488v-54.336z" /> +<glyph unicode="" d="M383.632 16.56v30.912h63.808v63.808h32.912v-94.72h-96.72zM447.44 384.528h-63.808v30.912h96.72v-94.72h-32.912v63.808zM48.56 320.72h-32.896v94.72h96.72v-30.912h-63.824v-63.808zM79.472 351.632h337.056v-271.248h-337.056v271.248zM112.368 111.28h271.248v209.44h-271.248v-209.44zM144.288 287.808h208.432v-143.632h-208.432v143.632zM48.56 47.472h63.808v-30.912h-96.704v94.72h32.912v-63.808z" /> +<glyph unicode="" d="M441.984 144.72l-15.328-81.152h-341.312l-15.328 81.152h-38.16v-128.992h448.288v128.992h-38.16zM432.32 288.864h-112.352v46.88h-127.904v-46.88h-111.28l174.624-182.592 176.912 182.592zM319.952 416.288h-127.904v-17.056h127.904v17.056zM319.952 384.432h-127.904v-32.608h127.904v32.608z" /> +<glyph unicode="" d="M384 400h-256c-8.848 0-16-7.152-16-16v-336c0-8.832 7.152-16 16-16h256c8.832 0 16 7.168 16 16v336c0 8.848-7.168 16-16 16zM144 240h32v-32h-32v32zM144 192h32v-32h-32v32zM144 144h32v-32h-32v32zM224 64h-80v32h80v-32zM224 112h-32v32h32v-32zM224 160h-32v32h32v-32zM224 208h-32v32h32v-32zM272 64h-32v32h32v-32zM272 112h-32v32h32v-32zM272 160h-32v32h32v-32zM272 208h-32v32h32v-32zM320 64h-32v32h32v-32zM320 112h-32v32h32v-32zM320 160h-32v32h32v-32zM320 208h-32v32h32v-32zM368 64h-32v80h32v-80zM368 160h-32v32h32v-32zM368 208h-32v32h32v-32zM368 272h-224v96h224v-96z" /> +<glyph unicode="" d="M54.8 256.752c0 0 386.192 0 386.768 0 9.328 4.080 8.912 12.832 0.176 18.64-8.752 5.84-193.904 139.488-193.904 139.488s-183.712-133.648-193.040-139.488c-9.312-5.808-9.904-14.56 0-18.64zM247.84 348.88c15.44 0 27.968-12.512 27.968-27.952s-12.528-27.968-27.968-27.968-27.952 12.528-27.952 27.968 12.512 27.952 27.952 27.952zM64.432 49.088h367.488v15.632h-367.488v-15.632zM144 81.024v142.448h15.648v17.648h-79.888v-16.048h15.648v-144.032h48.592zM272.48 81.024v143.456h15.648v15.648h-79.872v-15.040h15.632v-144.032h48.592zM48.48 17.12h399.408v14.624h-399.408v-14.624zM399.968 81.024v143.456h15.648v15.648h-79.888v-15.040h15.664v-144.032h48.576z" /> +<glyph unicode="" d="M185.968 358.352l96.992-56c7.664-4.416 17.44-1.792 21.84 5.856 4.432 7.648 1.808 17.44-5.84 21.84l-96.992 56c-7.664 4.416-17.44 1.792-21.856-5.84-4.432-7.648-1.792-17.424 5.856-21.856zM274.976 288.496l-96.992 56-56-96.992 96.992-56 56 96.992zM97.968 205.936l96.992-56c7.648-4.416 17.44-1.792 21.84 5.856 4.416 7.648 1.792 17.44-5.84 21.84l-96.992 56c-7.664 4.416-17.44 1.792-21.856-5.84-4.432-7.648-1.792-17.44 5.856-21.856zM432.192 160.784l-177.216 93.072-16-27.712 169.216-106.928c11.472-6.624 26.16-2.704 32.784 8.784s2.688 26.16-8.784 32.784zM256.528 80c0 8.848-7.168 16-16 16h-144c-8.848 0-16-7.152-16-16 0-8.832 0-16 0-16l-16.528 0.336 0.528-16.336h208l0.752 15.328-15.744 0.672c0 0-1.008 7.168-1.008 16z" /> +<glyph unicode="" d="M385.024 374.672l-60.368-134h-17.568l64.384 142.656h-99.408v-332.336c20.48-0.752 125.008-34.672 125.008-34.672v-16.32h-280.96v17.424c0 0 106.848 33.584 122.944 33.584v332.32h-96.24l64.4-142.656h-17.568l-60.368 134-60.368-134h-17.568l64.768 143.456v16.544h108.064c0 21.648 14.512 39.328 31.44 39.328 17.904 0 31.44-18.688 31.44-39.328h110.048v-14.192l65.856-145.808h-17.568l-60.368 134zM208.32 224.336c0-43.088-29.888-84.512-79.024-84.512-48.032 0-79.024 41.424-79.024 84.512-0.016-0.064 158.048-0.064 158.048 0zM308.192 224.336c0-0.080 158.064-0.080 158.064 0 0-43.088-29.888-84.512-79.024-84.512-48.048 0-79.040 41.424-79.040 84.512z" /> +<glyph unicode="" d="M95.968 400h-15.792v-368h320v15.408l-303.936 0.784-0.272 351.808zM128.176 80h80v174l-80-80v-94zM224.176 80h80v158l-32-32-48 48v-174zM320.176 80h80v242.992l-80-80v-162.992zM214.192 302.928l57.92-57.6 114.368 113.792 29.344-29.504-0.704 70.384-70.64-0.368 27.472-27.552-99.872-100.16-59.024 59.248-89.968-89.664 15.024-14.592 76.080 76.016z" /> +<glyph unicode="" d="M111.792 400h-15.792v-368h320v15.408l-303.936 0.8-0.272 351.792zM224 259.008l-80 80v-259.008h80v179.008zM240 270v-190h80v206l-32 32-48-48zM336 224v-144h80v144h-80zM289.904 362.064l83.872-84.144-23.472-22.24 65.648-0.704-0.304 63.376-28.336-27.504-97.376 98.8-59.92-60.592-69.072 69.024-14.032-14.576 81.968-82.688 61.024 61.248z" /> +<glyph unicode="" d="M368.976 264.944c0 0 18.752 14.256 4.496 28.512-14.288 14.256-28.16-4.144-28.16-4.144l-111.504-111.52c0 0-33.648-43.376-59.136-17.12s17.12 59.136 17.12 59.136l156.144 156.16c0 0 43.904 48.368 85.152 7.12 41.248-41.264-7.248-85.264-7.248-85.264l-211.408-211.424c0 0-67.648-78.144-130.288-15.504s16.256 129.52 16.256 129.52l160.544 160.544c0 0 18 15.008 4.496 28.512s-28.496-4.496-28.496-4.496l-184.16-184.176c0 0-69.52-76.272 8.128-153.888 77.648-77.648 153.904-8.144 153.904-8.144l253.152 253.168c0 0 50.624 55.888-9.744 116.288s-116.288 9.744-116.288 9.744l-185.76-185.776c0 0-55.84-45.344-5.2-95.968 50.64-50.64 95.216 5.952 95.216 5.952l122.784 122.768z" /> +<glyph unicode="" d="M392 32c4.4 0 8-3.584 8-8s0-24 0-24h-304c0 0 0 19.584 0 24s3.584 8 8 8h26.72c1.328 106.528 70.912 140.864 70.912 183.92 0 43.28-70.864 46.16-71.536 184.080h-26.096c-4.416 0-8 3.584-8 8s0 24 0 24h304c0 0 0-19.584 0-24s-3.6-8-8-8h-24.48c-0.672-137.92-71.536-140.8-71.536-184.080 0-43.056 69.6-77.392 70.928-183.92h25.088zM273.776 215.92c0 43.456 70.88 46.16 71.536 184.080h-193.008c0.656-137.92 71.536-140.624 71.536-184.080 0-41.776-69.616-76.992-70.928-183.92h12.128c2.848 9.488 12.304 20.896 28.64 29.344l21.232 10.832c13.344 6.896 21.344 11.552 24 13.952s5.664 7.776 9.024 16.128c3.536-8.336 6.56-13.712 9.12-16.128s10.464-7.056 23.744-13.952l21.12-10.832c16.24-8.448 25.664-19.856 28.464-29.344h14.304c-1.312 106.928-70.912 142.144-70.912 183.92zM257.12 239.408c-1.92-3.776-3.536-10.96-4.816-21.552-0.32-3.2-1.024-8.016-2.16-14.432-1.12 6.416-1.84 11.232-2.16 14.432-1.296 10.592-2.912 17.76-4.848 21.552-1.936 3.76-7.392 10.528-16.4 20.336l-20.016 21.888c-13.68 14.752-22.448 25.344-26.304 31.744 23.744-15.12 46.928-22.688 69.552-22.688s45.888 7.568 69.792 22.688c-4-6.4-12.8-16.992-26.384-31.744l-19.936-21.888c-8.96-9.808-14.416-16.576-16.32-20.336z" /> +<glyph unicode="" d="M48 16v400h400v-400h-400zM416 384h-336v-96h32.272c2.384 17.92 11.936 31.344 23.392 31.344 11.472 0 21.024-13.424 23.392-31.344h17.136c2.304 18.096 11.92 31.664 23.456 31.664s21.152-13.584 23.456-31.664h113.072c2.304 18.096 11.92 31.664 23.456 31.664 11.552 0 21.152-13.584 23.472-31.664h32.896v96zM416 272h-32.8c-2.144-18.416-11.856-32.336-23.552-32.336-11.664 0-21.376 13.904-23.536 32.336h-112.912c-2.144-18.416-11.856-32.336-23.536-32.336s-21.392 13.92-23.536 32.336h-16.912c-2.064-18.576-11.808-32.656-23.552-32.656s-21.488 14.080-23.552 32.656h-32.112v-112h127.872c2.304 18.096 11.936 31.664 23.456 31.664 11.536 0 21.168-13.584 23.472-31.664h15.984c2.064 18.576 11.808 32.672 23.568 32.672 11.728 0 21.472-14.096 23.552-32.672h17.92c2.224 18.272 11.904 32 23.52 32s21.296-13.728 23.52-32h33.136v112zM416 144h-33.152c-2.224-18.256-11.904-32-23.52-32s-21.296 13.744-23.52 32h-18.080c-2.384-17.904-11.936-31.328-23.392-31.328-11.472 0-21.024 13.424-23.408 31.328h-16.064c-2.144-18.416-11.856-32.336-23.536-32.336-11.664 0-21.376 13.904-23.536 32.336h-127.792v-96h336v96z" /> +<glyph unicode="" d="M89.312 159.136l238.176 238.176 101.904-101.904-238.176-238.176-101.904 101.904zM338.448 339.872l-11.168 11.152-191.696-191.68 11.168-11.168 191.696 191.696zM360.784 317.536l-11.168 11.168-191.696-191.712 11.152-11.152 191.712 191.696zM383.12 295.2l-11.168 11.168-191.696-191.696 11.168-11.168 191.696 191.696zM373.104 442.304c12.496 12.528 32.72 12.608 45.12 0.208l56.192-56.192c12.4-12.4 12.32-32.608-0.192-45.12l-34.72-34.72-101.12 101.12 34.72 34.704zM81.472 145.872l96.48-96.48-84.544-30.032-41.968 41.968 30.032 84.544zM77.392 14.128l-49.056-17.872 17.872 49.056 31.184-31.184z" /> +<glyph unicode="" d="M464.384 376.016l-39.472-39.472-56.368 56.368 39.472 39.472c15.568 15.568 40.816 15.568 56.368 0s15.568-40.8 0-56.368zM441.824 330.928c3.12 3.104 8.176 3.104 11.28 0 3.12-3.12 3.12-8.176 0-11.28l-146.56-146.576c-3.12-3.104-8.176-3.104-11.28 0s-3.104 8.16 0 11.264l95.84 95.84-78.944 78.944 33.824 33.808 78.928-78.928 16.912 16.928zM312.176 336.544l56.368-56.368-225.504-225.504-56.368 56.368 225.504 225.504zM35.936 3.936l39.456 95.824 56.368-56.368-95.824-39.456z" /> +<glyph unicode="" d="M328 240h-144c-17.664 0-32-14.336-32-32s14.336-32 32-32h144c17.664 0 32 14.336 32 32s-14.336 32-32 32zM217.328 352l-17.328-96h112l-17.344 96h-77.328zM256 16l24 144h-48l24-144zM208 368h96c13.248 0 24 10.752 24 24s-10.752 24-24 24h-96c-13.264 0-24-10.752-24-24s10.736-24 24-24z" /> +<glyph unicode="" d="M303.568 195.168l-124.704 72c-15.296 8.848-34.88 3.6-43.712-11.696-8.832-15.312-3.584-34.88 11.712-43.712l124.688-72c15.312-8.848 34.88-3.6 43.712 11.712 8.864 15.296 3.616 34.864-11.696 43.696zM200.72 273.024l96.992-56 32.992 91.808-66.976 38.656-63.008-74.464zM129.216 37.184l92.784 112.704-41.568 24-51.216-136.704zM370.784 359.6l-83.12 48c-11.488 6.624-26.16 2.704-32.784-8.784-6.64-11.488-2.688-26.16 8.784-32.784l83.136-48c11.488-6.624 26.16-2.704 32.784 8.784 6.624 11.488 2.688 26.16-8.8 32.784z" /> +<glyph unicode="" d="M496.992 224c0-34-19.632-62.832-48.8-74.272v-37.28c0-8.8-7.136-15.936-15.92-15.936h-368.528c-8.816 0-15.936 7.136-15.936 15.936v37.28c-29.184 11.44-48.8 40.272-48.8 74.272s19.632 62.832 48.816 74.272v37.28c0 8.816 7.12 15.936 15.936 15.936h368.528c8.784 0 15.92-7.12 15.92-15.936v-37.28c29.168-11.44 48.784-40.272 48.784-74.272zM191.232 224h-63.744v-15.936h63.744v15.936zM266.912 278.336c-4.496 4.944-10.672 7.408-18.512 7.408-7.792 0-13.936-2.464-18.416-7.408-4.496-4.928-6.752-12.512-6.752-22.752 0-10.288 2.256-17.888 6.752-22.832 4.48-4.928 7.696-7.392 15.664-7.392 7.68 0 16.784 2.464 21.28 7.392 4.48 4.944 6.736 12.544 6.736 22.832-0.016 10.24-2.272 17.84-6.752 22.752zM321.12 288.24l-81.76-128.352h16.192l81.36 128.352h-15.792zM346.576 214.608c-4.48 4.928-10.672 7.392-18.512 7.392-7.776 0-13.936-2.464-18.432-7.392-4.48-4.944-6.72-12.512-6.72-22.752 0-10.288 2.24-17.904 6.72-22.832 4.496-4.944 10.72-7.408 18.688-7.408 7.68 0 13.776 2.464 18.272 7.408 4.48 4.928 6.736 12.544 6.736 22.832-0.016 10.24-2.272 17.808-6.752 22.752zM327.92 173.952c-2.304 0-4.096 0.976-5.392 2.896-1.712 2.512-2.576 7.504-2.576 14.976s0.864 12.48 2.576 15.040c1.248 1.872 3.040 2.832 5.392 2.832s4.176-0.96 5.472-2.832c1.664-2.56 2.496-7.584 2.496-15.040s-0.864-12.48-2.576-15.040c-1.248-1.888-3.040-2.832-5.392-2.832zM248.256 237.68c-2.304 0-4.096 0.976-5.392 2.912-1.712 2.512-2.576 7.504-2.576 14.976s0.864 12.48 2.576 15.040c1.248 1.872 3.040 2.816 5.392 2.816s4.16-0.944 5.472-2.816c1.664-2.56 2.496-7.584 2.496-15.040s-0.864-12.48-2.576-15.040c-1.264-1.888-3.056-2.848-5.392-2.848z" /> +<glyph unicode="" d="M170.896 188.688l-35.344-90.72 89.152 36.912-53.808 53.808zM429.68 382.448l-11.312 11.312c-12.48 12.496-32.752 12.496-45.248 0l-22.624-22.624 56.56-56.576 22.624 22.624c12.512 12.496 12.512 32.768 0 45.264zM172.688 193.312l8.096 8.096 56.56-56.56 158.4 158.4-56.56 56.56 11.312 11.328-177.808-177.824zM368.064 63.936l-272.416-0.096 0.048 272.416 190.736 0.064 29.888 31.68h-236.88c-8.832 0-16-7.152-16-16v-304c0-8.848 7.168-16 16-16h304c8.848 0 16 7.152 16 16v224.928l-32.24-31.632 0.864-177.36z" /> +<glyph unicode="" d="M344 144.192c30.944 0 56-32.256 56-72 0-39.776-25.056-72-56-72s-56 32.224-56 72c0 23.968 9.216 45.056 23.232 58.16l-55.232 79.28-55.248-79.28c14.032-13.104 23.248-34.192 23.248-58.16 0-39.776-25.072-72-56-72-30.928 0-56 32.224-56 72 0 39.744 25.072 72 56 72 3.184 0 6.272-0.56 9.312-1.216l55.6 99.808-58.096 83.392c-47.376 82.064-9.92 121.664-9.92 121.664l91.104-163.6 91.104 163.584c0 0 37.456-39.6-9.92-121.664l-58.096-83.392 55.6-99.808c3.024 0.672 6.128 1.232 9.312 1.232zM168 112.496c-17.664 0-32-17.904-32-40s14.336-40 32-40 32 17.904 32 40-14.336 40-32 40zM256 254.832c-8.832 0-16-7.152-16-16 0-8.832 7.168-16 16-16 8.848 0 16 7.168 16 16 0 8.848-7.152 16-16 16zM312 72.496c0-22.096 14.336-40 32-40s32 17.904 32 40-14.336 40-32 40-32-17.904-32-40z" /> +<glyph unicode="" d="M368 303.504c0 8.848-7.168 16-16 16h-48c0 0 0.528 19.264 0.528 47.264 0 26-21.536 49.728-48.528 49.728s-47.808-22.576-47.808-49.584c0-26-0.192-47.424-0.192-47.424h-48c-8.848 0-16-7.152-16-16 0-8.832 0-31.008 0-31.008h224c0 0.016 0 22.192 0 31.024zM256 336.496c-8.848 0-16 7.168-16 16 0 8.848 7.152 16 16 16 8.832 0 16-7.152 16-16 0-8.832-7.168-16-16-16zM448 303.504l-64 0.992 0.336-49.664h-256.336v47.664l-64 0.992c-17.664 0-32-14.336-32-32v-224c0-17.664 14.336-32 32-32h384c17.664 0 32 14.336 32 32v224c0 17.68-14.336 32.016-32 32.016zM160 210.496c19.328 0 35.008-20.592 35.008-46s-15.68-46-35.008-46-35.008 20.592-35.008 46 15.68 46 35.008 46zM90.672 64.336c0 0 3.792 30.432 12.416 36.176 8.608 5.744 33.44 9.568 33.44 9.568s16.096-17.2 22.944-17.2c6.832 0 22.928 17.2 22.928 17.2s24.832-3.808 33.456-9.568c10.128-6.752 12.656-36.176 12.656-36.176h-137.84zM416 79.504h-144v16h144v-16zM416 111.504h-144v16h144v-16zM416 143.504h-144v16h144v-16zM416 175.504h-144v16h144v-16z" /> +<glyph unicode="" d="M448 80h-48v16c8.848 0 16 7.168 16 16 0 8.848-7.152 16-16 16h-32c-8.848 0-16-7.152-16-16 0-8.832 7.152-16 16-16v-16h-208v16c8.848 0 16 7.168 16 16 0 8.848-7.152 16-16 16h-32c-8.848 0-16-7.152-16-16 0-8.832 7.152-16 16-16v-16h-64c-17.664 0-32 14.336-32 32v224c0 17.664 14.336 32 32 32h384c17.664 0 32-14.336 32-32v-224c0-17.664-14.336-32-32-32zM160 323.008c-19.328 0-35.008-20.592-35.008-46s15.68-46 35.008-46 35.008 20.592 35.008 46-15.68 46-35.008 46zM215.84 212.992c-8.624 5.744-33.456 9.568-33.456 9.568s-16.096-17.2-22.928-17.2c-6.848 0-22.944 17.2-22.944 17.2s-24.832-3.808-33.44-9.568c-8.624-5.728-12.432-36.176-12.432-36.176h137.84c0.016 0.016-2.512 29.44-12.64 36.176zM416 304h-144v-16h144v16zM416 272h-144v-16h144v16zM416 240h-144v-16h144v16zM416 208h-144v-16h144v16z" /> +<glyph unicode="" d="M95.456 211.728l65.44 65.44h-38.352c0.352 0.96 0.72 1.904 1.072 2.848 22.752 57.632 78.944 98.4 144.64 98.4 85.856 0 155.456-69.6 155.456-155.44 0-85.856-69.6-155.456-155.456-155.456-63.136 0-117.488 37.664-141.808 91.728-0.24 0.496-0.384 1.056-0.624 1.584l-41.68-41.424c0.288-0.48 0.48-1.024 0.768-1.536 0.064-0.112 0.128-0.224 0.192-0.32 36.784-63.552 105.504-106.288 184.208-106.288 117.472 0 212.704 95.232 212.704 212.704s-95.248 212.736-212.72 212.736c-98.208 0-180.848-66.528-205.328-156.992-0.24-0.832-0.32-1.712-0.512-2.544h-33.456l65.456-65.44z" /> +<glyph unicode="" d="M74.992 302.096l148.592-142.928v86.592c45.008 0 159.568-0.992 159.568-118.816 0-61.68-43.744-113.152-101.904-125.056 93.472 12.672 165.744 91.952 165.744 188.896 0 180.096-192.416 181.632-223.408 181.632v73.696l-148.592-144.016z" /> +<glyph unicode="" d="M436.752 302.096l-148.592-142.928v86.592c-44.992 0-159.584-0.992-159.584-118.816 0-61.68 43.76-113.152 101.936-125.056-93.472 12.672-165.76 91.952-165.76 188.896 0 180.096 192.4 181.616 223.408 181.616v73.712l148.592-144.016z" /> +<glyph unicode="" d="M128.208 127.472v127.552h62.912l-94.432 110.272-96.416-110.288h63.152v-190.336h279.488l-62.768 62.784h-151.936zM448.576 175.984v191.328h-280.496l63.776-63.76h151.936v-127.568h-62.912l94.416-110.288 96.416 110.288h-63.136z" /> +<glyph unicode="" d="M367.504 288v-47.008l112.992 72.992-112 70-0.992-48h-94l-115.008-174.992h-126v-48.992h150l112 176h73.008zM192.496 236.992l24.992 44-34.992 55.008h-150l-0.992-48h127.008l33.984-51.008zM367.504 160h-72.992l-32 51.008-26.016-43.008 36.992-56h94l0.992-48 112 70-112.992 72.992v-46.992z" /> +<glyph unicode="" d="M400 159.008c0-10.672-5.328-15.008-16-15.008h-256v51.008l-75.008-75.008 74-74 1.008 50h288c17.664 0 32 14.336 32 32v137.664l-48-48v-58.656zM112 288.992c0 10.672 5.328 15.008 16 15.008h256v-51.008l75.008 75.008-74 74-1.008-50h-288c-17.664 0-32-14.336-32-32v-137.664l48 48v58.656z" /> +<glyph unicode="" d="M400.032 345.696v-200.528h64.624v-64.624h-352.944v350.944h64.624v-63.632h198.864l74.224 74.224 22.48-22.496-71.872-73.888zM176.336 304.24v-136.24l135.232 136.24h-135.232zM335.408 282.080l-137.904-136.912h137.904v136.912zM48.096 367.856h48.72v-63.632h-48.72v63.632zM400.032 16.928h-64.624v47.712h64.624v-47.712z" /> +<glyph unicode="" d="M448 96v-64h-64v16h-256v-16h-64v64h16v256h-16v64h64v-16h256v16h64v-64h-16v-256h16zM80 48h32v32h-32v-32zM112 400h-32v-32h32v32zM384 368h-256v-16h-16v-256h16v-16h256v16h16v256h-16v16zM432 400h-32v-32h32v32zM400 80v-32h32v32h-32z" /> +<glyph unicode="" d="M448 96v-64h-64v16h-96v-16h-64v16h-96v-16h-64v64h16v96h-16v64h16v96h-16v64h64v-16h96v16h64v-16h96v16h64v-64h-16v-96h16v-64h-16v-96h16zM240 48h32v32h-32v-32zM80 48h32v32h-32v-32zM80 208h32v32h-32v-32zM112 400h-32v-32h32v32zM272 400h-32v-32h32v32zM384 368h-96v-16h-64v16h-96v-16h-16v-96h16v-64h-16v-96h16v-16h96v16h64v-16h96v16h16v96h-16v64h16v96h-16v16zM432 400h-32v-32h32v32zM432 240h-32v-32h32v32zM400 80v-32h32v32h-32z" /> +<glyph unicode="" d="M461.712 192c-12.8-90.4-83.632-162-173.712-175.952v-16.048h-64v16.048c-90.080 13.936-160.912 85.552-173.728 175.952h-18.272v64h19.008c14.784 87.888 84.688 156.96 172.992 170.624v21.376h64v-21.376c88.32-13.664 158.192-82.736 172.992-170.624h19.008v-64h-18.288zM240 16h32v32h-32v-32zM48 240v-32h32v32h-32zM272 432h-32v-32h32v32zM288 402.368v-18.368h-64v18.368c-75.040-13.184-134.416-71.728-148.672-146.368h20.672v-64h-21.536c12.4-77.152 72.72-138.208 149.536-151.696v23.696h64v-23.696c76.816 13.504 137.136 74.544 149.536 151.696h-21.536v64h20.672c-14.272 74.64-73.632 133.184-148.672 146.368zM464 240h-32v-32h32v32z" /> +<glyph unicode="" d="M0 80v288h512v-288h-512zM32 336.992v-224.992h448v224.992h-448zM336 224c0 53.008-35.808 96-80 96h208v-192h-208c44.192 0 80 42.992 80 96zM400 192c13.248 0 24 14.336 24 32s-10.752 32-24 32-24-14.336-24-32 10.752-32 24-32zM289.888 264.352c-0.24-0.88-0.576-1.504-0.992-1.904-0.432-0.4-1.008-0.592-1.744-0.592s-1.888 0.448-3.504 1.376c-1.6 0.944-3.568 1.936-5.888 3.024-2.336 1.088-5.024 2.080-8.096 2.992-3.072 0.896-6.432 1.328-10.096 1.328-2.88 0-5.376-0.336-7.504-1.040-2.128-0.688-3.92-1.664-5.344-2.88-1.44-1.232-2.496-2.72-3.2-4.432-0.688-1.712-1.040-3.552-1.040-5.472 0-2.88 0.784-5.36 2.352-7.456 1.568-2.096 3.664-3.968 6.304-5.6 2.64-1.648 5.616-3.168 8.96-4.592 3.312-1.44 6.72-2.96 10.192-4.544 3.472-1.616 6.864-3.424 10.192-5.456 3.344-2.032 6.32-4.464 8.912-7.296s4.688-6.16 6.304-9.984c1.6-3.84 2.384-8.336 2.384-13.552 0-6.8-1.248-12.752-3.776-17.888-2.544-5.12-5.968-9.408-10.32-12.832-4.336-3.44-9.392-6.016-15.184-7.744-0.736-0.224-1.536-0.32-2.288-0.496v-17.472h-15.728v15.408c-0.208 0-0.384-0.032-0.576-0.032-4.464 0-8.624 0.352-12.448 1.072-3.84 0.736-7.216 1.616-10.144 2.624-2.944 1.024-5.376 2.096-7.344 3.216-1.968 1.12-3.376 2.112-4.24 2.976-0.864 0.864-1.488 2.112-1.856 3.744-0.368 1.648-0.56 3.984-0.56 7.056 0 2.064 0.064 3.792 0.208 5.2s0.352 2.528 0.656 3.408 0.688 1.488 1.2 1.856c0.496 0.352 1.072 0.544 1.744 0.544 0.928 0 2.24-0.544 3.952-1.648 1.696-1.104 3.888-2.32 6.544-3.648 2.672-1.344 5.84-2.544 9.552-3.664 3.696-1.088 7.984-1.648 12.848-1.648 3.2 0 6.064 0.384 8.592 1.152s4.688 1.84 6.448 3.248 3.104 3.136 4.048 5.2c0.944 2.080 1.408 4.368 1.408 6.928 0 2.928-0.816 5.44-2.4 7.552-1.6 2.096-3.68 3.952-6.256 5.6-2.56 1.632-5.472 3.152-8.736 4.592-3.264 1.44-6.624 2.96-10.096 4.544-3.456 1.6-6.832 3.408-10.096 5.456-3.264 2.032-6.176 4.448-8.736 7.28-2.56 2.832-4.656 6.192-6.24 10.048-1.6 3.856-2.4 8.496-2.4 13.888 0 6.208 1.152 11.648 3.44 16.336 2.304 4.688 5.392 8.592 9.296 11.68s8.496 5.408 13.792 6.944c2.72 0.8 5.536 1.36 8.416 1.744v16.544h15.728v-16.544c0.624-0.080 1.248-0.048 1.872-0.144 3.056-0.464 5.936-1.088 8.592-1.888 2.672-0.784 5.024-1.664 7.104-2.672 2.064-0.992 3.424-1.808 4.096-2.48 0.672-0.656 1.104-1.216 1.36-1.68 0.224-0.464 0.416-1.088 0.592-1.856 0.16-0.768 0.288-1.728 0.336-2.912 0.064-1.152 0.096-2.608 0.096-4.336 0-1.936-0.048-3.584-0.144-4.928-0.144-1.264-0.304-2.384-0.544-3.248zM176 224c0-53.008 35.808-96 80-96h-208v192h208c-44.192 0-80-42.992-80-96zM112 256c-13.264 0-24-14.336-24-32s10.736-32 24-32c13.248 0 24 14.336 24 32s-10.752 32-24 32z" /> +<glyph unicode="" d="M576.032 111.84l0.912 273.424-496.8-0.304-0.016 31.36h527.872v-304.496l-31.968 0.016zM559.92 63.728l-31.952 0.032 0.912 273.424-496.8-0.32-0.016 31.36h527.872v-304.496zM512.848 31.68h-512.848v288.48h512.848v-288.48zM480.784 289.104h-448.736v-225.376h448.72v225.376zM432.72 87.76c0-2.832 0.704-5.472 1.616-8h-177.92c44.256 0 80.144 43.040 80.144 96.16s-35.888 96.16-80.144 96.16h177.904c-0.912-2.528-1.616-5.168-1.616-8.016 0-13.28 10.752-24.032 24.032-24.032 2.848 0 5.488 0.704 8.016 1.616v-131.44c-2.528 0.896-5.168 1.616-8.016 1.616-13.264-0.016-24.016-10.784-24.016-24.064zM400.656 209.296c-13.28 0-24.032-14.336-24.032-32.048s10.752-32.048 24.032-32.048 24.032 14.336 24.032 32.048-10.752 32.048-24.032 32.048zM289.968 233.696c0.24-0.464 0.432-1.088 0.592-1.856 0.176-0.768 0.288-1.744 0.336-2.912 0.080-1.168 0.112-2.624 0.112-4.368 0-1.936-0.048-3.584-0.144-4.912-0.112-1.344-0.288-2.448-0.496-3.312-0.256-0.88-0.576-1.52-0.992-1.904-0.432-0.4-1.024-0.608-1.76-0.608s-1.888 0.464-3.504 1.392c-1.616 0.944-3.584 1.936-5.904 3.024s-5.040 2.096-8.112 2.992-6.432 1.344-10.112 1.344c-2.88 0-5.376-0.336-7.504-1.040-2.144-0.704-3.936-1.664-5.36-2.896-1.44-1.232-2.512-2.72-3.2-4.432-0.704-1.728-1.056-3.568-1.056-5.488 0-2.88 0.784-5.36 2.352-7.472 1.568-2.096 3.664-3.968 6.32-5.6 2.64-1.648 5.632-3.168 8.96-4.608s6.736-2.96 10.208-4.544c3.472-1.616 6.88-3.424 10.224-5.472 3.344-2.032 6.32-4.464 8.912-7.296 2.608-2.848 4.72-6.176 6.32-10.016s2.4-8.352 2.4-13.568c0-6.8-1.28-12.784-3.808-17.904-2.528-5.136-5.968-9.44-10.32-12.88s-9.408-6.016-15.216-7.744c-0.736-0.224-1.536-0.32-2.288-0.496v-17.504h-15.76v15.44c-0.208 0-0.384-0.048-0.592-0.048-4.464 0-8.624 0.368-12.464 1.088-3.84 0.736-7.232 1.616-10.16 2.624-2.944 1.024-5.392 2.112-7.36 3.232-1.984 1.12-3.392 2.112-4.256 2.976s-1.488 2.112-1.856 3.744-0.56 4-0.56 7.072c0 2.064 0.064 3.808 0.208 5.2 0.128 1.408 0.352 2.544 0.656 3.424 0.304 0.864 0.704 1.488 1.2 1.856 0.496 0.352 1.088 0.544 1.744 0.544 0.944 0 2.256-0.544 3.968-1.664 1.696-1.088 3.888-2.32 6.56-3.648s5.856-2.544 9.568-3.648c3.696-1.104 8-1.664 12.864-1.664 3.2 0 6.080 0.384 8.608 1.152 2.544 0.768 4.688 1.856 6.464 3.248 1.76 1.408 3.104 3.152 4.048 5.216 0.944 2.080 1.408 4.384 1.408 6.928 0 2.944-0.816 5.472-2.4 7.568-1.6 2.112-3.68 3.968-6.256 5.616-2.576 1.632-5.488 3.168-8.752 4.592-3.28 1.44-6.64 2.96-10.112 4.56-3.472 1.6-6.848 3.424-10.112 5.456-3.264 2.032-6.192 4.464-8.752 7.312-2.56 2.832-4.656 6.192-6.256 10.048-1.6 3.872-2.4 8.512-2.4 13.92 0 6.208 1.152 11.664 3.456 16.352 2.304 4.704 5.408 8.608 9.312 11.712 3.904 3.088 8.512 5.424 13.808 6.96 2.72 0.784 5.536 1.36 8.432 1.744v16.56h15.76v-16.56c0.624-0.080 1.248-0.048 1.872-0.144 3.072-0.464 5.952-1.088 8.624-1.888 2.656-0.8 5.024-1.68 7.088-2.688 2.080-0.992 3.44-1.808 4.128-2.48 0.624-0.592 1.072-1.152 1.312-1.632zM176.288 175.92c0-53.104 35.872-96.16 80.128-96.16h-177.904c0.896 2.528 1.616 5.168 1.616 8 0 13.28-10.768 24.048-24.032 24.048-2.848 0-5.488-0.72-8.016-1.616v131.44c2.528-0.912 5.168-1.616 8.016-1.616 13.28 0 24.032 10.752 24.032 24.032 0 2.848-0.72 5.488-1.616 8.016h177.904c-44.256 0.016-80.128-43.040-80.128-96.144zM112.176 209.296c-13.28 0-24.032-14.336-24.032-32.048s10.768-32.048 24.032-32.048c13.28 0 24.032 14.336 24.032 32.048s-10.752 32.048-24.032 32.048z" horiz-adv-x="608" /> +<glyph unicode="" d="M456 112h-195.936c5.744 9.904 10.144 20.64 13.056 32h182.88c8.848 0 16-7.152 16-16 0-8.832-7.152-16-16-16zM456 160h-179.776c0.656 5.248 1.104 10.576 1.104 16 0 5.44-0.448 10.752-1.104 16h179.776c8.848 0 16-7.152 16-16 0-8.832-7.152-16-16-16zM456 208h-182.88c-2.928 11.36-7.312 22.096-13.056 32h195.936c8.848 0 16-7.152 16-16 0-8.832-7.152-16-16-16zM456 256h-206.848c-10.4 12.976-23.248 23.888-37.904 32h244.752c8.848 0 16-7.152 16-16 0-8.832-7.152-16-16-16zM456 304h-256c-8.848 0-16 7.168-16 16 0 8.848 7.152 16 16 16h256c8.848 0 16-7.152 16-16 0-8.832-7.152-16-16-16zM456 352h-256c-8.848 0-16 7.168-16 16 0 8.848 7.152 16 16 16h256c8.848 0 16-7.152 16-16 0-8.832-7.152-16-16-16zM264 176c0-61.856-50.16-112-112-112-61.856 0-112 50.144-112 112s50.144 112 112 112c61.84 0 112-50.144 112-112zM191.648 163.824c-1.616 3.824-3.696 7.152-6.304 9.984s-5.568 5.264-8.896 7.296c-3.328 2.032-6.72 3.84-10.192 5.456-3.472 1.6-6.864 3.104-10.192 4.544-3.328 1.424-6.32 2.96-8.944 4.592-2.64 1.632-4.736 3.504-6.304 5.6-1.568 2.096-2.352 4.576-2.352 7.456 0 1.92 0.352 3.744 1.040 5.472 0.704 1.712 1.76 3.2 3.2 4.432 1.424 1.216 3.216 2.192 5.344 2.88 2.128 0.704 4.64 1.040 7.504 1.040 3.664 0 7.024-0.432 10.096-1.328 3.056-0.912 5.76-1.888 8.096-2.992 2.336-1.088 4.304-2.096 5.904-3.024 1.6-0.928 2.768-1.376 3.504-1.376s1.312 0.192 1.744 0.592c0.416 0.4 0.768 1.024 0.992 1.904 0.24 0.864 0.384 1.968 0.496 3.296 0.096 1.344 0.144 2.992 0.144 4.928 0 1.728-0.032 3.184-0.096 4.336-0.064 1.168-0.192 2.144-0.336 2.912-0.176 0.768-0.368 1.392-0.592 1.856-0.256 0.464-0.688 1.024-1.36 1.68-0.672 0.672-2.032 1.504-4.096 2.48-2.064 0.992-4.432 1.888-7.088 2.672-2.672 0.8-5.536 1.424-8.592 1.888-0.624 0.096-1.264 0.064-1.888 0.144v16.544h-15.744v-16.544c-2.896-0.384-5.696-0.96-8.416-1.744-5.296-1.536-9.888-3.84-13.792-6.944s-7.008-7.008-9.296-11.68c-2.304-4.704-3.44-10.144-3.44-16.336 0-5.392 0.8-10.032 2.384-13.888 1.6-3.856 3.68-7.216 6.256-10.048 2.576-2.832 5.472-5.248 8.736-7.28 3.264-2.048 6.64-3.856 10.096-5.456 3.472-1.6 6.832-3.104 10.096-4.544s6.176-2.976 8.736-4.592c2.576-1.648 4.656-3.504 6.256-5.6 1.6-2.112 2.4-4.624 2.4-7.552 0-2.544-0.464-4.848-1.392-6.928-0.944-2.064-2.288-3.792-4.048-5.2-1.76-1.408-3.904-2.48-6.432-3.248-2.544-0.768-5.392-1.152-8.608-1.152-4.864 0-9.152 0.544-12.848 1.648-3.696 1.104-6.88 2.32-9.552 3.664-2.672 1.328-4.848 2.528-6.544 3.648-1.696 1.088-3.008 1.648-3.952 1.648-0.672 0-1.264-0.192-1.744-0.544-0.512-0.368-0.912-0.992-1.2-1.856-0.304-0.88-0.512-2-0.656-3.408s-0.208-3.136-0.208-5.2c0-3.072 0.192-5.424 0.544-7.056 0.368-1.648 0.992-2.896 1.856-3.744 0.864-0.864 2.272-1.84 4.24-2.976s4.416-2.192 7.344-3.216c2.928-1.008 6.32-1.888 10.144-2.624 3.824-0.72 7.984-1.072 12.448-1.072 0.192 0 0.368 0.032 0.576 0.032v-15.408h15.728v17.472c0.752 0.192 1.552 0.288 2.288 0.496 5.792 1.728 10.864 4.32 15.2 7.744 4.336 3.424 7.76 7.696 10.304 12.832 2.528 5.136 3.776 11.088 3.776 17.888 0.016 5.168-0.784 9.664-2.368 13.504zM249.152 96h206.848c8.848 0 16-7.152 16-16 0-8.832-7.152-16-16-16h-244.752c14.656 8.112 27.504 19.024 37.904 32z" /> +<glyph unicode="" d="M394.784 129.456c0 0 53.28 36.448 53.28 108.336 0 107.008-113.408 146.576-174.384 145.52-60.992-1.072-79.168-17.12-79.168-17.12s-20.752 15.088-42.752 27.728c-16.832 6.56-20.736 7.504-32.432 3.744-9.36 0-3.472-15.584 0.288-21.2 3.728-5.616 21.856-36.64 21.856-36.64s-38.048-39.184-40.864-64.944c0 0.464-17.92 0.144-27.744 0.144s-8.896-10.704-8.896-10.704l0.272-75.424c0 0-0.608-10.704 8.304-10.704 8.896 0 27.808-0.208 27.808-0.208s26.608-38.64 43.472-45.664c0-0.464-14.576-40.048-14.576-40.048s-7.024-12.176 5.616-16.864c12.64-4.672 45.616-18.512 59.664-22.736 14.032-4.208 16.048 5.344 16.048 5.344l13.904 30.032 90.96-0.144 13.904-30.96c0 0 2.672-14.368 21.392-6.416 18.736 7.952 39.184 17.392 54.64 25.344 15.44 7.952 5.28 22.816 5.28 22.816l-15.872 30.768zM149.152 259.776c-8.528 0-15.44 6.928-15.44 15.456s6.912 15.44 15.44 15.44 15.456-6.912 15.456-15.44-6.928-15.456-15.456-15.456zM366.8 307.904c-4.928-5.84-8.144-1.536-12.112-0.368 0 0-16.816 15.6-41.52 22.88-25.584 7.52-52.512 3.888-52.512 3.888-3.968 1.168-8.784 1.296-8.816 7.424 0.208 7.568 9.392 7.632 9.28 7.888 0 0 30.304 2.8 55.664-4.656 24.944-7.328 44-23.264 44-23.264s10.192-7.024 6.016-13.792z" /> +<glyph unicode="" d="M247.616 168.624l-135.216-136.016v366.784h271.216v-366.784l-136 136.016z" /> +<glyph unicode="" d="M400 16h-256v352h112v-146l56.656 43.008 55.344-43.008v146h64v-320c0-17.664-14.336-32-32-32zM312.656 286l-40.656-32v130h80v-130l-39.344 32zM96 400v-16c0-8.832 7.168-16 16-16h16v-352h-16c-17.664 0-32 14.336-32 32v352c0 17.664 14.336 32 32 32h288c11.808 0 22.016-6.464 27.568-16h-315.568c-8.832 0-16-7.152-16-16z" /> +<glyph unicode="" d="M432 192.992v48h32v-48h-32zM432 304h32v-48h-32v48zM432 368h32v-48h-32v48zM384 16h-288c-17.664 0-32 14.336-32 32h8c13.248 0 24 10.752 24 24s-10.752 24-24 24h-8v16h8c13.248 0 24 10.752 24 24s-10.752 24-24 24h-8v16h8c13.248 0 24 10.752 24 24s-10.752 24-24 24h-8v16h8c13.248 0 24 10.752 24 24s-10.752 24-24 24h-8v16h8c13.248 0 24 10.752 24 24s-10.752 24-24 24h-8v48c0 17.664 14.336 32 32 32h288c11.808 0 22.016-6.464 27.568-16h-315.568c-8.848 0-16-7.152-16-16 0-8.832 7.152-16 16-16h320v-336c0-17.664-14.336-32-32-32zM248 327.008c-19.328 0-35.008-20.592-35.008-46s15.664-46 35.008-46 35.008 20.592 35.008 46-15.68 46-35.008 46zM303.84 212.992c-8.624 5.744-33.456 9.568-33.456 9.568s-16.096-17.2-22.928-17.2c-6.848 0-22.944 17.2-22.944 17.2s-24.832-3.808-33.44-9.568c-8.624-5.728-12.432-36.176-12.432-36.176h137.84c0.016 0.016-2.512 29.44-12.64 36.176zM80 328c0-4.416-3.584-8-8-8h-16c-4.416 0-8 3.584-8 8s3.584 8 8 8h16c4.416 0 8-3.584 8-8zM56 272h16c4.416 0 8-3.584 8-8s-3.584-8-8-8h-16c-4.416 0-8 3.584-8 8s3.584 8 8 8zM56 208h16c4.416 0 8-3.584 8-8s-3.584-8-8-8h-16c-4.416 0-8 3.584-8 8s3.584 8 8 8zM56 144h16c4.416 0 8-3.584 8-8s-3.584-8-8-8h-16c-4.416 0-8 3.584-8 8s3.584 8 8 8zM56 80h16c4.416 0 8-3.584 8-8s-3.584-8-8-8h-16c-4.416 0-8 3.584-8 8s3.584 8 8 8z" /> +<glyph unicode="" d="M96 416c-8.848 0-16-7.152-16-16 0-8.832 7.152-16 16-16h320v-336c0-17.664-14.336-32-32-32h-288c-17.664 0-32 14.336-32 32h8c13.248 0 24 10.752 24 24s-10.752 24-24 24h-8v16h8c13.248 0 24 10.752 24 24s-10.752 24-24 24h-8v16h8c13.248 0 24 10.752 24 24s-10.752 24-24 24h-8v16h8c13.248 0 24 10.752 24 24s-10.752 24-24 24h-8v16h8c13.248 0 24 10.752 24 24s-10.752 24-24 24h-8v48c0 17.664 14.336 32 32 32h288c11.808 0 22.016-6.464 27.568-16h-315.568zM167.84 167.6c3.824-8.528 9.536-16.080 17.088-22.64 7.568-6.544 16.72-11.456 27.456-14.72 10.752-3.264 22.464-4.912 35.184-4.912 13.808 0 25.616 1.824 35.408 5.456 9.792 3.648 18.256 8.576 25.36 14.816 7.088 6.24 12.112 12.352 15.024 18.352h-15.504c-5.040-7.184-12.64-13.296-22.784-18.336s-22.72-7.552-37.712-7.552c-14.048 0-26.832 2.416-38.368 7.264s-20.368 12.336-26.464 22.448c-6.112 10.144-9.152 22.224-9.152 36.256 0 13.408 3.040 25.952 9.136 37.664 6.096 11.712 14.688 20.704 25.76 26.976 11.056 6.288 23.312 9.408 36.704 9.408 11.728 0 22.448-2.48 32.16-7.472s16.992-11.648 21.888-19.936c4.896-8.32 7.344-17.248 7.344-26.816 0-8.192-1.904-16.144-5.712-23.84-3.824-7.712-8.992-13.856-15.552-18.432-4.944-3.504-8.928-5.248-11.952-5.248-1.664 0-3.088 0.56-4.272 1.68-1.168 1.104-1.76 2.448-1.76 4 0 0.864 0.864 5.296 2.576 13.328l12.416 57.728h-15.376l-2.976-13.312c-3.264 5.328-7.152 9.296-11.68 11.904-4.512 2.608-9.28 3.904-14.256 3.904-6.528 0-13.264-2.288-20.208-6.88-6.928-4.592-12.72-11.456-17.392-20.592-4.672-9.152-7.008-18.288-7.008-27.408 0-7.392 1.504-14.192 4.512-20.384 3.008-6.192 6.928-10.784 11.728-13.744 4.816-2.992 9.76-4.464 14.864-4.464 4.64 0 9.264 1.296 13.872 3.904 4.624 2.608 8.8 6.064 12.512 10.352 0.336-3.504 0.896-5.968 1.648-7.424 1.136-2.24 2.928-3.952 5.36-5.168 2.432-1.2 5.648-1.792 9.6-1.792 12.384 0 23.792 5.776 34.24 17.344 11.696 12.896 17.552 27.648 17.552 44.256 0 11.632-2.784 22.4-8.336 32.32-6.512 11.52-15.44 20.176-26.752 25.984s-24.064 8.72-38.288 8.72c-18.336 0-33.904-4.112-46.768-12.352s-22.784-20.128-29.76-35.648c-5.728-12.656-8.592-25.968-8.592-39.936 0.016-12.56 2.416-24.256 7.232-35.056zM247.824 186.288c-3.232-3.776-6.624-6.64-10.176-8.56-3.568-1.92-6.944-2.896-10.144-2.896-4.816 0-9.072 2.192-12.816 6.544-3.712 4.352-5.584 10.464-5.584 18.336 0 4.944 0.928 10.352 2.752 16.288 1.824 5.904 4.272 10.928 7.296 15.056 3.040 4.128 6.176 7.12 9.408 8.992 3.232 1.872 6.688 2.8 10.352 2.8 5.568 0 10.272-2.144 14.144-6.448 3.856-4.304 5.792-10.352 5.792-18.16 0-5.856-1.024-11.696-3.088-17.52-2.048-5.84-4.704-10.656-7.936-14.432zM80 328c0-4.416-3.584-8-8-8h-16c-4.416 0-8 3.584-8 8s3.584 8 8 8h16c4.416 0 8-3.584 8-8zM56 272h16c4.416 0 8-3.584 8-8s-3.584-8-8-8h-16c-4.416 0-8 3.584-8 8s3.584 8 8 8zM56 208h16c4.416 0 8-3.584 8-8s-3.584-8-8-8h-16c-4.416 0-8 3.584-8 8s3.584 8 8 8zM56 144h16c4.416 0 8-3.584 8-8s-3.584-8-8-8h-16c-4.416 0-8 3.584-8 8s3.584 8 8 8zM56 80h16c4.416 0 8-3.584 8-8s-3.584-8-8-8h-16c-4.416 0-8 3.584-8 8s3.584 8 8 8zM464 320.992h-32v48h32v-48zM464 256h-32v48h32v-48zM464 192.992h-32v48h32v-48z" /> +<glyph unicode="" d="M432 16l-31.984 0.992v-32.992h-48v32h-191.008l-0.992-32h-48v31.008l-32.016 0.992c-17.664 0-32 14.336-32 32v384c0 17.664 14.336 32 32 32h352c17.664 0 32-14.336 32-32v-384c0-17.664-14.336-32-32-32zM416 416h-320v-63.328l-15.664 0.32v-49.328h15.664v-126.672h-16v-48.992h16v-64h320v352zM400 80h-288v48h16v48.992h-16v127.008h16l0.336 48.672h-16.336v47.328h288v-320zM232.992 311.008c-35.344 0-64-28.656-64-64s28.656-64 64-64c35.36 0 64 28.656 64 64s-28.64 64-64 64zM376 295.712c0 8.848-7.152 16-16 16-8.832 0-16-7.152-16-16 0-5.856 3.312-10.768 8-13.552v-84.624c-4.688-2.784-8-7.68-8-13.552 0-8.832 7.168-16 16-16 8.848 0 16 7.168 16 16 0 6.304-3.712 11.616-8.992 14.224v83.28c5.28 2.624 8.992 7.936 8.992 14.224zM232 220c-13.248 0-24 10.752-24 24 0 13.264 10.752 24 24 24 13.264 0 24-10.736 24-24 0-13.248-10.736-24-24-24z" /> +<glyph unicode="" d="M256.24 178.224l-65.152 53.488-141.792-167.408h414.016l-141.808 169.072-65.264-55.152zM478.816 383.696h-445.040l222.528-187.168 222.512 187.168zM331.28 241.808l148.656-177.344v303.232l-148.656-125.888zM32.064 367.696v-303.232l148.656 177.344-148.656 125.888z" /> +<glyph unicode="" d="M322.224 177.056l156.592 127.984-222.816 157.328-222.24-157.328 157.184-128.512 131.28 0.528zM197.76 161.024l-148.464-175.392h414.016l-149.808 174.4-115.744 0.992zM331.28 163.152l148.656-177.344v303.232l-148.656-125.888zM32.064 289.040v-303.232l148.656 177.344-148.656 125.888z" /> +<glyph unicode="" d="M256 0.672c-123.344 0-223.328 99.984-223.328 223.328s99.984 223.328 223.328 223.328c123.344 0 223.344-99.984 223.344-223.328s-100-223.328-223.344-223.328zM366.72 391.168c-59.568 39.984-110.064 33.408-110.064 33.408l-0.048-144.128c-20.304-0.512-37.76-11.712-47.328-28.176l-122.032 78.176c0 0-32.336-31.664-32.336-103.424s30.992-106.432 30.992-106.432l123.568 74.816c9.616-16.304 26.992-27.344 47.152-27.856l0.048-146.144c0 0 50.512-6.576 110.064 33.392 59.6 39.984 69.056 81.136 69.056 81.136l-127.712 62.192c4.064 7.776 6.56 16.496 6.56 25.872 0 8.48-2 16.432-5.344 23.664l129.184 61.024c-0.016 0.016-12.16 42.512-71.76 82.48zM258.016 191.664c-17.856 0-32.336 14.48-32.336 32.336s14.48 32.336 32.336 32.336c17.856 0 32.32-14.48 32.32-32.336s-14.464-32.336-32.32-32.336z" /> +<glyph unicode="" d="M431.168 423.392c-85.792-1.696-185.184-16.56-270.992-44.608-0.048 0.56 0.32-254.848 0.32-254.848-15.488 3.504-32.992 1.472-51.376-6.912-34.112-15.504-52.72-46.848-41.552-70 11.168-23.184 47.872-29.408 81.984-13.872 31.184 16.72 41.216 31.84 42.24 53.712l0.768 221.312c67.616 19.888 139.12 31.68 206.768 35.328v-197.856c-15.664 3.84-36.416 1.904-55.216-6.624-34.112-15.536-52.72-46.88-41.552-70.032 11.168-23.184 47.872-29.376 82-13.872 24.256 11.024 43.664 30.064 47.088 48.464 0.016 0.016-0.816 320.24-0.48 319.808z" /> +<glyph unicode="" d="M432.032 399.92h-368.080c-8.816 0-15.952 7.152-15.952 16 0 8.832 7.136 15.984 15.952 15.984h168.576v16c0 8.832 7.152 15.984 15.968 15.984s15.952-7.152 15.952-15.984v-16h167.584c8.832 0 15.968-7.168 15.968-15.984 0-8.848-7.136-16-15.968-16zM432.032 144.032h-368.080v239.904h368.080v-239.904zM112 271.488c0-35.408 28.656-64.112 64-64.112s64 28.704 64 64.112h-64v64.144c-35.344 0-64-28.72-64-64.144zM288.384 335.952h-15.952v-15.984h15.952v15.984zM288.384 303.968h-15.952v-15.984h15.952v15.984zM288.384 271.984h-15.952v-15.984h15.952v15.984zM288.384 240h-15.952v-16h15.952v16zM288.384 208h-15.952v-16h15.952v16zM384.16 335.952h-79.792v-15.984h79.792v15.984zM384.16 303.968h-79.792v-15.984h79.792v15.984zM384.16 271.984h-79.792v-15.984h79.792v15.984zM384.16 240h-79.792v-16h79.792v16zM384.16 208h-79.792v-16h79.792v16zM204.496 64.064h36.016v79.968h15.968v-79.968h35.456l-35.456 79.968h31.92l63.824-143.936h-31.904l-21.28 48h-42.56v-79.968h-15.968v79.968h-43.216l-21.616-48h-31.92l64.832 143.936h31.92l-36.016-79.968zM256.48 144.032v0 0 0zM240.512 144.032v0 0 0z" /> +<glyph unicode="" d="M270.432 383.936h146l-0.32-147.664-50.064 50.048-47.184-47.184c10.592-18.624 16.688-40.112 16.688-63.056 0-70.688-57.28-128-128-128-70.688 0-128 57.312-128 128 0 70.688 57.312 128 128 128 24.4 0 47.136-6.96 66.56-18.816l46.688 47.296-50.368 51.376zM143.568 176.064c0-35.344 28.656-64 64-64s64 28.656 64 64-28.656 64-64 64-64-28.656-64-64z" /> +<glyph unicode="" d="M288.624 180.464v-52.688h63.936v-63.936h-63.936v-63.936h-64.912v63.936h-63.92v63.936h63.92v52.88c-54.96 14.32-95.568 64.144-95.568 123.568 0 70.608 57.248 127.856 127.856 127.856 70.624 0 127.84-57.248 127.84-127.856 0-59.664-39.936-109.632-95.216-123.76zM256 368.144c-35.312 0-63.936-28.608-63.936-63.92 0-35.296 28.624-63.92 63.936-63.92 35.312 0 63.936 28.624 63.936 63.92 0 35.312-28.624 63.92-63.936 63.92z" /> +<glyph unicode="" d="M289.488 223.408c36.624 63.408 47.072 104.368 47.072 143.296 0 59.408-53.392 81.84-84.416 81.84s-84.112-21.664-84.112-81.856c0-38.432 9.92-79.76 46.496-142.736l-85.84-151.36 36.576-73.152 85.936 159.12 96.464-159.12 35.664 66.224-93.84 157.744zM214.336 376.624c0 30.544 18.784 37.2 37.744 37.2 19.008 0 37.248-6.496 37.248-37.056s-37.2-81.456-37.2-81.456-37.792 50.736-37.792 81.312z" /> +<glyph unicode="" d="M256.672 346.48c0 0-32 68.192-104 68.192-78.672 0-120-66.672-120-133.328 0-110.672 224-248 224-248s222.656 136 222.656 248c0 68-42.656 133.328-118.656 133.328s-104-68.192-104-68.192z" /> +<glyph unicode="" d="M259.952 404.272c0-26.944 20.336-45.2 45.44-45.2s45.472 18.272 45.472 45.2c0 26.96-20.352 45.216-45.472 45.216-25.088 0-45.44-18.256-45.44-45.216zM161.536 250c0-5.344-0.976-18.608 0.128-26.592l39.664 47.728c8.208 8.992 17.696 15.28 22.544 13.584 4.864-1.696 7.52-7.408 5.936-12.72l-65.648-217.44c-7.568-25.408 6.736-50.368 41.584-56.064 51.024 0 81.344 34.528 111.168 79.28 0 5.344 1.776 19.408 0.704 27.408l-39.664-47.712c-8.224-8.992-18.416-15.28-23.28-13.6-4.48 1.568-7.104 6.56-6.224 11.536l66.112 218.448c5.504 27.744-9.44 52.992-41.024 56.224-33.216-0.016-82.176-35.344-112-80.080z" /> +<glyph unicode="" d="M256 432c-114.88 0-208-93.12-208-208s93.12-208 208-208 208 93.12 208 208-93.12 208-208 208zM288.624 147.472c-15.696-23.568-31.664-41.728-58.528-41.728-18.336 2.992-25.872 16.128-21.904 29.52l34.56 114.464c0.848 2.8-0.56 5.792-3.12 6.704-2.544 0.896-7.536-2.416-11.856-7.152l-20.896-25.136c-0.56 4.224-0.064 11.2-0.064 14.016 15.696 23.568 41.488 42.16 58.976 42.16 16.624-1.696 24.496-14.992 21.6-29.6l-34.8-115.024c-0.464-2.592 0.912-5.232 3.264-6.064 2.56-0.896 7.936 2.416 12.272 7.152l20.88 25.12c0.56-4.224-0.384-11.616-0.384-14.432zM283.968 296.976c-13.216 0-23.936 9.632-23.936 23.808s10.72 23.792 23.936 23.792 23.936-9.632 23.936-23.792c0-14.192-10.72-23.808-23.936-23.808z" /> +<glyph unicode="" d="M0 32v368h496v-368h-496zM96 192h-16v192h-64v-336h80v144zM192 192h-16v192h-48v-192h-16v-144h80v144zM288 192h-16v192h-48v-192h-16v-144h80v144zM320 384v-192h-16v-144h80v144h-16v192h-48zM480 384h-64v-192h-16v-144h80v336z" /> +<glyph unicode="" d="M394.448 300.928c0 0 7.664 103.104-86.816 114.88-80.992 8.272-105.632-66.992-105.632-66.992s-24.368 23.456-57.472 4.304c-29.616-18.288-24.368-51.744-24.368-51.744s-65.76-12.8-65.76-79.84c1.472-66.976 71.424-67.648 71.424-67.648h257.312c0 0 65.088-0.064 74.256 63.632 4.336 69.664-62.944 83.408-62.944 83.408zM156.096 112.848c-2.864 5.664-5.424 13.296-7.664 22.864-2.208-9.568-4.752-17.184-7.616-22.864-6.016-11.952-15.632-21.248-15.632-21.248-7.664-8.528-11.488-17.072-11.488-25.616 0-9.44 3.424-17.52 10.256-24.288 6.832-6.752 14.992-10.128 24.464-10.128 9.536 0 17.696 3.376 24.528 10.128 6.848 6.768 10.256 14.848 10.256 24.288 0 8.528-3.824 17.072-11.472 25.616 0 0-9.6 9.296-15.632 21.248zM268.096 112.848c-2.864 5.664-5.424 13.296-7.664 22.864-2.224-9.568-4.752-17.184-7.616-22.864-6.016-11.952-15.648-21.248-15.648-21.248-7.648-8.528-11.472-17.072-11.472-25.616 0-9.44 3.408-17.52 10.256-24.288 6.816-6.752 14.976-10.128 24.464-10.128 9.536 0 17.696 3.376 24.528 10.128 6.848 6.768 10.256 14.848 10.256 24.288 0 8.528-3.824 17.072-11.488 25.616 0 0-9.6 9.296-15.616 21.248zM380.096 112.848c-2.864 5.664-5.424 13.296-7.664 22.864-2.224-9.568-4.752-17.184-7.616-22.864-6.032-11.952-15.648-21.248-15.648-21.248-7.648-8.528-11.472-17.072-11.472-25.616 0-9.44 3.408-17.52 10.256-24.288 6.816-6.752 14.976-10.128 24.464-10.128 9.536 0 17.696 3.376 24.528 10.128 6.848 6.768 10.256 14.848 10.256 24.288 0 8.528-3.824 17.072-11.472 25.616 0 0-9.616 9.296-15.632 21.248z" /> +<glyph unicode="" d="M394.448 308.304c0 0 7.664 103.104-86.816 114.88-80.992 8.272-105.632-66.992-105.632-66.992s-24.352 23.456-57.456 4.288c-29.616-18.288-24.368-51.744-24.368-51.744s-65.776-12.784-65.776-79.824c1.472-66.976 71.424-67.648 71.424-67.648h257.312c0 0 65.088-0.064 74.256 63.632 4.336 69.664-62.944 83.408-62.944 83.408zM157.248 86.848c20.656 31.872 15.824 36.352-14.48 13.488-7.936 37.136-14.528 36.912-19.776-0.704-31.872 20.656-36.368 15.824-13.504-14.48-37.136-7.936-36.912-14.528 0.704-19.792-20.656-31.856-15.808-36.352 14.496-13.488 7.92-37.136 14.512-36.912 19.776 0.704 31.872-20.656 36.368-15.824 13.488 14.496 37.152 7.92 36.912 14.512-0.704 19.776zM269.248 86.848c20.656 31.872 15.824 36.352-14.48 13.488-7.936 37.136-14.528 36.912-19.776-0.704-31.872 20.656-36.368 15.824-13.504-14.48-37.136-7.936-36.912-14.528 0.704-19.792-20.656-31.856-15.808-36.352 14.496-13.488 7.92-37.136 14.512-36.912 19.776 0.704 31.872-20.656 36.368-15.824 13.488 14.496 37.152 7.92 36.912 14.512-0.704 19.776zM381.248 86.848c20.656 31.872 15.824 36.352-14.48 13.488-7.936 37.136-14.528 36.912-19.776-0.704-31.872 20.656-36.368 15.824-13.504-14.48-37.136-7.936-36.912-14.528 0.704-19.792-20.656-31.856-15.824-36.352 14.48-13.488 7.936-37.136 14.528-36.912 19.792 0.704 31.856-20.656 36.352-15.824 13.488 14.496 37.152 7.92 36.912 14.512-0.704 19.776z" /> +<glyph unicode="" d="M394.448 306.144c0 0 7.664 103.104-86.816 114.88-80.992 8.272-105.632-66.992-105.632-66.992s-24.368 23.456-57.472 4.304c-29.616-18.288-24.368-51.744-24.368-51.744s-65.76-12.8-65.76-79.84c1.808-68.128 70.992-66.416 70.992-66.416l73.328 0.496 35.104 80.288 102.32-2-45.504-78.64 93.536-0.816c0 0 61.936-0.736 73.216 63.072 4.336 69.664-62.944 83.408-62.944 83.408zM310.304 224.8h-65.968l-42.112-96.272h60.352l-49.136-108.672 106.672 125.328h-56.128l46.32 79.616z" /> +<glyph unicode="" d="M128.496 216c0-66.288 53.728-120 120-120 66.288 0 120 53.712 120 120s-53.712 120-120 120c-66.272 0-120-53.712-120-120zM248.496 420l-33.744-67.504h67.504l-33.76 67.504zM392.688 360.688l-71.6-23.856 47.712-47.728 23.888 71.584zM175.904 336.832l-71.584 23.856 23.856-71.6 47.728 47.744zM111.504 250.256l-67.504-33.76 67.504-33.744v67.504zM384.496 181.744l67.504 33.744-67.504 33.744v-67.488zM248.496 12l33.744 67.504h-67.504l33.76-67.504zM321.088 95.168l71.6-23.856-23.872 71.6-47.728-47.744zM104.32 71.312l71.6 23.856-47.728 47.728-23.872-71.584z" /> +<glyph unicode="" d="M174.32 358.816c0-120.8 82.864-218.72 185.072-218.72 25.408 0 49.616 6.080 71.664 17.008-27.12-71.36-95.936-122.176-176.816-122.176-104.528 0-189.28 84.752-189.28 189.28 0 77.12 46.208 143.344 112.368 172.848-1.856-12.448-3.008-25.168-3.008-38.24z" /> +<glyph unicode="" d="M340.064 195.68c0 0 7.664 103.104-86.816 114.88-80.992 8.272-105.632-66.992-105.632-66.992s-24.384 23.456-57.472 4.304c-29.616-18.288-24.368-51.744-24.368-51.744s-65.776-12.784-65.776-79.824c1.824-68.112 71.008-66.416 71.008-66.416l258.768-0.672c0 0 61.936-0.736 73.216 63.088 4.352 69.648-62.928 83.376-62.928 83.376zM518.192 186.336c0 66.288-53.712 120-120 120-11.216 0-35.056-3.648-58.576-15.824 0-0.032-14.704-10.032-14.704-10.032s23.28-21.136 25.28-77.136c0-0.992 61.664-16.816 61.664-80.816 0-44-23.36-56.096-23.36-56.096l9.696-0.096c0 0 120 24.992 120 120zM398.192 390.336l-33.744-67.504h67.504l-33.76 67.504zM542.368 331.024l-71.6-23.856 47.728-47.728 23.872 71.584zM534.192 152.096l67.504 33.744-67.504 33.744v-67.488zM470.784 65.52l71.6-23.856-23.856 71.6-47.744-47.744z" horiz-adv-x="601" /> +<glyph unicode="" d="M340.064 207.504c0 0 7.664 103.104-86.832 114.864-80.992 8.272-105.632-66.992-105.632-66.992s-24.384 23.456-57.472 4.304c-29.616-18.288-24.368-51.744-24.368-51.744s-65.76-12.784-65.76-79.84c1.808-68.096 70.992-66.4 70.992-66.4l258.768-0.688c0 0 61.936-0.72 73.216 63.088 4.368 69.648-62.912 83.408-62.912 83.408zM500.064 271.488c0 0 7.664 103.104-86.816 114.88-80.992 8.272-106.624-67.984-106.624-67.984s47.184-27.376 49.184-101.376c30-9.008 61.968-33.76 62.976-91.76l70.976-0.256c0 0 61.936-0.72 73.216 63.088 4.368 69.68-62.912 83.408-62.912 83.408z" horiz-adv-x="563" /> +<glyph unicode="" d="M432 128h-368c-17.664 0-32 14.336-32 32v80c0 17.664 14.336 32 32 32h16c0 0 23.664 72 30.656 96s14.336 32 32.016 32h210.656c17.664 0 23.008-4.992 32-32s30.672-96 30.672-96h16c17.664 0 32-14.336 32-32v-80c0-17.664-14.336-32-32-32zM144 160h208v16h-208v-16zM352 272c0 17.664-14.336 34-32 34s-32-16.336-32-34c0-0.416 64-0.416 64 0zM144 192h208v16h-208v-16zM144 224h208v16h-208v-16zM64.992 208c0-17.664 14.336-32 32-32s32 14.336 32 32-14.336 32-32 32-32-14.336-32-32zM369.328 368c-4 11.008-7.152 16-16 16h-97.328v-16h8c4.416 0 8-3.584 8-8s-3.584-8-8-8h-32c-4.416 0-8 3.584-8 8s3.584 8 8 8h8v16h-97.328c-8.848 0-12.016-2-16-16-4.016-14-30.672-96-30.672-96h183.36c0.368 21.824 18.080 42.288 39.92 42.288 21.856 0 39.552-20.448 39.936-42.288h40.784c0 0-26.672 84.992-30.672 96zM399.008 239.008c-17.664 0-32-14.336-32-32s14.336-32 32-32 32 14.336 32 32-14.336 32-32 32zM112 72c0-13.248-10.752-24-24-24s-24 10.752-24 24v40h48v-40zM432 72c0-13.248-10.752-24-24-24s-24 10.752-24 24v40h48v-40z" /> +<glyph unicode="" d="M479.968 28.848c-67.392 0-122.032 54.624-122.032 122.032 0 49.44 29.472 91.92 71.744 111.088l-16.224 36.528 2.64-6.384-111.104-149.136v-29.904h16.272v-16.288h-48.832v16.288h16.288v16.288l-46.032 4.32c-8.384-59.216-59.136-104.816-120.672-104.816-67.392-0.016-122.016 54.608-122.016 122.016 0 67.392 54.624 122.016 122.032 122.016 17.616 0 34.32-3.808 49.44-10.512l30.496 76.608-13.84 38.656c-6.080 0-11.744 0-16.272 0-15.264 0-11.184 16.272-11.184 16.272s1.008 14.24 12.208 14.24 11.184-10.176 29.488-10.176c17.52 0 42.704-5.072 42.704-5.072s11.184-15.248-10.16-15.248c-9.664 0-20.304 0-30.512 0l11.568-41.552h176.832l-13.888 31.568h-10.8v16.256h65.072v-16.272h-36.768l47.632-100.16c11.36 3.504 23.44 5.392 35.936 5.392 67.392 0 122.032-54.624 122.032-122.016-0.016-67.408-54.656-122.032-122.048-122.032zM122.032 256.64c-58.416 0-105.76-47.344-105.76-105.76s47.344-105.744 105.76-105.744c53.104 0 96.96 39.184 104.48 90.224l-84.704 8.72c-1.344-7.632-7.696-13.536-15.712-13.536-8.992 0-16.272 7.28-16.272 16.288 0 8.976 7.28 16.288 16.272 16.288 1.92 0 3.712-0.496 5.424-1.12l33.936 85.28c-13.264 5.952-27.936 9.36-43.424 9.36zM146.432 158l81.264-8.592c0.016 0.496 0.080 0.976 0.080 1.472 0 37.6-19.664 70.528-49.232 89.296l-32.112-82.176zM209.232 318.688l-24.688-63.168c35.6-21.312 59.504-60.144 59.504-104.656 0-1.056-0.128-2.128-0.16-3.184l27.616-2.912-62.272 173.92zM399.648 329.664v-9.824h-177.92l64.8-173.424 122.992 161.040-9.872 22.208zM479.968 256.64c-10.192 0-20.016-1.52-29.344-4.224l37.984-86.784c7.712-1.248 13.728-7.68 13.728-15.744 0-8.992-7.28-16.288-16.272-16.288s-16.288 7.28-16.288 16.288c0 4.368 1.776 8.336 4.624 11.28l-38.144 85.952c-36.592-16.64-62.064-53.408-62.064-96.224 0-58.4 47.344-105.744 105.744-105.744s105.744 47.344 105.744 105.744-47.312 105.744-105.712 105.744z" horiz-adv-x="600" /> +<glyph unicode="" d="M431.504 272c-8.848 0-16 0-16 0h-31.664l-0.208-20.096c9.568-5.456 15.872-15.824 15.872-27.904l0.672-111.008h-303.68v111.008c0 11.808 6.464 22.016 16 27.568v20.432h-32c0 0-7.168 0-16 0-8.848 0-16 7.168-16 16v16c0 8.848 7.152 16 16 16 8.832 0 16 0 16 0v-32h32v48c0 17.664 14.336 32 32 32h208c17.664 0 32-14.336 32-32l-0.496-48h31.504v32c0 0 7.152 0 16 0 8.832 0 16-7.152 16-16v-16c0-8.832-7.168-16-16-16zM192.496 128h112v16h-112v-16zM192.496 160h112v16h-112v-16zM192.496 192h112v16h-112v-16zM128.496 144c0-8.832 7.152-16 16-16h16c8.832 0 16 7.168 16 16 0 8.848-7.168 16-16 16h-16c-8.832 0-16-7.152-16-16zM352.496 320c0 8.848-7.152 16-16 16h-176c-8.848 0-16-7.152-16-16v-80h208v80zM352.496 160h-16c-8.848 0-16-7.152-16-16 0-8.832 7.152-16 16-16h16c8.832 0 16 7.168 16 16 0 8.848-7.168 16-16 16zM368.496 384h-240c-17.664 0-32-14.336-32-32v80c0 8.848 7.152 16 16 16h272c8.832 0 16-7.152 16-16v-80c0 17.664-14.32 32-32 32zM400.496 80.992c0-8.832-7.168-16-16-16h-272c-8.848 0-16 7.168-16 16 0 8.848 0 16 0 16h304c0 0 0-7.152 0-16zM176.496 16c0-8.832-7.168-16-16-16h-16c-8.848 0-16 7.168-16 16v32h48v-32zM368.496 16c0-8.832-7.168-16-16-16h-16c-8.848 0-16 7.168-16 16v32h48v-32z" /> +<glyph unicode="" d="M384 336h-64v32h64c8.832 0 16-7.152 16-16 0-8.832-7.168-16-16-16zM336 480c0 26.512-21.488 48-48 48h-80c-26.512 0-48-21.488-48-48v-96h-16v96c0 35.344 28.656 64 64 64h80c35.344 0 64-28.656 64-64v-96h-16v96zM176 336h-64c-8.848 0-16 7.168-16 16 0 8.848 7.152 16 16 16h64v-32zM248 296c-30.944 0-56 25.072-56 56 0 30.944 25.056 56 56 56 30.928 0 56-25.056 56-56 0-30.928-25.072-56-56-56zM248 384c-17.664 0-32-14.336-32-32s14.336-32 32-32 32 14.336 32 32-14.336 32-32 32zM193.792 318.304c11.296-18.128 31.264-30.304 54.208-30.304s42.896 12.176 54.208 30.304c28.48-6.48 49.792-31.856 49.792-62.304v-160c0-29.776-20.448-54.592-48-61.728v86.736c0 30.928-25.072 56-56 56-30.944 0-56-25.072-56-56v-86.736c-27.568 7.136-48 31.952-48 61.728v160c0 30.448 21.312 55.824 49.792 62.304zM248 160c22.096 0 40-17.904 40-40v-112c0-22.096-17.904-40-40-40s-40 17.904-40 40v112c0 22.096 17.904 40 40 40z" /> +<glyph unicode="" d="M248.336 417.44c13.248 0 24-10.752 24-24v-124l160-100v-43.008l-160 54v-84l32.624-32.464-0.016-33.344-56.608 18.816-55.792-18.88 0.24 35.024 30.56 29.84 0.272 84.992-159.952-54.976 0.336 44 160.112 101.008 0.256 123.008c-0.032 13.232 10.72 23.984 23.968 23.984z" /> +<glyph unicode="" d="M53.808 409.376l78-309.568 151.472 48.288-135.168 164.768 174.432-152.96 141.648 44.32-410.384 205.152zM288.064 38.624v85.184l-49.856-14.816 49.856-70.368z" /> +<glyph unicode="" d="M373.936 7.536c0 0 5.36 32.192-27.696 71.504 32.176 90.256 36.64 172.448 36.64 172.448s66.128-15.2 66.128-80.416c-0.016-111.696-75.072-163.536-75.072-163.536zM191.664 46.752c0 0-44.288 142.128-44.288 201.088 0 26.528 2.992 50.128 7.648 71.552h201.76c4.688-21.44 7.696-45.056 7.696-71.568 0-58.064-44.16-201.072-44.16-201.072h-128.656zM255.84 286.896c-22.688 0-41.088-18.4-41.088-41.104 0-22.688 18.4-41.104 41.088-41.104 22.704 0 41.104 18.4 41.104 41.104 0.016 22.704-18.4 41.104-41.104 41.104zM247.008 470.464v55.968h16v-54.544c18.288-13.312 67.776-55.648 90.16-137.2h-194.56c21.632 79.312 68.736 121.184 88.4 135.776zM138.064 7.536c0 0-75.056 51.84-75.056 163.536 0 65.216 66.128 80.416 66.128 80.416s4.464-82.192 36.624-172.448c-33.072-39.328-27.696-71.504-27.696-71.504zM283.056-0.72l-13.408 13.408-14.288-44.688-16.992 44.688-11.616-23.216-16.992 42h92.032l-18.736-32.192z" /> +<glyph unicode="" d="M240 66v314c0 0-43.008 36-104 36s-104-32-104-32v-318c0 0 43.008 31.008 104 31.008s104-31.008 104-31.008zM464 66v314c0 0-43.008 36-104 36s-104-32-104-32v-318c0 0 43.008 31.008 104 31.008s104-31.008 104-31.008zM496 352h-16v-304h-192v-16h-80v16h-192v304h-16v-320h192v-16h112.992l-0.992 16h192v320z" /> +<glyph unicode="" d="M272 64c0 0 99.008 32.992 176-28.992 0 0.992 0 28.992 0 28.992-90 50-176 0-176 0zM32 384v-318c0 0 43.008 31.008 104 31.008s104-31.008 104-31.008v314c0 0-43.008 36-104 36s-104-32-104-32zM64 352h64v-80h-64v80zM208 144h-144v16h144v-16zM208 176h-144v16h144v-16zM208 208h-144v16h144v-16zM208 240h-144v16h144v-16zM144 352h64v-16h-64v16zM144 320h64v-16h-64v16zM144 288h64v-16h-64v16zM360 416c-60.992 0-104-32-104-32v-318c0 0 43.008 31.008 104 31.008s104-31.008 104-31.008v314c0 0-43.008 36-104 36zM432 144h-144v16h144v-16zM432 176h-144v16h144v-16zM432 208h-144v16h144v-16zM432 240h-144v16h144v-16zM432 272h-144v16h144v-16zM432 304h-144v16h144v-16zM432 336h-144v16h144v-16zM48 64c0 0 0-28 0-28.992 76.992 61.984 176 28.992 176 28.992s-86 50-176 0z" /> +<glyph unicode="" d="M464 383.504h-416c-17.664 0-32-14.336-32-32v-271.008c0-17.664 14.336-32 32-32h416c17.664 0 32 14.336 32 32v271.008c0 17.664-14.336 32-32 32zM96 96.496h-32v239.008h32v-239.008zM128 127.504h-16v208h16v-208zM176 127.504h-16v208h16v-208zM224 127.504h-32v208h32v-208zM256 127.504h-16v208h16v-208zM320 127.504h-32v208h32v-208zM352 127.504h-16v208h16v-208zM400 127.504h-16v208h16v-208zM448 96.496h-32v239.008h32v-239.008z" /> +<glyph unicode="" d="M380.912 169.632h-28.128v-9.376h28.128v9.376zM275.968 141.504v-9.376h28.128v-9.376h9.376v37.504h-9.376v-18.752h-28.128zM275.968 104h18.752v9.376h-18.752v-9.376zM294.72 113.376h9.376v9.376h-9.376v-9.376zM275.968 160.256h-9.376v-18.752h9.376v18.752zM224 352h-32v-160h32v160zM256 352h-16v-160h16v160zM352.784 104h28.128v9.376h-28.128v-9.376zM304.096 169.632h-28.128v-9.376h28.128v9.376zM390.288 113.376v46.88h-9.376v-46.88h9.376zM400 352h-16v-160h16v160zM199.168 122.752h-9.376v-9.376h9.376v9.376zM320 352h-32v-160h32v160zM352 352h-16v-160h16v160zM343.408 113.376h9.376v46.88h-9.376v-46.88zM112.992 104h46.88v9.376h-37.504v9.376h-9.376v-18.752zM112.992 150.88h9.376v9.376h-9.376v-9.376zM131.744 132.128h18.752v9.376h-18.752v-9.376zM208.544 141.504v-9.376h18.752v9.376h-18.752zM122.368 169.632v-9.376h28.128v9.376h-28.128zM128 352h-16v-160h16v160zM480 416h-448c-17.664 0-32-14.336-32-32v-320c0-17.664 14.336-32 32-32h448c17.664 0 32 14.336 32 32v320c0 17.664-14.336 32-32 32zM480 64h-448v320h448v-320zM96 352h-32v-256h32v256zM122.368 122.752h9.376v9.376h-9.376v-9.376zM236.672 160.256h-9.376v-18.752h9.376v18.752zM199.168 169.632v-9.376h28.128v9.376h-28.128zM159.872 141.504v18.752h-9.376v-18.752h9.376zM189.792 150.88h9.376v9.376h-9.376v-9.376zM176 352h-16v-160h16v160zM236.672 132.128h-9.376v-18.752h9.376v18.752zM227.296 104v9.376h-28.128v-9.376h28.128zM448 352h-32v-256h32v256z" /> +<glyph unicode="" d="M221.056 384.176l-124.56-0.736 0.048-123.76 41.44 41.456 55.264-55.264 42.64 42.64-55.248 55.264 40.416 40.4zM193.264 202.4l-55.264-55.28-41.44 41.472-0.048-124.784 124.56 0.288-40.416 40.4 55.264 55.248-42.656 42.656zM318.752 245.872l55.248 55.264 41.44-41.456 0.064 123.76-124.56 0.736 40.416-40.4-55.264-55.264 42.656-42.64zM374 147.12l-55.248 55.28-42.656-42.656 55.264-55.248-40.416-40.4 124.56-0.288-0.064 124.784-41.44-41.472z" /> +<glyph unicode="" d="M183.888 339.888l-55.264 55.248-42.64-42.64 55.264-55.248-41.44-41.44 124.752-0.064-0.272 124.544-40.4-40.4zM370.752 297.248l55.264 55.248-42.64 42.64-55.264-55.248-40.4 40.4-0.272-124.544 124.752 0.064-41.44 41.44zM141.248 150.752l-55.264-55.248 42.64-42.64 55.264 55.248 40.416-40.4 0.272 124.544-124.752-0.064 41.424-41.44zM412.192 192.192l-124.752 0.064 0.272-124.544 40.4 40.4 55.264-55.248 42.64 42.64-55.264 55.248 41.44 41.44z" /> +<glyph unicode="" d="M251.104 263.344l42.656-42.64 80.256 80.272 41.44-41.44 0.064 123.744-124.56 0.736 40.416-40.4-80.272-80.272zM414.816 208.88l-30.72 31.152 0.56-144.112-256.24-0.144 0.256 255.568 143.328 0.64-32 32h-112c-17.664 0-32-14.336-32-32v-256c0-17.664 14.336-32 32-32h256c17.664 0 32 14.336 32 32l-1.184 112.896z" /> +<glyph unicode="" d="M240 209.184l124.544-0.736-40.4 40.4 80.272 80.272-42.656 42.64-80.256-80.272-41.44 41.456-0.064-123.76zM414.816 208.896l-30.72 31.152 0.56-144.112-256.24-0.144 0.256 255.584 143.328 0.624-32 32h-112c-17.664 0-32-14.336-32-32v-256c0-17.664 14.336-32 32-32h256c17.664 0 32 14.336 32 32l-1.184 112.896z" /> +<glyph unicode="" d="M449.952 422.656l-34.352-30.368-20.848-0.32-43.68-45.68c28.16-29.92 45.536-70.128 45.536-114.464 0-92.368-74.896-167.28-167.28-167.28-92.368 0-167.264 74.912-167.264 167.28 0 92.384 74.896 167.28 167.264 167.28 42.32 0 80.848-15.824 110.304-41.728l42.16 42.16 0.032 18.576 32.352 37.36-0.032-33.264 35.808 0.448zM334.16 329.376l-42.528-42.544c14.4-15.632 23.408-36.32 23.408-59.248 0-48.4-39.216-87.616-87.616-87.616s-87.632 39.216-87.632 87.616c0 48.384 39.232 87.632 87.632 87.632 19.696 0 37.68-6.736 52.336-17.712l42.976 42.976c-25.104 21.6-57.68 34.736-93.408 34.736-79.184 0-143.376-64.208-143.376-143.392 0-79.184 64.192-143.36 143.376-143.36s143.376 64.192 143.376 143.36c-0.016 37.728-14.704 71.952-38.544 97.552zM226.752 202.368c-13.184 0-23.888 10.688-23.888 23.888 0 13.2 10.704 23.904 23.888 23.904 1.664 0 3.136-0.624 4.72-0.96l37.008 37.008c-11.648 8.176-25.744 13.056-41.056 13.056-39.6 0-71.68-32.112-71.68-71.696 0-39.584 32.096-71.68 71.68-71.68s71.68 32.096 71.68 71.68c0 18.528-7.216 35.248-18.768 47.984l-34.96-34.976c3.088-4.032 5.264-8.864 5.264-14.336 0.016-13.184-10.688-23.872-23.888-23.872zM157.68 52.032c4.752-2.4 9.632-4.56 14.64-6.496l-28.288-48.992c-2.208-3.808-7.072-5.088-10.896-2.912-3.792 2.192-5.104 7.056-2.912 10.88l27.456 47.52zM237.696 39.504v-22.32c0-4.4-3.584-7.968-7.968-7.968-4.4 0-7.968 3.568-7.968 7.968v22.32c2.656-0.128 5.28-0.4 7.968-0.4s5.312 0.272 7.968 0.4zM335.216 4.496c2.192-3.808 0.896-8.688-2.928-10.88s-8.672-0.912-10.896 2.912l-28.272 48.992c4.992 1.936 9.888 4.096 14.64 6.496l27.456-47.52z" /> +<glyph unicode="" d="M404.912 284.88c-3.968 0-7.632 1.024-11.008 2.624l-36.336-62.96 36.576-63.376c3.008 1.216 6.256 1.952 9.68 1.952 14.4 0 26.080-11.664 26.080-26.080s-11.664-26.096-26.080-26.096c-14.416 0-26.096 10.688-26.096 25.088 0 0.24 0.144 0.656 0.144 0.656h-70.464l-37.968-64.8c7.44-4.592 12.656-12.432 12.656-21.808 0-14.4-11.68-26.096-26.096-26.096s-26.080 11.68-26.080 26.096c0 10.064 5.872 18.512 14.208 22.88l-37.36 63.728h-73.728c0-0.24 0.128-0.416 0.128-0.656 0-14.4-11.68-25.088-26.080-25.088s-26.080 11.68-26.080 26.096 11.68 26.080 26.080 26.080c4.448 0 8.448-1.408 12.128-3.376l37.408 64.8-36.96 64c-3.776-2.128-7.92-3.664-12.576-3.664-14.4 0-26.080 11.664-26.080 26.080s11.68 26.096 26.080 26.096c14.256 0 25.744-11.456 26-25.664h73.664l36.912 63.952c-8.064 4.416-13.76 12.704-13.76 22.56 0.016 14.432 11.696 26.096 26.096 26.096s26.096-11.664 26.096-26.096c0-9.168-5.024-16.864-12.224-21.52l37.536-64.992h71.504c0.256 14.208 11.744 25.664 26 25.664 14.4 0 26.096-11.68 26.096-26.096s-11.696-26.080-26.096-26.080zM256 294.656c-38.416 0-69.568-31.136-69.568-69.568s31.152-69.568 69.568-69.568c38.4 0 69.568 31.152 69.568 69.584s-31.168 69.552-69.568 69.552zM256 169.664c-30.624 0-55.44 24.816-55.44 55.44 0 30.608 24.816 55.424 55.44 55.424 30.608 0 55.44-24.816 55.44-55.424 0-30.64-24.832-55.44-55.44-55.44z" /> +<glyph unicode="" d="M430.192 212.816c18.432-128.752-91.264-138.464-107.136-145.84-35.728-12.464-64.416-35.968-64.416-35.968s-23.344 20.4-58.336 35.968c-16.528 6.816-137.088 17.504-118.624 145.84 3.888 18.48 25.248 34.032 25.248 65.152s-26.24 67.088-26.24 67.088l74.88 71.952c0 0 26.256-18.512 49.6-18.512 23.328 0 53.472 18.512 53.472 18.512s30.144-18.512 52.496-18.512c22.368 0 49.6 18.512 49.6 18.512l69.872-70.992c0 0-26.24-37.008-26.24-68.064s21.136-45.712 25.824-65.136zM257.584 353.024c-65.68 0-118.928-58.192-118.928-123.872s53.232-113.968 118.928-113.968c65.664 0 118.928 48.288 118.928 113.968-0.016 65.68-53.264 123.872-118.928 123.872zM258.24 122.128c-61.296 0-111.008 49.68-111.008 110.992 0 61.296 49.696 110.992 111.008 110.992s110.992-49.68 110.992-110.992c-0.016-61.312-49.696-110.992-110.992-110.992zM325.168 283.216c-6.336 0-11.44-5.088-11.552-11.392h-31.76l-16.672 28.88c3.184 2.064 5.424 5.488 5.424 9.568 0 6.4-5.184 11.6-11.6 11.6s-11.6-5.184-11.6-11.6c0-4.368 2.528-8.064 6.128-10.032l-16.4-28.4h-32.736c-0.112 6.304-5.216 11.392-11.552 11.392-6.4 0-11.6-5.184-11.6-11.584 0-6.4 5.184-11.6 11.6-11.6 2.064 0 3.904 0.688 5.584 1.632l16.416-28.432-16.624-28.784c-1.632 0.88-3.408 1.504-5.376 1.504-6.4 0-11.6-5.184-11.6-11.6 0-6.368 5.184-11.568 11.6-11.568 6.384 0 11.584 5.184 11.584 11.568 0 0.128-0.048 0.192-0.048 0.32h32.752l16.592-28.784c-3.696-1.904-6.32-5.68-6.32-10.16 0-6.4 5.184-11.6 11.6-11.6s11.6 5.184 11.6 11.6c0 4.192-2.336 7.664-5.632 9.68l16.88 29.248h31.296c0-0.128-0.064-0.192-0.064-0.32 0-6.368 5.2-11.568 11.6-11.568 6.4 0 11.6 5.184 11.6 11.568 0 6.4-5.184 11.6-11.6 11.6-1.52 0-2.976-0.32-4.304-0.848l-16.256 28.128 16.144 27.968c1.504-0.704 3.12-1.152 4.896-1.152 6.4 0 11.6 5.184 11.6 11.6 0 6.368-5.184 11.568-11.6 11.568z" /> +<glyph unicode="" d="M632 112h8v-16c-4.784 0-10.048 0-16 0-17.664 0-32-14.336-32-32 0-5.856 0-11.28 0-16h-544c0 4.72 0 10.144 0 16 0 17.664-14.336 32-32 32-5.104 0-10.656 0-16 0v16h8c4.416 0 8 3.584 8 8s-3.584 8-8 8h-8v16h8c4.416 0 8 3.584 8 8s-3.584 8-8 8h-8v16h8c4.416 0 8 3.584 8 8s-3.584 8-8 8h-8v16h8c4.416 0 8 3.584 8 8s-3.584 8-8 8h-8v16h8c4.416 0 8 3.584 8 8s-3.584 8-8 8h-8v16h8c4.416 0 8 3.584 8 8s-3.584 8-8 8h-8v16h8c4.416 0 8 3.584 8 8s-3.584 8-8 8h-8v16c4.784 0 10.048 0 16 0 17.664 0 32 14.336 32 32 0 5.856 0 11.28 0 16h544c0-4.72 0-10.144 0-16 0-17.664 14.336-32 32-32 5.952 0 11.216 0 16 0v-16h-8c-4.416 0-8-3.584-8-8s3.584-8 8-8h8v-16h-8c-4.416 0-8-3.584-8-8s3.584-8 8-8h8v-16h-8c-4.416 0-8-3.584-8-8s3.584-8 8-8h8v-16h-8c-4.416 0-8-3.584-8-8s3.584-8 8-8h8v-16h-8c-4.416 0-8-3.584-8-8s3.584-8 8-8h8v-16h-8c-4.416 0-8-3.584-8-8s3.584-8 8-8h8v-16h-8c-4.416 0-8-3.584-8-8s3.584-8 8-8zM576 304c0 17.664-14.336 32-32 32h-448c-17.664 0-32-14.336-32-32v-176c0-17.664 14.336-32 32-32h448c17.664 0 32 14.336 32 32v176zM544 112h-448c-8.848 0-16 7.168-16 16v176c0 8.848 7.152 16 16 16h448c8.832 0 16-7.152 16-16v-176c0-8.832-7.168-16-16-16zM182.192 256.192h-63.568v-9.44h26.432v-70.752h10.624v70.752h26.496v9.44zM204.288 256.192h-10.624v-80.192h10.624v80.192zM236.144 232.16c1.664 4.992 4.592 8.96 8.736 11.904 4.128 2.96 9.28 4.432 15.44 4.432 5.36 0 9.808-1.328 13.344-4 3.552-2.656 6.24-6.912 8.096-12.752l10.432 2.464c-2.144 7.392-5.952 13.136-11.424 17.216s-12.224 6.128-20.24 6.128c-7.072 0-13.552-1.616-19.44-4.848-5.888-3.216-10.416-7.952-13.632-14.176-3.184-6.224-4.784-13.504-4.784-21.84 0-7.664 1.424-14.832 4.256-21.504 2.816-6.688 6.944-11.776 12.336-15.296 5.424-3.52 12.448-5.28 21.088-5.28 8.336 0 15.408 2.288 21.184 6.864s9.776 11.216 12 19.936l-10.624 2.688c-1.456-6.752-4.256-11.84-8.352-15.28-4.128-3.424-9.136-5.136-15.088-5.136-4.88 0-9.424 1.264-13.616 3.776s-7.28 6.32-9.264 11.408-2.992 11.040-2.992 17.872c0.032 5.312 0.864 10.448 2.544 15.424zM373.808 256.192h-14.368l-39.808-39.68v39.68h-10.624v-80.192h10.624v27.808l13.152 12.72 28.528-40.528h14l-35.12 47.68 33.616 32.512zM447.008 185.44h-49.184v27.312h44.32v9.44h-44.32v24.56h47.312v9.44h-57.936v-80.192h59.808v9.44zM522 256.192h-63.568v-9.44h26.432v-70.752h10.624v70.752h26.496v9.44z" horiz-adv-x="640" /> +<glyph unicode="" d="M640 168.992v-88.992c0-17.664-14.336-32-32-32h-88c4.416 0 8 3.584 8 8s-3.584 8-8 8-8-3.584-8-8 3.584-8 8-8h-488c-17.664 0-32 14.336-32 32v88c26.496 0 48 21.504 48 48 0 26.512-21.504 48-48 48v88c0 17.664 14.336 32 32 32h488c-4.416 0-8-3.584-8-8s3.584-8 8-8 8 3.584 8 8-3.584 8-8 8h88c17.664 0 32-14.336 32-32v-87.008c-26.512 0-48-21.488-48-48 0-26.496 21.488-48 48-48zM141.088 256.192h-11.456l-30.752-80.192h11.248l8.8 24.32h33.552l9.328-24.32h12.096l-32.816 80.192zM254.96 235.6c-2.096 5.568-5.264 10.128-9.488 13.696-3.248 2.768-7.168 4.688-11.76 5.744-3.28 0.768-8.048 1.136-14.288 1.136h-27.632v-80.176h28.944c4.864 0 9.136 0.448 12.896 1.376 3.728 0.912 6.928 2.256 9.568 4.016 2.656 1.76 5.088 4.192 7.312 7.264 2.224 3.088 4.048 6.992 5.472 11.68s2.144 10.096 2.144 16.192c-0.016 7.152-1.072 13.504-3.168 19.072zM349.12 256.192h-14.32l-19.248-55.776c-1.936-5.664-3.376-9.936-4.288-12.848-0.816 2.624-2.096 6.576-3.84 11.856l-19.008 56.768h-15.936v-80.192h10.256v68.256l23.168-68.256h9.584l23.392 67.12v-67.12h10.256v80.192zM378.672 256.192h-10.624v-80.192h10.624v80.192zM457.712 256.192h-63.568v-9.44h26.432v-70.752h10.624v70.752h26.496v9.44zM520 352c-4.416 0-8-3.584-8-8s3.584-8 8-8 8 3.584 8 8-3.584 8-8 8zM520 320c-4.416 0-8-3.584-8-8s3.584-8 8-8 8 3.584 8 8-3.584 8-8 8zM520 288c-4.416 0-8-3.584-8-8s3.584-8 8-8 8 3.584 8 8-3.584 8-8 8zM520 256c-4.416 0-8-3.584-8-8s3.584-8 8-8 8 3.584 8 8-3.584 8-8 8zM520 224c-4.416 0-8-3.584-8-8s3.584-8 8-8 8 3.584 8 8-3.584 8-8 8zM520 192c-4.416 0-8-3.584-8-8s3.584-8 8-8 8 3.584 8 8-3.584 8-8 8zM520 160c-4.416 0-8-3.584-8-8s3.584-8 8-8 8 3.584 8 8-3.584 8-8 8zM520 128c-4.416 0-8-3.584-8-8s3.584-8 8-8 8 3.584 8 8-3.584 8-8 8zM520 96c-4.416 0-8-3.584-8-8s3.584-8 8-8 8 3.584 8 8-3.584 8-8 8zM239.184 191.072c-1.792-1.776-4.192-3.168-7.2-4.16s-7.152-1.488-12.432-1.488h-17.12v61.312h16.848c6.32 0 10.896-0.544 13.728-1.648 3.936-1.536 7.28-4.544 10.032-9.056 2.768-4.496 4.144-10.96 4.144-19.344 0-6.064-0.704-11.216-2.112-15.472s-3.392-7.616-5.888-10.144zM130.752 232.432c1.856 5.072 3.296 10.192 4.336 15.312 1.248-4.336 3.152-9.872 5.712-16.608l8.336-22.208h-27.152l8.768 23.504z" horiz-adv-x="640" /> +<glyph unicode="" d="M624 168.992v-88.992c0-17.664-14.336-32-32-32h-560c-17.664 0-32 14.336-32 32v88c26.512 0 48 21.504 48 48 0 26.512-21.488 48-48 48v88c0 17.664 14.336 32 32 32h560c17.664 0 32-14.336 32-32v-87.008c-26.512 0-48-21.488-48-48 0-26.496 21.488-48 48-48zM544 304c0 17.664-14.336 32-32 32h-400c-17.664 0-32-14.336-32-32v-176c0-17.664 14.336-32 32-32h400c17.664 0 32 14.336 32 32v176zM512 112h-400c-8.848 0-16 7.168-16 16v176c0 8.848 7.152 16 16 16h400c8.832 0 16-7.152 16-16v-176c0-8.832-7.168-16-16-16zM199.52 231.392l-14.512 41.28-14.512-41.28-41.824-1.76 32.864-27.264-11.344-42.368 34.816 24.416 34.8-24.416-11.328 42.352 32.848 27.264-41.808 1.776zM327.52 231.392l-14.512 41.28-14.512-41.28-41.824-1.76 32.864-27.264-11.344-42.368 34.816 24.416 34.8-24.416-11.328 42.352 32.848 27.264-41.808 1.776zM455.52 231.392l-14.512 41.28-14.512-41.28-41.808-1.76 32.848-27.264-11.344-42.368 34.816 24.416 34.8-24.416-11.328 42.352 32.848 27.264-41.808 1.776z" horiz-adv-x="624" /> +<glyph unicode="" d="M292.016 273.504c9.872 33.584 5.696 70.4-12.512 101.232 0.4-0.56-174.064-176.432-175.312-175.328 30.32-17.904 67.136-22.944 100.272-13.696-0.24 0.848 86.848 87.92 87.552 87.792zM260.896 402.784c-23.504 23.168-57.136 38.88-92.704 38.88-71.888 0-130.176-58.432-130.176-130.496 0-35.168 16-69.216 38.56-92.688 0.048 0 183.216 182.8 184.32 184.304zM444.992 56.544c0 0 4.256 36.768-6.352 47.376-0.704 0.704-122.336 149.2-122.336 149.2l-90.512-90.512 148.496-123.024c9.904-11.312 48.080-5.664 48.080-5.664l30.4-27.584 21.216 21.216-28.992 28.992z" /> +<glyph unicode="" d="M256 16c-114.864 0-208 93.12-208 208s93.136 208 208 208c114.88 0 208-93.12 208-208s-93.12-208-208-208zM256 64c35.376 0 67.984 11.632 94.48 31.056l-223.408 223.392c-19.456-26.48-31.072-59.072-31.072-94.448 0-88.352 71.632-160 160-160zM256 384c-35.648 0-68.464-11.792-95.056-31.52l223.536-223.552c19.712 26.608 31.52 59.408 31.52 95.072 0 88.368-71.632 160-160 160z" /> +<glyph unicode="" d="M344.992 448h-184.816l-132.176-131.824v-184.336l132.176-131.84 184.816 1.168 131.008 130.672v184.336l-131.008 131.824zM460 138.416l-121.664-121.328-171.6-1.088-122.736 122.416v171.184l122.736 122.4h171.616l121.664-122.4v-171.184zM387.056 224.368c3.072 0.816 5.648 2.256 7.68 4.32 1.824 1.856 3.168 3.872 4 6.064 0.848 2.208 1.264 4.752 1.264 7.68 0 3.184-0.544 5.952-1.664 8.32-1.104 2.336-2.784 4.272-5.024 5.76-1.968 1.28-4.24 2.192-6.848 2.72s-5.84 0.816-9.712 0.816h-10.256v-36.88h8.432c5.008 0 9.056 0.4 12.128 1.2zM320.048 252.4c-2.448 3.216-5.424 5.632-8.912 7.232s-7.392 2.4-11.728 2.4c-4.496 0-8.432-0.784-11.792-2.336-3.36-1.584-6.336-4-8.928-7.296-2.448-3.168-4.336-7.152-5.664-11.936-1.312-4.8-1.968-10.224-1.968-16.272 0-12.224 2.56-21.584 7.68-28.064 5.136-6.48 12.016-9.712 20.656-9.712 8.624 0 15.504 3.232 20.608 9.712s7.664 15.84 7.664 28.064c0 6.176-0.672 11.632-2 16.384-1.328 4.768-3.2 8.704-5.616 11.824zM170.016 424l-118.016-117.696v-164.576l118.016-117.712 165.008 1.040 116.976 116.672v164.576l-116.976 117.696h-165.008zM168.032 193.36c-1.488-3.536-3.568-6.528-6.224-8.992-3.008-2.704-6.4-4.8-10.176-6.256-3.776-1.472-8.496-2.192-14.176-2.192-6.768 0-12.496 0.704-17.232 2.096s-9.184 3.104-13.344 5.152v15.504h0.88c4.096-3.808 8.72-6.768 13.888-8.864s10.16-3.136 14.96-3.136c6.848 0 12.016 1.424 15.52 4.272 3.52 2.864 5.264 6.608 5.264 11.28 0 3.68-0.928 6.72-2.768 9.040s-4.768 4.048-8.784 5.168c-2.896 0.848-5.52 1.536-7.888 2.064-2.384 0.544-5.376 1.28-8.96 2.208-3.216 0.832-6.112 1.888-8.64 3.184-2.544 1.28-4.816 2.976-6.768 5.056-1.92 2.048-3.424 4.448-4.48 7.216-1.056 2.784-1.6 5.968-1.6 9.616 0 7.552 2.944 13.856 8.832 18.976s13.408 7.664 22.544 7.664c5.216 0 10.16-0.528 14.816-1.568s8.976-2.512 12.944-4.416v-14.768h-0.944c-2.976 2.672-6.768 4.992-11.408 7.008s-9.52 3.008-14.608 3.008c-5.76 0-10.416-1.344-13.968-4.032s-5.328-6.208-5.328-10.576c0-3.952 1.040-7.088 3.136-9.424 2.096-2.336 5.12-4.048 9.088-5.12 2.624-0.704 5.84-1.52 9.648-2.4s6.96-1.712 9.472-2.464c6.416-1.968 11.12-4.928 14.080-8.896 2.976-3.952 4.448-8.832 4.448-14.624 0-3.648-0.736-7.232-2.224-10.784zM254.192 257.792h-30.256v-80.128h-15.376v80.128h-29.248v14h74.88v-14zM354.128 270.8h23.376c5.504 0 10.192-0.464 14.064-1.376 3.872-0.928 7.296-2.4 10.256-4.432 3.456-2.368 6.176-5.392 8.128-9.024 1.952-3.664 2.944-8.064 2.944-13.216 0-4.048-0.72-7.872-2.16-11.472-1.44-3.616-3.424-6.688-5.968-9.216-3.2-3.168-6.992-5.568-11.312-7.184-4.336-1.632-9.808-2.432-16.432-2.432h-10.496v-34.752h-12.368v93.104zM340.56 224.208c0-7.568-0.96-14.384-2.88-20.48s-4.688-11.2-8.336-15.344c-3.792-4.336-8.224-7.552-13.28-9.616-5.072-2.064-10.64-3.088-16.736-3.088-6.304 0-11.968 1.056-17.008 3.184s-9.376 5.296-13.008 9.52c-3.584 4.144-6.336 9.232-8.256 15.28-1.92 6.064-2.88 12.912-2.88 20.544 0 7.84 0.976 14.736 2.912 20.656 1.936 5.936 4.704 11.024 8.288 15.28 3.6 4.144 7.92 7.28 12.992 9.424 5.056 2.16 10.736 3.232 16.992 3.232 6.336 0 12.048-1.104 17.136-3.328 5.072-2.208 9.376-5.312 12.88-9.328 3.552-4.096 6.304-9.152 8.272-15.216 1.936-6.048 2.912-12.96 2.912-20.72z" /> +<glyph unicode="" d="M447.472 32.256h-382.96c-17.632 0-31.904 14.304-31.904 31.92v175.504c0 17.648 14.288 31.92 31.904 31.92l16.88 0.896c0 26.064 7.936 42 23.808 59.744s35.552 26.64 59.072 26.64c11.152 0 23.52-1.888 37.072-5.664 0 0 29.472-9.792 49.936-9.792 31.216 0 52.528 13.68 63.84 41.056 5.312 13.168 10.72 19.76 16.224 19.76 7.872 0 11.84-3.68 11.84-11.024 0-13.008-7.024-27.392-21.088-43.136-18.88-21.392-42.096-32.096-69.696-32.096-21.424 0-58.144 10.048-58.144 10.048-14.912 3.616-25.552 5.408-31.888 5.408-15.248 0-28.336-6.512-39.216-19.568s-16.336-23.6-16.336-41.6l340.656-0.672c17.632 0 31.936-14.288 31.936-31.92v-175.52c0-17.616-14.32-31.904-31.936-31.904zM463.44 239.68c0 8.832-7.152 15.968-15.968 15.968h-382.96c-8.816 0-15.952-7.136-15.952-15.968v-175.52c0-8.816 7.136-15.968 15.952-15.968h382.96c8.816 0 15.968 7.152 15.968 15.968v175.52zM399.536 159.408h-31.408v-30.912h-31.904v30.912h-31.936v-30.912h-32.912v30.912h-30.912v-30.912h-31.92v30.912h-31.904v-30.912h-31.936v30.912h-32.4v-30.912h-31.904v31.408h32.4v31.92h-32.4v31.408h31.904v-30.912h32.4v30.912h31.92v-30.912h31.904v30.912h31.92v-30.912h30.912v30.912h32.912v-30.912h31.936v30.912h31.904v-30.912h31.408v30.912h31.904v-31.408h-31.408v-31.92h31.408v-31.408h-31.904v30.912zM176.64 191.824h-32.416v-31.92h32.4v31.92zM239.968 191.824h-31.92v-31.92h31.92v31.92zM303.776 191.824h-31.904v-31.92h31.904v31.92zM367.632 191.824h-31.952v-31.92h31.936v31.92zM369.12 80.128h-225.392v31.424h225.392v-31.424z" /> +<glyph unicode="" d="M432 15.744h-352c-17.68 0-32 14.336-32 32v208c0 17.664 14.32 32 32 32l16.928-0.096c0 26.144 7.952 43.104 23.872 60.912 15.904 17.792 35.664 26.688 59.232 26.688 11.184 0 23.584-1.888 37.168-5.664 0 0 29.552-9.824 50.064-9.824 31.312 0 52.656 13.728 64.016 41.184 5.328 13.2 10.752 19.808 16.272 19.808 7.904 0 11.872-3.68 11.872-11.056 0-13.040-7.056-27.472-21.152-43.248-18.912-21.456-42.208-32.192-69.872-32.192-21.488 0-58.304 10.080-58.304 10.080-14.96 3.616-25.616 5.424-31.968 5.424-15.312 0-28.416-6.528-39.328-19.616-10.928-13.072-16.368-24.64-16.368-42.704l309.568 0.304c17.664 0 32-14.336 32-32v-208c0-17.664-14.336-32-32-32zM448 255.744c0 8.848-7.168 16-16 16h-352c-8.848 0-16-7.152-16-16v-208c0-8.832 7.152-16 16-16h352c8.832 0 16 7.168 16 16v208zM320.048 143.568h96.288v-31.696h-96.288v31.696zM351.808 191.568h64.336v-31.696h-64.336v31.696zM384.112 239.744h32.048v-32.704h-32.048v32.704zM336.592 239.744h31.376v-32.704h-31.376v32.704zM304.128 191.568h31.696v-31.696h-31.696v31.696zM288.4 239.744h32.032v-32.704h-32.032v32.704zM255.264 191.568h32.704v-31.696h-32.704v31.696zM239.552 239.744h32.704v-32.704h-32.704v32.704zM192.032 239.744h32.368v-32.704h-32.368v32.704zM142.848 239.744h33.040v-32.704h-33.040v32.704zM96 239.744h32.704v-32.704h-32.704v32.704zM192.288 159.856h-96.288v31.696h96.288v-31.696zM128.704 63.152h-32.704v32.704h32.704v-32.704zM96.176 143.568h64.336v-31.696h-64.336v31.696zM176.56 63.152h-32.72v32.704h32.72v-32.704zM256.064 111.856h-32.72v31.696h32.72v-31.696zM208.208 111.856h-32.704v31.696h32.704v-31.696zM240.128 159.856h-32.72v31.696h32.72v-31.696zM303.904 143.568v-31.696h-31.696v31.696h31.696zM320.112 63.152h-127.408v32.704h127.408v-32.704zM367.968 63.152h-32.72v32.704h32.72v-32.704zM415.808 63.152h-31.696v32.704h31.696v-32.704z" /> +<glyph unicode="" d="M496 15.936h-464c-17.664 0-32 14.304-32 31.92v271.424c0 17.648 14.336 31.936 32 31.936h339.008l-132.256 71.888c-2.88-5.296-8.288-9.024-14.752-9.024-9.392 0-16.992 7.6-16.992 16.96 0 9.36 7.6 16.96 16.992 16.96s16.992-7.6 16.992-16.976c0-2.24-0.48-4.336-1.28-6.304l190.288-73.52h66c17.664 0 32-14.304 32-31.936v-271.424c0-17.6-14.336-31.904-32-31.904zM448 63.504c17.664 0 32 14.304 32 31.936s-14.336 31.92-32 31.92c-17.68 0-32-14.304-32-31.92 0-17.648 14.32-31.936 32-31.936zM352 63.824c17.664 0 32 14.304 32 31.936s-14.336 31.92-32 31.92-32-14.304-32-31.92c0-17.632 14.336-31.936 32-31.936zM168 303.312c-66.272 0-120-53.616-120-119.728 0-66.144 53.728-119.744 120-119.744 66.288 0 120 53.616 120 119.744 0 66.112-53.712 119.728-120 119.728zM480 303.312h-160v-47.888h88l16 31.92 16-31.92h40v47.888zM256 159.632h12.944c-1.312-5.52-3.088-10.832-5.248-15.968h-7.696v15.968zM256 191.552h15.184c0.224-2.672 0.816-5.232 0.816-7.968s-0.592-5.312-0.816-7.984h-15.184v15.952zM256 223.488h7.872c2.16-5.088 3.664-10.496 4.992-15.968h-12.864v15.968zM224 239.456v15.968h16v-15.968h-16zM192 95.76h16v-7.664c-5.136-2.128-10.48-3.856-16-5.2v12.864zM192 127.68h16v-15.968h-16v15.968zM192 159.632h16v-15.968h-16v15.968zM192 191.552h16v-15.952h-16v15.952zM192 223.488h16v-15.968h-16v15.968zM192 255.424h16v-15.968h-16v15.968zM192 284.224c5.504-1.344 10.864-3.072 16-5.2v-7.648h-16v12.848zM160 80.64v15.12h16v-15.392c-2.656-0.208-5.28-0.576-8-0.576-2.752 0-5.312 0.624-8 0.848zM160 127.68h16v-15.968h-16v15.968zM160 159.632h16v-15.968h-16v15.968zM160 191.552h16v-15.952h-16v15.952zM160 223.488h16v-15.968h-16v15.968zM160 255.424h16v-15.968h-16v15.968zM160 286.496c2.688 0.224 5.248 0.848 8 0.848 2.72 0 5.344-0.368 8-0.576v-15.392h-16v15.12zM128 95.76h16v-12.736c-5.472 1.36-10.896 2.912-16 5.072v7.664zM128 127.68h16v-15.968h-16v15.968zM128 159.632h16v-15.968h-16v15.968zM128 191.552h16v-15.952h-16v15.952zM128 223.488h16v-15.968h-16v15.968zM128 255.424h16v-15.968h-16v15.968zM128 278.992c5.104 2.192 10.528 3.728 16 5.104v-12.72h-16v7.616zM96 127.68h16v-15.968h-16v15.968zM96 159.632h16v-15.968h-16v15.968zM96 191.552h16v-15.952h-16v15.952zM96 223.488h16v-15.968h-16v15.968zM96 255.424h16v-15.968h-16v15.968zM240 207.52h-16v15.968h16v-15.968zM240 175.6h-16v15.952h16v-15.952zM240 143.664h-16v15.968h16v-15.968zM240 111.712h-16v15.968h16v-15.968zM67.056 159.632h12.944v-15.968h-7.68c-2.16 5.136-3.952 10.448-5.264 15.968zM64 183.584c0 2.736 0.608 5.296 0.816 7.968h15.184v-15.952h-15.184c-0.224 2.672-0.816 5.248-0.816 7.984zM72.128 223.488h7.872v-15.968h-12.864c1.328 5.472 2.832 10.864 4.992 15.968zM128-0.032c0-8.816-7.152-15.968-16-15.968h-32c-8.832 0-16 7.152-16 15.968s0 15.968 0 15.968h64c0 0 0-7.152 0-15.968zM464-0.032c0-8.816-7.152-15.968-16-15.968h-32c-8.848 0-16 7.152-16 15.968s0 15.968 0 15.968h64c0 0 0-7.152 0-15.968z" horiz-adv-x="528" /> +<glyph unicode="" d="M416 112h-32v32h16v32h-304v-32h16v-32h-32c-8.832 0-16 7.168-16 16v160c0 15.472 64 32 176 32 5.936 0 11.184 0 16 0 111.008 0 176-16.16 176-32v-160c0-8.832-7.152-16-16-16zM376 272c-13.248 0-24-10.752-24-24s10.752-24 24-24 24 10.752 24 24-10.752 24-24 24zM128 416c0 8.848 7.168 16 16 16h208c8.848 0 16-7.152 16-16v-80h-240v80zM368 16c0-8.832-7.152-16-16-16h-208c-8.832 0-16 7.168-16 16v144h240v-144zM336 144h-176v-16h176v16zM336 112h-176v-16h176v16zM336 80h-176v-16h176v16zM336 48h-176v-16h176v16z" /> +<glyph unicode="" d="M424 48h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8h40v40c0 4.416 3.584 8 8 8 4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM424 144c-4.416 0-8 3.584-8 8v48c0 4.416 3.584 8 8 8 4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM424 240c-4.416 0-8 3.584-8 8v48c0 4.416 3.584 8 8 8 4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM424 336c-4.416 0-8 3.584-8 8v40h-40c-4.416 0-8 3.584-8 8s3.584 8 8 8h48c4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM234.656 143.152c-2.944-2.96-7.728-2.96-10.688 0l-16.032 16.032c-0.032 0.048-0.016 0.112-0.048 0.144l-51.008 51.392c-2.96 2.944-2.96 7.728 0 10.688l16.032 16.048c2.96 2.96 7.744 2.96 10.704 0l45.76-46.096 96.224 96.208c2.944 2.96 7.728 2.96 10.688 0l16.032-16.048c2.976-2.96 2.976-7.744 0-10.704l-117.664-117.664zM328 384h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8h48c4.4 0 8-3.584 8-8s-3.6-8-8-8zM232 384h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8h48c4.4 0 8-3.584 8-8s-3.6-8-8-8zM136 48h-48c-4.416 0-8 3.584-8 8v48c0 4.416 3.584 8 8 8s8-3.584 8-8v-40h40c4.416 0 8-3.584 8-8s-3.584-8-8-8zM136 384h-40v-40c0-4.416-3.584-8-8-8s-8 3.584-8 8v48c0 4.416 3.584 8 8 8h48c4.416 0 8-3.584 8-8s-3.584-8-8-8zM88 304c4.416 0 8-3.584 8-8v-48c0-4.416-3.584-8-8-8s-8 3.584-8 8v48c0 4.416 3.584 8 8 8zM88 208c4.416 0 8-3.584 8-8v-48c0-4.416-3.584-8-8-8s-8 3.584-8 8v48c0 4.416 3.584 8 8 8zM184 64h48c4.4 0 8-3.584 8-8s-3.6-8-8-8h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8zM280 64h48c4.4 0 8-3.584 8-8s-3.6-8-8-8h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8z" /> +<glyph unicode="" d="M424 48h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8h40v40c0 4.416 3.584 8 8 8 4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM424 144c-4.416 0-8 3.584-8 8v48c0 4.416 3.584 8 8 8 4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM424 240c-4.416 0-8 3.584-8 8v48c0 4.416 3.584 8 8 8 4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM424 336c-4.416 0-8 3.584-8 8v40h-40c-4.416 0-8 3.584-8 8s3.584 8 8 8h48c4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM328 48h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8h48c4.4 0 8-3.584 8-8s-3.6-8-8-8zM328 384h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8h48c4.4 0 8-3.584 8-8s-3.6-8-8-8zM232 384h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8h48c4.4 0 8-3.584 8-8s-3.6-8-8-8zM136 48h-48c-4.416 0-8 3.584-8 8v48c0 4.416 3.584 8 8 8s8-3.584 8-8v-40h40c4.416 0 8-3.584 8-8s-3.584-8-8-8zM136 384h-40v-40c0-4.416-3.584-8-8-8s-8 3.584-8 8v48c0 4.416 3.584 8 8 8h48c4.416 0 8-3.584 8-8s-3.584-8-8-8zM88 304c4.416 0 8-3.584 8-8v-48c0-4.416-3.584-8-8-8s-8 3.584-8 8v48c0 4.416 3.584 8 8 8zM88 208c4.416 0 8-3.584 8-8v-48c0-4.416-3.584-8-8-8s-8 3.584-8 8v48c0 4.416 3.584 8 8 8zM331.776 164.432l-16.224-16.224c-2.976-2.992-7.808-2.992-10.8 0l-45.92 45.92-45.92-45.92c-2.992-2.992-7.808-2.992-10.8 0l-16.208 16.224c-2.992 2.992-2.992 7.808 0 10.8l45.936 45.92-45.936 45.92c-2.992 2.976-2.992 7.808 0 10.8l16.208 16.208c2.992 2.992 7.808 2.992 10.8 0l45.92-45.92 45.92 45.92c2.992 2.992 7.824 2.992 10.8 0l16.224-16.208c2.976-2.992 2.976-7.824 0-10.8l-45.936-45.92 45.936-45.92c2.976-2.976 2.976-7.808 0-10.8zM184 64h48c4.4 0 8-3.584 8-8s-3.6-8-8-8h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8z" /> +<glyph unicode="" d="M424 48h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8h40v40c0 4.416 3.584 8 8 8 4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM424 144c-4.416 0-8 3.584-8 8v48c0 4.416 3.584 8 8 8 4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM424 240c-4.416 0-8 3.584-8 8v48c0 4.416 3.584 8 8 8 4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM424 336c-4.416 0-8 3.584-8 8v40h-40c-4.416 0-8 3.584-8 8s3.584 8 8 8h48c4.4 0 8-3.584 8-8v-48c0-4.416-3.6-8-8-8zM328 48h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8h48c4.4 0 8-3.584 8-8s-3.6-8-8-8zM328 384h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8h48c4.4 0 8-3.584 8-8s-3.6-8-8-8zM319.008 240c8.832 0 16-7.152 16-16 0-8.832-7.168-16-16-16h-48v-48c0-8.832-7.168-16-16-16-8.848 0-16 7.168-16 16v48h-48c-8.832 0-16 7.168-16 16 0 8.848 7.152 16 16 16h48v48c0 8.848 7.152 16 16 16 8.832 0 16-7.152 16-16v-48h48zM232 384h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8h48c4.4 0 8-3.584 8-8s-3.6-8-8-8zM136 48h-48c-4.416 0-8 3.584-8 8v48c0 4.416 3.584 8 8 8s8-3.584 8-8v-40h40c4.416 0 8-3.584 8-8s-3.584-8-8-8zM136 384h-40v-40c0-4.416-3.584-8-8-8s-8 3.584-8 8v48c0 4.416 3.584 8 8 8h48c4.416 0 8-3.584 8-8s-3.584-8-8-8zM88 304c4.416 0 8-3.584 8-8v-48c0-4.416-3.584-8-8-8s-8 3.584-8 8v48c0 4.416 3.584 8 8 8zM88 208c4.416 0 8-3.584 8-8v-48c0-4.416-3.584-8-8-8s-8 3.584-8 8v48c0 4.416 3.584 8 8 8zM184 64h48c4.4 0 8-3.584 8-8s-3.6-8-8-8h-48c-4.416 0-8 3.584-8 8s3.584 8 8 8z" /> +<glyph unicode="" d="M136 400h-48c-4.416 0-8-3.584-8-8v-48c0-4.416 3.584-8 8-8s8 3.584 8 8v40h40c4.416 0 8 3.584 8 8s-3.584 8-8 8zM184 384h48c4.4 0 8 3.584 8 8s-3.6 8-8 8h-48c-4.416 0-8-3.584-8-8s3.584-8 8-8zM328 400h-48c-4.416 0-8-3.584-8-8s3.584-8 8-8h48c4.4 0 8 3.584 8 8s-3.6 8-8 8zM424 400h-48c-4.416 0-8-3.584-8-8s3.584-8 8-8h40v-40c0-4.416 3.584-8 8-8 4.4 0 8 3.584 8 8v48c0 4.416-3.6 8-8 8zM424 304c-4.416 0-8-3.584-8-8v-48c0-4.416 3.584-8 8-8 4.4 0 8 3.584 8 8v48c0 4.416-3.6 8-8 8zM424 208c-4.416 0-8-3.584-8-8v-48c0-4.416 3.584-8 8-8 4.4 0 8 3.584 8 8v48c0 4.416-3.6 8-8 8zM424 112c-4.416 0-8-3.584-8-8v-40h-40c-4.416 0-8-3.584-8-8s3.584-8 8-8h48c4.4 0 8 3.584 8 8v48c0 4.416-3.6 8-8 8zM328 64h-48c-4.416 0-8-3.584-8-8s3.584-8 8-8h48c4.4 0 8 3.584 8 8s-3.6 8-8 8zM232 64h-48c-4.416 0-8-3.584-8-8s3.584-8 8-8h48c4.4 0 8 3.584 8 8s-3.6 8-8 8zM136 64h-40v40c0 4.416-3.584 8-8 8s-8-3.584-8-8v-48c0-4.416 3.584-8 8-8h48c4.416 0 8 3.584 8 8s-3.584 8-8 8zM88 144c4.416 0 8 3.584 8 8v48c0 4.416-3.584 8-8 8s-8-3.584-8-8v-48c0-4.416 3.584-8 8-8zM88 240c4.416 0 8 3.584 8 8v48c0 4.416-3.584 8-8 8s-8-3.584-8-8v-48c0-4.416 3.584-8 8-8zM191.008 208h128c8.848 0 16 7.168 16 16 0 8.848-7.152 16-16 16h-128c-8.848 0-16-7.152-16-16 0-8.832 7.152-16 16-16z" /> +<glyph unicode="" d="M233.776 178.304c-5.536-5.632-8.32-12.512-8.32-20.672 0-8.816 3.152-16.224 9.44-22.224 5.808-5.536 12.784-8.304 20.944-8.304 8.336 0 15.536 3.008 21.536 9.056s8.992 13.248 8.992 21.6c0 8.064-2.912 15.088-8.72 21.088-5.808 6.096-12.816 9.136-20.976 9.136-9.072 0.016-16.704-3.216-22.896-9.68v0zM230.256 307.392c-4.784-7.216-7.152-16.176-7.152-26.864 0-8.72 1.472-18.336 4.416-28.832s6.96-20.336 12.016-29.536c6.848-12.464 12.16-18.704 15.904-18.704 3.84 0 8.912 4.88 15.184 14.624 5.536 8.624 9.952 18.432 13.28 29.456s4.992 21.312 4.992 30.88c0 14.432-3.904 25.6-11.68 33.472-5.808 6-12.88 9.008-21.216 9.008-11.248 0-19.84-4.512-25.744-13.504v0z" /> +<glyph unicode="" d="M448 352v-256c0-17.664-14.336-32-32-32h-336c0-17.664 14.336-32 32-32h336c17.664 0 32 14.336 32 32v256c0 17.664-14.336 32-32 32zM432 112v256c0 17.664-14.336 32-32 32h-336c-17.664 0-32-14.336-32-32v-256c0-17.664 14.336-32 32-32h336c17.664 0 32 14.336 32 32zM64 368h336v-256h-336v256zM250.032 203.024l-47.808 50.896-47.824-81.664-35.872 37.488-38.864-82.064h304.88l-68.752 179.92-65.76-104.576zM128 256c17.664 0 32 14.336 32 32s-14.336 32-32 32-32-14.336-32-32 14.336-32 32-32z" /> +<glyph unicode="" d="M394.992 223.408c36.688-39.568 53.12-78.496 38.864-103.456-14.224-24.896-55.696-30.032-107.808-17.824-15.6-52.144-40.864-86.192-69.456-86.192-28.624 0-53.872 34.16-69.44 86.448-52.688-12.56-94.656-7.52-108.992 17.568-14.256 24.96 2.192 63.936 38.88 103.552-37.392 39.936-54.224 79.36-39.84 104.512 14.4 25.216 56.768 30.192 109.824 17.392 15.584 52.4 40.928 86.656 69.584 86.656 28.64 0 53.904-34.144 69.472-86.416 52.56 12.48 94.464 7.424 108.784-17.632 14.336-25.168-2.512-64.624-39.872-104.608zM92.032 319.344c-11.008-19.264 4.176-50.848 36.32-84.24 13.104 12.784 28.192 25.472 44.992 37.664 2.048 20.256 5.168 39.472 9.44 56.96-44.912 11.536-79.696 8.96-90.752-10.384zM171.536 250.224c-11.52-8.768-22.032-17.664-31.456-26.544 9.552-8.928 19.856-17.888 31.52-26.72-0.48 8.88-0.816 17.856-0.816 27.040 0 8.896 0.288 17.632 0.752 26.224zM173.328 174.496c-16.816 12.144-31.856 24.8-45.008 37.536-31.568-33.088-46.224-64.304-35.312-83.408 10.992-19.216 45.408-21.888 89.92-10.592-4.272 17.392-7.568 36.304-9.6 56.464zM321.424 162.64c-7.136-4.688-14.432-9.296-22.032-13.728-7.712-4.496-15.424-8.624-23.104-12.56 13.168-5.6 26.048-10.48 38.272-14.224 2.864 12.544 5.088 26.224 6.864 40.512zM256.576 33.28c21.904 0 41.344 28.56 53.92 72.912-17.36 4.992-35.696 11.936-54.384 20.384-18.352-8.336-36.304-15.040-53.392-20.048 12.544-44.464 31.952-73.248 53.856-73.248zM198.768 122.528c11.872 3.696 24.288 8.288 37.056 13.728-7.712 3.952-15.472 8.128-23.216 12.64-7.184 4.208-14.096 8.528-20.864 12.96 1.744-14.032 4.224-26.976 7.024-39.328zM191.776 285.504c7.056 4.624 14.288 9.168 21.792 13.568 7.408 4.336 14.816 8.32 22.208 12.128-12.816 5.472-25.36 10.304-37.296 14.032-2.784-12.32-4.944-25.744-6.704-39.728zM256.576 414.72c-21.968 0-41.504-28.832-54.064-73.504 17.072-5.024 35.056-11.92 53.376-20.272 18.752 8.592 37.088 15.456 54.544 20.544-12.544 44.432-31.936 73.232-53.856 73.232zM314.416 325.52c-12.288-3.824-25.12-8.56-38.368-14.256 7.44-3.824 14.912-7.84 22.368-12.208 8.032-4.688 15.712-9.568 23.216-14.528-1.76 14.64-4.304 28.16-7.216 40.992zM323.84 262.336c-10.72 7.456-22.048 14.736-34.016 21.696-11.456 6.688-22.816 12.528-34.048 17.984-11.088-5.408-22.336-11.408-33.616-17.984-11.408-6.64-22.304-13.584-32.56-20.656-0.992-12.752-1.664-25.808-1.664-39.392 0-13.728 0.56-27.088 1.552-39.984 10.032-6.896 20.624-13.632 31.696-20.096 11.776-6.864 23.456-12.864 35.008-18.432 11.408 5.536 22.992 11.664 34.592 18.432 11.504 6.704 22.432 13.68 32.784 20.832 0.976 12.704 1.664 25.712 1.664 39.248 0 13.152-0.48 25.968-1.392 38.352zM418.992 128.624c10.912 19.072-3.872 50.24-35.376 83.248-12.816-12.384-27.488-24.672-43.776-36.496-2.048-20.512-5.216-39.984-9.568-57.664 43.936-10.96 77.84-8.128 88.72 10.912zM341.648 197.92c11.024 8.416 21.136 16.96 30.256 25.456-9.152 8.64-19.024 17.328-30.192 25.888 0.4-8.304 0.688-16.704 0.688-25.264-0.016-8.864-0.304-17.536-0.752-26.080zM419.952 319.344c-10.976 19.184-45.28 21.904-89.68 10.656 4.368-17.888 7.744-37.424 9.76-58.256 16.304-11.92 30.88-24.32 43.648-36.784 32.208 33.456 47.312 65.088 36.272 84.384zM259.2 191.008c-18.832 0-34.096 15.408-34.096 34.432 0 19.008 15.264 34.432 34.096 34.432 18.816 0 34.080-15.424 34.080-34.432 0-19.040-15.264-34.432-34.080-34.432z" /> +<glyph unicode="" d="M392.832 259.008l-101.824 101.824c-6.24 6.256-6.24 16.368 0 22.624 6.256 6.256 16.384 6.256 22.64 0l11.312-11.312 50.928 50.912c21.856 21.872 57.312 21.872 79.184 0 21.872-21.856 21.872-57.328 0-79.184l-50.912-50.928 11.312-11.312c6.256-6.256 6.256-16.368 0-22.624s-16.4-6.256-22.64 0zM153.632 42.432c-9.904-9.904-34.64 10.592-45.248 0l-26.88-26.88c-9.36-9.376-24.56-9.376-33.936 0s-9.376 24.56 0 33.936l26.88 26.88c10.608 10.592-9.904 35.344 0 45.248 9.888 9.92 216.368 216.384 216.368 216.384l79.184-79.2c0 0-206.464-206.464-216.368-216.368zM347.376 258.8l-56.56 56.576c0 0-183.856-183.856-193.744-193.76-9.904-9.904 9.904-35.344 0-45.248l-38.192-38.176c-3.12-3.12-3.12-8.192 0-11.312s8.192-3.12 11.312 0l38.192 38.192c9.904 9.904 35.344-9.904 45.248 0s193.744 193.728 193.744 193.728z" /> +<glyph unicode="" d="M362.528 304.192h82.752c11.088-24.656 17.712-51.664 18.848-80.192h-94.944c-0.4 30.144-2.896 56.704-6.656 80.192zM326.368 417.664c47.472-18.448 86.432-53.36 110.848-97.44h-77.376c-8.784 44.88-22.128 76.784-33.472 97.44zM257.088 320.224v111.936c17.056-0.752 33.632-3.456 49.472-7.888 12-20.208 27.504-53.952 37.28-104.048h-86.752zM151.824 127.776c-3.744 23.504-6.336 49.904-6.736 80.192h95.968v-80.192h-89.232zM151.664 304.192h89.392v-80.192h-96.064c0.4 30.176 2.928 56.688 6.672 80.192zM191.808 424.624c15.792 4.256 32.24 6.96 49.248 7.504v-111.904h-86.752c9.84 50.368 25.456 84.24 37.504 104.4zM58.576 320.224c24.816 44.8 64.992 79.888 113.536 98.096-11.44-20.64-24.944-52.72-33.824-98.096h-79.712zM128.96 224h-96.96c1.056 28.496 7.472 55.584 18.528 80.192h85.056c-3.728-23.504-6.24-50.048-6.624-80.192zM135.792 127.776h-84.64c-11.104 24.688-18.224 51.584-19.264 80.192h97.136c0.384-30.288 3.008-56.656 6.768-80.192zM138.416 111.744c8.944-45.824 22.656-77.872 34.144-98.272-48.72 18.128-88.912 53.36-113.76 98.272h79.616zM241.056 111.744v-111.904c-16.832 0.528-33.072 3.184-48.72 7.36-12.080 19.776-27.776 53.808-37.696 104.544h86.416zM343.536 111.744c-9.872-50.432-25.472-84.336-37.504-104.192-15.664-4.336-32.096-6.688-48.944-7.44v111.632h86.448zM257.088 207.968h95.968c-0.368-30.288-3.008-56.672-6.752-80.192h-89.216v80.192zM353.152 224h-96.064v80.192h89.376c3.76-23.504 6.288-50.016 6.688-80.192zM369.12 207.968h94.816c-1.056-28.592-8.096-55.488-19.152-80.192h-82.432c3.744 23.536 6.368 49.904 6.768 80.192zM437.088 111.744c-24.336-44.256-63.472-79.184-111.152-97.6 11.44 20.416 24.976 52.256 33.808 97.6h77.344z" /> +<glyph unicode="" d="M248 448c-128.128 0-232-103.872-232-232s103.872-232 232-232 232 103.872 232 232-103.872 232-232 232zM172.032 418.336c-11.424-20.624-24.944-52.72-33.808-98.096h-79.728c24.816 44.784 64.992 79.888 113.536 98.096zM50.464 304.208h85.056c-3.744-23.488-6.256-50.048-6.64-80.192h-96.96c1.072 28.496 7.488 55.584 18.544 80.192zM31.808 207.984h97.152c0.368-30.288 3.008-56.656 6.752-80.192h-84.64c-11.104 24.688-18.208 51.584-19.264 80.192zM58.72 111.76h79.632c8.944-45.824 22.656-77.872 34.144-98.272-48.736 18.144-88.912 53.376-113.776 98.272zM240.992-0.144c-16.832 0.528-33.072 3.184-48.72 7.36-12.080 19.776-27.776 53.808-37.696 104.544h86.416v-111.904zM240.992 127.792h-89.248c-3.744 23.504-6.336 49.904-6.736 80.192h95.968v-80.192zM240.992 224.016h-96.064c0.4 30.176 2.928 56.688 6.672 80.192h89.392v-80.192zM240.992 320.24h-86.752c9.84 50.368 25.456 84.256 37.504 104.4 15.792 4.256 32.24 6.96 49.248 7.52v-111.92zM464.048 224.016h-94.928c-0.4 30.144-2.912 56.704-6.656 80.192h82.752c11.088-24.656 17.728-51.68 18.832-80.192zM437.152 320.24h-77.392c-8.784 44.896-22.112 76.8-33.456 97.44 47.472-18.464 86.432-53.36 110.848-97.44zM257.008 432.176c17.072-0.752 33.632-3.456 49.472-7.888 12.016-20.208 27.52-53.952 37.296-104.048h-86.768v111.936zM257.008 304.208h89.392c3.744-23.504 6.272-50.016 6.672-80.192h-96.064v80.192zM257.008 207.984h95.968c-0.368-30.288-2.992-56.688-6.736-80.192h-89.232v80.192zM257.008 0.144v111.632h86.432c-9.872-50.432-25.456-84.336-37.488-104.192-15.648-4.352-32.080-6.688-48.944-7.44zM325.872 14.176c11.424 20.416 24.96 52.256 33.792 97.6h77.36c-24.352-44.256-63.472-79.2-111.152-97.6zM444.72 127.792h-82.432c3.744 23.536 6.368 49.904 6.768 80.192h94.832c-1.072-28.592-8.128-55.488-19.168-80.192z" /> +<glyph unicode="" d="M267.552 130.192c-7.296 6.912-15.808 12.224-25.104 15.536l-19.488 75.888 232.096 64.928 24.864-96.896-212.368-59.456zM193.664 335.696l154.736 43.28 24.88-96.928-154.72-43.28-24.896 96.928zM200.608 147.184c-4.32-1.216-8.336-2.944-12.24-4.848l-68.224 265.84h-25.664c-2.576-5.616-7.968-9.568-14.336-9.568h-32.032c-8.848 0-16.016 7.504-16.016 16.736s7.168 16.72 16.016 16.72h32.032c5.376 0 9.888-2.944 12.8-7.152h49.28v-0.816l0.736 0.224 70.56-274.928c-4.304-0.4-8.608-1.024-12.912-2.208zM204.752 131.024c29.904 8.368 60.64-10.16 68.656-41.408 8.016-31.216-9.728-63.312-39.648-71.68-29.904-8.336-60.64 10.192-68.656 41.408s9.744 63.312 39.648 71.68zM196.32 66.976c3.424-13.376 16.608-21.312 29.424-17.712s20.416 17.344 16.992 30.72c-3.424 13.376-16.608 21.312-29.424 17.744-12.832-3.6-20.432-17.36-16.992-30.752zM477.92 132.784l-186.944-52.288c-0.336 4.464-0.96 8.976-2.112 13.472-1.136 4.496-2.784 8.72-4.624 12.784l185.968 52 7.712-25.968z" /> +<glyph unicode="" d="M256 432.256c-115.216 0-208.24-93.040-208.24-208.256 0-115.184 93.024-208.256 208.24-208.256 115.2 0 208.256 93.056 208.256 208.256 0 115.216-93.072 208.256-208.256 208.256zM255.264 348.976c14.896 0 26.992-12.080 26.992-27.008 0-14.912-12.096-27.008-26.992-27.008-14.928 0-27.008 12.096-27.008 27.008-0.016 14.928 12.080 27.008 27.008 27.008zM258.912 29.744c-56.656 0-100.16 42.304-100.16 97.040 0 52.88 40.032 97.072 93.712 97.024 0 0 100.768 4.96 100.768 97.328 0 55.52-33.6 89.072-97.36 97.328 114.768-6.368 194.368-85.968 194.368-194.352 0.016-105.76-87.024-194.368-191.328-194.368zM256.24 154.976c-14.912 0-27.008-12.080-27.008-27.008 0-14.912 12.096-27.008 27.008-27.008 14.912 0 27.008 12.096 27.008 27.008 0 14.928-12.096 27.008-27.008 27.008z" /> +<glyph unicode="" d="M464 184c0-114.88-93.12-208-208-208s-208 93.12-208 208c0 101.28 72.4 185.552 168.24 204.112-5.2 7.664-8.24 16.912-8.24 26.896 0 26.512 21.488 48 48 48 26.496 0 48-21.488 48-48 0-9.968-3.040-19.216-8.256-26.896 95.856-18.56 168.256-102.832 168.256-204.112zM256 440c-13.264 0-24-10.752-24-24s10.736-24 24-24c13.248 0 24 10.752 24 24s-10.752 24-24 24zM272 359.2v-39.2h-32v39.2c-86.736-7.824-155.12-80.544-159.584-168.208h47.584v-30.992h-46.336c10.608-81.072 76.272-143.776 158.336-151.184v39.184h32v-39.184c81.712 7.376 147.152 70.592 158.176 151.184h-46.176v32h47.616c-3.968 88.128-72.576 159.344-159.616 167.2zM152.208 77.408l62.688 141.888 140.96 61.744-61.52-140.704-142.128-62.928zM277.12 202.336c-12.496 12.496-32.768 12.496-45.264 0s-12.496-32.752 0-45.248 32.768-12.496 45.264 0c12.496 12.496 12.496 32.736 0 45.248z" /> +<glyph unicode="" d="M80 0v432h160v-32h-32v-32h32v-32h-32v-32h32v-32h-32v-32h32v-32h32v32h-32v32h32v32h-32v32h32v32h-32v32h32v32h47.856v-96.144h96.144v-335.856h-336zM272 192h-64v-112h64v112zM256 96.992h-32v32h32v-32zM336 432h3.92l76.080-76.080v-2.928h-80v79.008z" /> +<glyph unicode="" d="M272 80.992h-64v112h64v-112zM256 128.992h-32v-32h32v32zM272 208h-32v32h32v-32zM208 240v32h32v-32h-32zM208 336h32v-32h-32v32zM208 400h32v-32h-32v32zM272 368v-32h-32v32h32zM272 304v-32h-32v32h32zM80 0v432h240v-31.856h-208v-368.288h272.288v304.144h31.712v-336h-336zM336 432h1.968l78.032-78.016v-0.992h-80v79.008z" /> +<glyph unicode="" d="M463.984 174.48l-18.176-123.664-36.784 35.68c-29.136-24.624-83.168-58.128-161.664-58.128-78.96 0-133.568 32.688-162.624 56.112l-33.568-32.56-19.168 122.544 126.288-18.592-34.8-33.776c24.416-18.128 62.72-39.984 100.864-39.984l-0.112 201.744c-27.856 9.696-47.904 35.312-47.904 65.68 0 38.688 32.304 70.048 72.16 70.048 39.84 0 72.16-31.36 72.16-70.048 0-30.832-20.672-56.72-49.184-66.064 0.176-39.36 0.816-202.112-0.064-202.112 36.48 0 74.144 23.744 98.672 42.944l-32.512 31.568 126.416 18.608zM285.696 350.672c0 19.936-16.656 36.112-37.2 36.112s-37.216-16.176-37.216-36.112c0-19.952 16.672-36.128 37.216-36.128s37.2 16.176 37.2 36.128z" /> +<glyph unicode="" d="M256.528-0.064c0 0-176.592 109.328-176.592 197.424 0 48.848 27.92 97.136 80.672 104.608v34.32c0 52.912 42.992 95.776 96 95.776 53.024 0 96-42.88 96-95.776v-34.336c50.912-7.6 79.472-54.944 79.472-104.576-0.016-89.184-175.552-197.44-175.552-197.44zM231.6 96.848h48.992l-20.768 55.52c11.648 1.632 20.768 11.216 20.768 23.296 0 13.216-10.752 23.952-24 23.952-13.248 0-24-10.736-24-23.952 0-11.488 8.288-20.64 19.104-22.96l-20.096-55.856zM320.592 336.288c0 35.264-28.656 63.856-64 63.856s-64-28.592-64-63.856v-34.912c44-9.712 63.92-52.16 63.92-52.16s17.76 42.944 64.064 52.272v34.8z" /> +<glyph unicode="" d="M248-0.496c-69.84 0-167.632 72.848-167.632 145.664 0 31.2 5.856 72.512 12.56 110.752h82.096c-4.336-33.584-7.84-71.296-7.84-108.752 5.984-33.92 53.872-59.856 80.816-59.856s72.848 24.944 80.816 59.856c0 37.664-3.632 75.312-8.112 108.752h81.792c6.976-38.784 13.12-80.704 13.12-111.728 0.016-71.856-97.776-144.688-167.616-144.688zM303.872 351.712h78.832c0 0 8.608-35.552 17.008-79.824h-81.12c-6.896 46.592-14.72 79.824-14.72 79.824zM303.872 415.584h79.808v-15.968h-79.808v15.968zM191.12 351.712c0 0-7.472-33.36-14.064-79.824h-81.44c8.224 44.336 16.672 79.824 16.672 79.824h78.832zM160.192 368.688h-15.952v31.92h-31.936v15.968h31.936v31.92h15.952v-31.92h31.936v-15.968h-31.936v-31.92z" /> +<glyph unicode="" d="M506 256.992c-8.128 0-27.696-9.008-41.648-16h-31.76c-1.92 40.688-18.256 77.52-44.080 105.6l20.992 21.008c14.912 4.88 36.832 12.784 42.864 18.816 9.376 9.376 9.376 24.576 0 33.952-9.376 9.36-24.56 9.36-33.936 0-5.744-5.744-13.216-25.984-18.128-40.768l-22.448-22.432c-28.208 25.68-65.12 41.792-105.856 43.488v29.712c7.072 14 16.992 35.104 16.992 43.632 0 13.248-10.752 24-24 24s-24-10.752-24-24c0-8.128 9.008-27.696 16-41.648v-31.76c-40.688-1.92-77.536-18.24-105.616-44.080l-20.992 21.008c-4.88 14.912-12.8 36.848-18.832 42.88-9.36 9.36-24.56 9.36-33.936 0-9.376-9.376-9.376-24.576 0-33.952 5.744-5.76 25.968-13.216 40.752-18.128l22.448-22.448c-25.456-27.984-41.504-64.528-43.408-104.864h-31.76c-13.936 6.992-33.504 16-41.648 16-13.264 0-24-10.752-24-24s10.736-24 24-24c8.528 0 29.632 9.92 43.632 16.992h29.728c1.68-40.736 17.808-77.648 43.472-105.856l-22.432-22.448c-14.8-4.912-35.008-12.368-40.768-18.128-9.376-9.376-9.376-24.576 0-33.936 9.376-9.376 24.576-9.376 33.936 0 6.032 6.016 13.936 27.936 18.832 42.848l21.008 21.008c28.080-25.824 64.912-42.16 105.6-44.080v-31.76c-6.992-13.936-16-33.52-16-41.648 0-13.248 10.752-24 24-24s24 10.752 24 24c0 8.528-9.92 29.632-16.992 43.632v29.728c40.736 1.664 77.648 17.792 105.856 43.456l22.448-22.432c4.912-14.784 12.368-35.008 18.128-40.752 9.376-9.376 24.56-9.376 33.936 0 9.376 9.36 9.376 24.56 0 33.936-6.032 6.032-27.952 13.936-42.864 18.832l-20.992 20.992c26.048 28.32 42.432 65.52 44.128 106.608h29.728c14-7.088 35.088-16.992 43.632-16.992 13.248 0 24 10.752 24 24s-10.768 23.984-24.016 23.984zM163.44 323.232l56.832-56.832c-5.472-7.312-9.104-15.952-10.48-25.392h-80.384c1.84 31.504 14.336 60.080 34.032 82.224zM129.344 226h80.352c1.248-9.84 4.928-18.848 10.592-26.4l-56.848-56.832c-19.888 22.368-32.448 51.328-34.096 83.232zM256.992 97.408c-31.872 1.856-60.72 14.624-82.976 34.72l56.8 56.8c7.472-5.792 16.368-9.696 26.176-11.104v-80.416zM256.992 288.192c-9.808-1.408-18.704-5.328-26.176-11.12l-56.8 56.8c22.256 20.080 51.104 32.864 82.976 34.72v-80.4zM400.592 240.992h-80.4c-1.408 9.792-5.312 18.704-11.104 26.176l56.8 56.8c20.080-22.24 32.848-51.104 34.704-82.976zM355.232 334.56l-56.832-56.848c-7.568 5.664-16.56 9.344-26.4 10.592v80.352c31.904-1.648 60.864-14.208 83.232-34.096zM272 97.36v80.336c9.84 1.248 18.848 4.928 26.4 10.576l56.832-56.832c-22.368-19.888-51.328-32.448-83.232-34.080zM365.872 142.032l-56.8 56.8c6 7.712 9.936 16.992 11.216 27.168h80.336c-1.616-32.272-14.448-61.504-34.752-83.968z" horiz-adv-x="528" /> +<glyph unicode="" d="M415.904 221.696l-195.6 195.6-188.304-0.72 0.288-173.296 202.592-202.592c12.704-12.72 33.152-12.896 45.664-0.384l135.744 135.76c12.496 12.496 12.336 32.928-0.384 45.632zM113.296 304.768c-17.664 0-32 14.336-32 32s14.336 32 32 32c17.68 0 32-14.336 32-32s-14.32-32-32-32zM461.536 221.312l-195.6 195.6-23.536-0.080 196.32-195.312c12.72-12.72 12.88-33.136 0.368-45.648l-135.744-135.76c-3.312-3.312-7.216-5.664-11.344-7.216 11.536-4.432 24.976-2.16 34.16 7.008l135.776 135.76c12.496 12.512 12.32 32.944-0.4 45.648z" /> +<glyph unicode="" d="M384 272.368c-61.856 0-112-50.528-112-112.88 0-35.52 16.32-67.152 41.744-87.856-32.896-24.4-57.744-39.808-57.744-39.808s-224 138.432-224 249.952c0 67.2 41.328 134.384 120 134.384 72 0 104-68.736 104-68.736s28 68.736 104 68.736 118.656-65.84 118.656-134.384c0-15.328-4.352-31.088-11.456-46.912-20.496 22.976-50.144 37.504-83.2 37.504zM384 256.256c53.008 0 96-43.312 96-96.752s-42.992-96.768-96-96.768c-53.024 0-96 43.328-96 96.768s42.976 96.752 96 96.752zM336 143.376h96v32.256h-96v-32.256z" /> +<glyph unicode="" d="M126.864 230.624l101.824 101.824 51.248-51.248c-4.256-8.912-2.784-19.856 4.608-27.232 7.376-7.392 18.336-8.864 27.232-4.624l52.656-52.656-101.808-101.824-135.76 135.76zM318.48 287.904c-7.376 7.376-18.336 8.864-27.232 4.608l-51.248 51.248 79.184 79.184c12.496 12.496 32.768 12.496 45.248 0l90.528-90.496c12.48-12.496 12.48-32.768 0-45.248l-79.2-79.2-52.672 52.656c4.256 8.928 2.784 19.872-4.608 27.248zM138.176 15.664l-90.512 90.496 90.512 90.512 90.512-90.512-90.512-90.496zM116.256 106.896l-22.624 22.624-23.344-23.344 22.64-22.624 23.328 23.344zM161.504 61.632l-22.624 22.624-23.328-23.328 22.624-22.624 23.328 23.328z" /> +<glyph unicode="" d="M384-32.656h-288c-17.68 0-32 14.288-32 31.936v385.552c0 17.632 14.32 31.92 32 31.92h80v-33.264h-64c-8.832 0-16-7.136-16-15.968v-352.272c0-8.848 7.168-15.968 16-15.968h256c8.848 0 16 7.12 16 15.968v352.272c0 8.832-7.152 15.968-16 15.968h-64v33.264h80c17.664 0 32-14.304 32-31.92v-385.552c0-17.648-14.336-31.936-32-31.936zM176 287.696h176v-15.968h-176v15.968zM176 239.792h176v-15.968h-176v15.968zM176 191.872h176v-15.968h-176v15.968zM176 143.968h176v-15.968h-176v15.968zM352 32.224h-176v15.936h176v-15.936zM176 96.064h176v-15.968h-176v15.968zM128 288.016h16v-15.968h-16v15.968zM128 240.112h16v-15.968h-16v15.968zM128 192.224h16v-15.968h-16v15.968zM128 144.32h16v-15.968h-16v15.968zM144 32.528h-16v15.968h16v-15.968zM128 96.4h16v-15.968h-16v15.968zM336 366.544c8.848 0 16-7.152 16-15.984 0-8.816 0-30.928 0-30.928h-224c0 0 0 22.112 0 30.928 0 8.832 7.152 15.984 16 15.984h48c0 0 0.192 22.704 0.192 48.656 0 26.944 20.8 49.472 47.808 49.472s48.528-23.68 48.528-49.632c0-27.952-0.528-48.496-0.528-48.496h48zM240 416.752c-8.848 0-16-7.136-16-15.952 0-8.832 7.152-15.968 16-15.968s16 7.136 16 15.968c0 8.816-7.152 15.952-16 15.952z" /> +<glyph unicode="" d="M416-32h-320c-17.68 0-32 14.304-32 31.936v400.224c0 17.648 14.32 31.936 32 31.936h96v-31.936h-80c-8.832 0-16-7.136-16-15.968v-368.288c0-8.816 7.168-15.968 16-15.968h288c8.848 0 16 7.152 16 15.968v368.288c0 8.832-7.152 15.968-16 15.968h-80v31.936h96c17.664 0 32-14.304 32-31.936v-400.224c0-17.632-14.336-31.936-32-31.936zM400 384.192v-368.288h-288v368.288h16v-64.88h256v64.88h16zM176 271.408h-16v-15.968h16v15.968zM176 239.472h-16v-15.968h16v15.968zM176 207.536h-16v-15.968h16v15.968zM176 175.6h-16v-15.968h16v15.968zM176 143.664h-16v-15.968h16v15.968zM176 111.712h-16v-15.968h16v15.968zM176 79.776h-16v-15.968h16v15.968zM352 271.408h-160v-15.968h160v15.968zM352 239.472h-160v-15.968h160v15.968zM352 207.536h-160v-15.968h160v15.968zM352 175.6h-160v-15.968h160v15.968zM352 143.664h-160v-15.968h160v15.968zM352 111.712h-160v-15.968h160v15.968zM352 79.776h-160v-15.968h160v15.968zM352 384.192c8.848 0 16-7.136 16-15.968 0-8.816 0-31.936 0-31.936h-224c0 0 0 23.12 0 31.936 0 8.832 7.152 15.968 16 15.968h48c0 0 0.192 20.384 0.192 46.336 0 26.944 20.8 49.472 47.808 49.472s48.528-23.68 48.528-49.648c0-27.936-0.528-46.16-0.528-46.16h48zM256 432.096c-8.848 0-16-7.136-16-15.968 0-8.816 7.152-15.968 16-15.968s16 7.152 16 15.968c0 8.832-7.152 15.968-16 15.968z" /> +<glyph unicode="" d="M248-16.992c-110.464 0-200 89.552-200 200 0 85.040 53.168 157.504 128 186.416v-71.184c-38.384-24.048-64-66.592-64-115.232 0-75.104 60.896-136 136-136s136 60.896 136 136c0 41.536-18.656 78.64-48 103.6v75.776c66.288-32.576 112-100.544 112-179.392 0-110.448-89.552-199.984-200-199.984zM256 207.008c-17.664 0-32 14.336-32 32v177.984c0 17.664 14.336 32 32 32s32-14.336 32-32v-178c0-17.664-14.336-31.984-32-31.984z" /> +<glyph unicode="" d="M96.928 370.64l10.976-10.976-44.928-44.928 35.008-35.008 45.136 45.136 10.256-10.256-45.136-45.152 34.56-34.544 102.656 102.656-124.992 124.256-102.288-102.288 33.824-33.84 44.928 44.944zM369.584 213.456l-102.656-102.672 34.544-34.544 45.152 45.136 10.256-10.256-45.136-45.136 35.008-35.008 44.912 44.928 10.976-10.976-44.912-44.928 33.808-33.824 102.304 102.304-124.256 124.976zM477.152 344.784c12.496 12.512 12.592 32.72 0.192 45.136l-56.192 56.176c-12.4 12.4-32.624 12.336-45.12-0.192l-34.72-34.72 101.12-101.12 34.72 34.72zM54.368 64.928l41.968-41.968 84.544 30.032-96.48 96.48-30.032-84.544zM330.4 400.912l-238.16-238.176 101.904-101.904 238.176 238.176-101.92 101.904zM138.512 162.944l191.696 191.696 11.168-11.168-191.712-191.712-11.152 11.184zM160.848 140.592l191.68 191.696 11.168-11.168-191.696-191.68-11.152 11.152zM183.184 118.272l191.696 191.696 11.152-11.168-191.68-191.696-11.168 11.168zM31.264-0.16l49.056 17.872-31.184 31.184-17.872-49.056z" /> +<glyph unicode="" d="M512 176l-96 96v144h-64v-80l-96 96-256-256v-16h64v-160h160v96h64v-96h160v160h64z" /> +<glyph unicode="" d="M256 448l-256-256 48-48 48 48 32-192h96v96h64v-96h96l32 192 48-48 48 48-256 256zM256 242.746c-24.994 0-45.256 20.26-45.256 45.254s20.262 45.255 45.256 45.255c24.992 0 45.255-20.262 45.255-45.255 0-24.994-20.263-45.254-45.255-45.254z" /> +<glyph unicode="" d="M448 352v64h-448v-352c0-17.673 14.327-32 32-32h432c26.511 0 48 21.489 48 48v272h-64zM416 64h-384v320h384v-320zM64 320h320v-32h-320zM256 256h128v-32h-128zM256 192h128v-32h-128zM256 128h96v-32h-96zM64 256h160v-160h-160z" /> +<glyph unicode="" d="M432 480c44.182 0 80-35.817 80-80 0-18.010-5.955-34.629-16-48l-32-32-112 112 32 32c13.371 10.045 29.989 16 48 16zM32 112l-32-144 144 32 296 296-112 112-296-296zM357.789 298.211l-224-224-27.578 27.578 224 224 27.578-27.578z" /> +<glyph unicode="" d="M192 160l64 32 224 224-32 32-224-224-32-64zM144.65 46.451c-15.816 33.364-32.833 50.381-66.198 66.197l49.548 136.396 64 38.956 192 192h-96l-192-192-96-320 320 96 192 192v96l-192-192-38.956-64z" /> +<glyph unicode="" d="M192 186.667c0 0 101.972 61.18 159.383 37.013 11.901 18.134 23.624 37.668 35.101 57.611-56.163 13.76-130.484 1.376-130.484 1.376s95.106 57.061 153.333 39.2c11.675 21.054 23.027 41.821 33.978 61.152-46.388 3.134-91.311-4.352-91.311-4.352s59.574 35.744 113.289 41.799c16.899 27.43 32.585 48.94 46.711 59.534-280.5 0-448-320-512-512h32l96 160c0 0 32-32 128 0 22.737 7.579 45.474 28.626 67.786 56.967-56.308 14.277-131.786 1.7-131.786 1.7z" /> +<glyph unicode="" d="M480.002 335.997l-111.999 111.999 32 32 111.999-111.999zM448 304l-16-176c-144 0-352-160-352-160l-26.565 26.565 136.832 136.832c5.487-2.184 11.467-3.397 17.733-3.397 26.51 0 48 21.49 48 48 0 26.51-21.49 48-48 48-26.51 0-48-21.49-48-48 0-6.266 1.213-12.245 3.397-17.733l-136.832-136.832-26.565 26.565c0 0 160 208 160 352l176 16 112-112z" /> +<glyph unicode="" d="M192 384c123.712 0 224-100.289 224-224h-48c0 47.012-18.307 91.209-51.549 124.451-33.242 33.242-77.44 51.549-124.451 51.549v48zM192 480c176.73 0 320-143.27 320-320h-48c0 36.74-7.185 72.357-21.355 105.859-13.698 32.384-33.317 61.478-58.312 86.474-24.996 24.996-54.090 44.615-86.474 58.312-33.502 14.17-69.118 21.355-105.859 21.355v48zM287.195 255.196c21.879-21.878 32.798-50.553 32.785-79.225-31.98-47.998-31.98-111.971-31.98-111.971-128 0-224-96-224-96l-18.565 18.565 141.791 141.791c1.558-0.233 3.151-0.356 4.774-0.356 17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32-17.673 0-32-14.327-32-32 0-1.623 0.123-3.217 0.356-4.774l-141.791-141.791-18.565 18.565c0 0 96 96 96 224 0 0 63.999 0 111.999 32 28.664 0 57.327-10.935 79.196-32.804z" /> +<glyph unicode="" d="M447.97 163.249c-0.006 0.353-0.015 0.701-0.021 1.053-0.016 0.714-0.035 1.427-0.059 2.14-5.015 157.824-191.89 313.558-191.89 313.558s-186.877-155.734-191.89-313.561c-0.022-0.715-0.044-1.426-0.060-2.141-0.007-0.352-0.015-0.701-0.021-1.053-0.018-1.080-0.028-2.162-0.028-3.248 0-1.184 0.014-2.361 0.035-3.539 0.002-0.098 0.003-0.195 0.007-0.293 2.039-104.266 87.198-188.165 191.957-188.165 104.758 0 189.916 83.899 191.959 188.168 0.002 0.098 0.004 0.196 0.005 0.293 0.021 1.178 0.036 2.357 0.036 3.539 0 1.086-0.012 2.168-0.030 3.249zM383.975 157.63l-0.004-0.203c-0.659-33.643-14.266-65.167-38.313-88.774-24.071-23.636-55.915-36.653-89.658-36.653-6.231 0-12.397 0.447-18.462 1.319 69.528 41.423 116.108 117.352 116.108 204.161 0 9.728-0.59 19.317-1.726 28.74 20.136-36.97 31.032-71.4 32.001-101.813l0.002-0.072c0.016-0.474 0.026-0.946 0.039-1.422l0.014-0.724c0.014-0.728 0.024-1.459 0.024-2.189 0-0.792-0.010-1.581-0.025-2.37z" /> +<glyph unicode="" d="M512 192v192h-96v32c0 17.6-14.4 32-32 32h-352c-17.6 0-32-14.4-32-32v-96c0-17.6 14.4-32 32-32h352c17.6 0 32 14.4 32 32v32h64v-128h-288v-64h-16c-8.837 0-16-7.163-16-16v-160c0-8.837 7.163-16 16-16h64c8.837 0 16 7.163 16 16v160c0 8.837-7.163 16-16 16h-16v32h288zM384 384h-352v32h352v-32z" /> +<glyph unicode="" d="M448 384h-384v-320h384v320zM512 448v0-448h-512v448h512zM416 96h-320v64l96 160 131.5-160 92.5 64v-32zM320 304c0 26.51 21.49 48 48 48s48-21.49 48-48c0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48z" /> +<glyph unicode="" d="M0 416v-416h512v416h-512zM480 32h-448v352h448v-352zM352 304c0 26.51 21.49 48 48 48s48-21.49 48-48c0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48zM448 64h-384l96 256 128-160 64 48z" /> +<glyph unicode="" d="M64 352v-320h448v320h-448zM480 85.333l-64 106.667-72.533-60.444-55.467 92.444-192-160v256h384v-234.667zM128 240c0 26.51 21.49 48 48 48s48-21.49 48-48c0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48zM448 416h-448v-320h32v288h416z" /> +<glyph unicode="" d="M152 176c0-57.438 46.562-104 104-104s104 46.562 104 104-46.562 104-104 104-104-46.562-104-104zM480 352h-112c-8 32-16 64-48 64h-128c-32 0-40-32-48-64h-112c-17.6 0-32-14.4-32-32v-288c0-17.6 14.4-32 32-32h448c17.6 0 32 14.4 32 32v288c0 17.6-14.4 32-32 32zM256 34c-78.425 0-142 63.574-142 142 0 78.425 63.575 142 142 142 78.426 0 142-63.575 142-142 0-78.426-63.573-142-142-142zM480 256h-64v32h64v-32z" /> +<glyph unicode="" d="M160 384l352 96v-368c0-44.183-50.145-80-112-80s-112 35.817-112 80c0 44.183 50.145 80 112 80 17.179 0 33.451-2.766 48-7.703v164.794l-224-61.091v-240c0-44.183-50.144-80-112-80-61.856 0-112 35.817-112 80 0 44.183 50.144 80 112 80 17.179 0 33.451-2.766 48-7.703v263.703z" /> +<glyph unicode="" d="M96 190.857v-221.715c5.227-0.748 10.567-1.143 16-1.143h16v224.001h-16c-5.433 0-10.773-0.395-16-1.143zM384 192v-224h16c5.434 0 10.773 0.395 16 1.143v221.714c-5.227 0.748-10.566 1.143-16 1.143h-16zM512 224c0 141.385-114.615 256-256 256s-256-114.615-256-256c0-30.709 5.414-60.153 15.328-87.437-9.736-16.601-15.328-35.926-15.328-56.563 0-44.677 26.163-83.239 64-101.216v202.432c-10.063-4.781-19.29-11.030-27.429-18.452-2.996 14.61-4.571 29.739-4.571 45.236 0 123.712 100.288 224 224 224s224-100.288 224-224c0-15.497-1.574-30.626-4.571-45.236-8.14 7.422-17.365 13.671-27.429 18.452v-202.432c37.838 17.977 64 56.539 64 101.216 0 20.637-5.592 39.962-15.328 56.563 9.914 27.284 15.328 56.728 15.328 87.437z" /> +<glyph unicode="" d="M490.594 399.946c-71.816 10.325-151.166 16.054-234.593 16.054-83.43 0-162.778-5.729-234.597-16.054-13.765-53.863-21.404-113.375-21.404-175.946 0-62.57 7.639-122.083 21.404-175.945 71.819-10.326 151.168-16.055 234.597-16.055 83.427 0 162.776 5.729 234.593 16.055 13.766 53.862 21.406 113.375 21.406 175.945 0 62.571-7.64 122.083-21.406 175.946zM192.001 128v192l160-96-160-96z" /> +<glyph unicode="" d="M0 416v-384h512v384h-512zM96 64h-64v64h64v-64zM96 192h-64v64h64v-64zM96 320h-64v64h64v-64zM384 64h-256v320h256v-320zM480 64h-64v64h64v-64zM480 192h-64v64h64v-64zM480 320h-64v64h64v-64zM192 320v-192l128 96z" /> +<glyph unicode="" d="M192 336c0 44.183 35.817 80 80 80s80-35.817 80-80c0-44.183-35.817-80-80-80-44.183 0-80 35.817-80 80zM0 336c0 44.183 35.817 80 80 80s80-35.817 80-80c0-44.183-35.817-80-80-80-44.183 0-80 35.817-80 80zM384 176v48c0 17.6-14.4 32-32 32h-320c-17.6 0-32-14.4-32-32v-160c0-17.6 14.4-32 32-32h320c17.6 0 32 14.4 32 32v48l128-80v224l-128-80zM320 96h-256v96h256v-96z" /> +<glyph unicode="" d="M432 384h-256c-44 0-80-36-80-80v-256c0-44 36-80 80-80h256c44 0 80 36 80 80v256c0 44-36 80-80 80zM208 32c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zM208 224c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zM304 128c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zM400 32c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zM400 224c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zM414.38 416c-7.465 36.402-39.855 64-78.38 64h-256c-44 0-80-36-80-80v-256c0-38.523 27.598-70.915 64-78.38v318.38c0 17.6 14.4 32 32 32h318.38z" /> +<glyph unicode="" d="M482.365 390.598c-46.951 54.725-116.605 89.402-194.365 89.402-141.385 0-256-114.615-256-256s114.615-256 256-256c77.76 0 147.414 34.678 194.364 89.402l-162.364 166.598 162.365 166.598zM352 419.699c19.716 0 35.699-15.982 35.699-35.699 0-19.716-15.983-35.699-35.699-35.699s-35.699 15.983-35.699 35.699c0 19.716 15.983 35.699 35.699 35.699z" /> +<glyph unicode="" d="M408.785 305.925c-96.783 71.929-130.133 129.509-152.783 174.074v0c-0.002 0-0.002 0.001-0.002 0.001v-0.001c-22.648-44.565-56-102.146-152.783-174.074-165.018-122.643-9.688-293.834 126.879-199.612-8.898-58.465-39.265-101.086-70.104-119.441v-18.872h192.016v18.87c-30.841 18.354-61.205 60.977-70.106 119.442 136.568-94.223 291.9 76.97 126.883 199.613z" /> +<glyph unicode="" d="M393.416 283.614c-29.516 0-56.043-12.298-74.926-32.347-7.998-8.492-21.881-18.556-36.9-27.405 7.055 26.934 29.338 60.85 44.814 75.728 19.82 19.085 31.992 45.915 31.992 75.75 0.003 57.447-45.738 104.048-102.394 104.66-56.66-0.611-102.398-47.213-102.398-104.659 0-29.836 12.172-56.665 31.993-75.75 15.477-14.878 37.76-48.794 44.814-75.728-15.021 8.85-28.903 18.913-36.9 27.405-18.884 20.049-45.41 32.347-74.925 32.347-57.193 0-103.54-46.832-103.54-104.664 0-57.819 46.346-104.669 103.54-104.669 29.521 0 56.041 12.678 74.925 32.726 8.402 8.936 23.222 20.069 39.146 29.316-1.501-73.846-36.766-128.084-72.659-149.453v-18.871h192.007v18.87c-35.896 21.368-71.16 75.608-72.66 149.453 15.926-9.247 30.744-20.384 39.146-29.316 18.883-20.047 45.404-32.726 74.926-32.726 57.193 0 103.539 46.85 103.539 104.669-0.001 57.832-46.346 104.664-103.54 104.664z" /> +<glyph unicode="" d="M256 480l-160-256 160-256 160 256z" /> +<glyph unicode="" d="M368.010 162.020c10.183 18.365 15.99 39.493 15.99 61.98 0 51.657-30.604 96.162-74.667 116.386 16.362 14.649 26.667 35.925 26.667 59.614 0 44.183-35.817 80-80 80-44.183 0-80-35.817-80-80 0-23.69 10.305-44.965 26.667-59.614-44.063-20.224-74.667-64.729-74.667-116.386 0-22.487 5.806-43.615 15.99-61.98-66.946-38.733-111.99-111.114-111.99-194.020h448c0 82.906-45.044 155.287-111.99 194.020z" /> +<glyph unicode="" d="M512 265.372c0 100.463-29.396 181.969-65.741 182.613 0.146 0.003 0.289 0.015 0.436 0.015h-41.471c0 0-97.4-73.168-237.615-101.877-4.28-22.646-7.015-49.637-7.015-80.751 0-31.114 2.733-58.104 7.015-80.75 140.214-28.709 237.615-101.878 237.615-101.878h41.471c-0.146 0-0.289 0.012-0.436 0.016 36.348 0.644 65.741 82.149 65.741 182.612zM432.412 110.374c-4.691 0-9.766 4.871-12.373 7.774-6.315 7.032-12.396 17.98-17.594 31.664-11.628 30.616-18.033 71.655-18.033 115.562 0 43.905 6.405 84.945 18.033 115.561 5.197 13.684 11.281 24.633 17.594 31.664 2.607 2.906 7.682 7.776 12.373 7.776 4.69 0 9.768-4.872 12.372-7.776 6.317-7.032 12.398-17.979 17.594-31.664 11.629-30.615 18.034-71.656 18.034-115.561 0-43.902-6.405-84.944-18.034-115.562-5.195-13.684-11.281-24.632-17.594-31.664-2.604-2.903-7.68-7.774-12.372-7.774zM125.906 265.372c0 25.975 1.905 51.215 5.526 74.547-23.686-3.277-44.471-5.162-70.17-5.162-33.529 0-33.529 0-33.529 0l-27.733-47.343v-44.085l27.73-47.343c0 0 0 0 33.53 0 25.699 0 46.484-1.887 70.17-5.162-3.618 23.332-5.524 48.573-5.524 74.548zM184.075 158.914l-63.999 12.255 40.921-160.772c2.118-8.317 10.372-12.519 18.343-9.327l59.278 23.726c7.972 3.188 11.164 11.982 7.098 19.542l-61.641 114.576zM432.412 205.635c-1.809 0-3.764 1.877-4.769 2.996-2.435 2.71-4.778 6.93-6.781 12.204-4.481 11.8-6.95 27.617-6.95 44.539 0 16.922 2.469 32.739 6.95 44.539 2.003 5.274 4.348 9.494 6.781 12.204 1.005 1.12 2.96 2.997 4.769 2.997 1.808 0 3.765-1.878 4.769-2.997 2.435-2.71 4.778-6.929 6.78-12.204 4.482-11.799 6.951-27.617 6.951-44.539 0-16.921-2.469-32.739-6.951-44.539-2.002-5.274-4.348-9.494-6.78-12.204-1.004-1.119-2.96-2.996-4.769-2.996z" /> +<glyph unicode="" d="M320 192c52.935 0 100.935-21.533 135.701-56.299l-45.234-45.234c-23.177 23.178-55.178 37.533-90.467 37.533s-67.289-14.355-90.467-37.533l-45.234 45.234c34.766 34.766 82.766 56.299 135.701 56.299zM93.726 226.274c60.44 60.44 140.799 93.726 226.274 93.726s165.834-33.286 226.275-93.726l-45.255-45.254c-48.353 48.352-112.64 74.98-181.020 74.98-68.381 0-132.667-26.628-181.019-74.981l-45.255 45.255zM494.392 412.781c53.351-22.566 101.258-54.864 142.391-95.998v0l-45.254-45.254c-72.528 72.528-168.96 112.471-271.529 112.471-102.57 0-199-39.943-271.529-112.471l-45.255 45.255c41.134 41.133 89.041 73.431 142.392 95.997 55.252 23.369 113.926 35.219 174.392 35.219 60.466 0 119.139-11.85 174.392-35.219zM288 32c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32z" horiz-adv-x="640" /> +<glyph unicode="" d="M512 224c0 141.385-114.615 256-256 256s-256-114.615-256-256c0-110.027 69.418-203.832 166.843-240.034l-6.843-15.966h192l-6.843 15.966c97.425 36.202 166.843 130.007 166.843 240.034zM243.395 162.587c-11.404 4.894-19.395 16.218-19.395 29.413 0 17.673 14.327 32 32 32 17.673 0 32-14.327 32-32 0-13.195-7.989-24.522-19.393-29.417l-12.607 29.417-12.605-29.413zM269.134 161.354c29.046 6.059 50.866 31.801 50.866 62.646 0 35.347-28.653 64-64 64-35.346 0-64-28.653-64-64 0-30.846 21.831-56.561 50.88-62.614l-37.312-87.061c-45.615 19.575-77.568 64.892-77.568 117.675 0 70.692 57.308 134 128 134s128-63.308 128-134c0-52.783-31.953-98.1-77.568-117.675l-37.298 87.029zM344.224-13.854l-36.962 86.243c63.223 21.369 108.738 81.173 108.738 151.611 0 88.365-71.634 160-160 160-88.365 0-160-71.635-160-160 0-70.438 45.515-130.242 108.738-151.611l-36.962-86.243c-79.797 34.244-135.693 113.517-135.693 205.854 0 123.666 100.251 229.917 223.917 229.917 123.666 0 223.917-106.251 223.917-229.917 0-92.337-55.896-171.61-135.693-205.854z" /> +<glyph unicode="" d="M192 224c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM332.174 364.737c49.926-27.079 83.826-79.949 83.826-140.737s-33.9-113.658-83.826-140.737c22.033 35.063 35.826 85.135 35.826 140.737 0 55.602-13.793 105.674-35.826 140.737zM144 224c0-55.602 13.792-105.674 35.826-140.737-49.926 27.080-83.826 79.949-83.826 140.737 0 60.788 33.9 113.657 83.826 140.737-22.034-35.063-35.826-85.135-35.826-140.737zM48 224c0-85.95 27.202-163.092 70.326-215.861-71.151 45.474-118.326 125.157-118.326 215.861 0 90.704 47.175 170.387 118.326 215.861-43.124-52.769-70.326-129.911-70.326-215.861zM393.676 439.86c71.149-45.473 118.324-125.156 118.324-215.86s-47.175-170.387-118.324-215.86c43.122 52.768 70.324 129.91 70.324 215.86 0 85.95-27.202 163.092-70.324 215.86z" /> +<glyph unicode="" d="M448 416v-416h-336c-26.511 0-48 21.49-48 48 0 26.509 21.489 48 48 48h304v384h-320c-35.199 0-64-28.8-64-64v-384c0-35.2 28.801-64 64-64h384v448h-32zM128 64h288v-32h-288z" /> +<glyph unicode="" d="M432 480h-384c-26.4 0-48-21.6-48-48v-416c0-26.4 21.6-48 48-48h384c26.4 0 48 21.6 48 48v416c0 26.4-21.6 48-48 48zM416 32h-352v384h352v-384zM128 256h224v-32h-224zM128 192h224v-32h-224zM128 128h224v-32h-224zM128 320h224v-32h-224z" /> +<glyph unicode="" d="M432 480h-384c-26.4 0-48-21.6-48-48v-416c0-26.4 21.6-48 48-48h384c26.4 0 48 21.6 48 48v416c0 26.4-21.6 48-48 48zM416 32h-352v384h352v-384zM128 192h224v-32h-224zM128 128h224v-32h-224zM160 336c0 26.51 21.49 48 48 48s48-21.49 48-48c0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48zM240 288h-64c-26.4 0-48-14.4-48-32v-32h160v32c0 17.6-21.6 32-48 32z" /> +<glyph unicode="" d="M446.059 385.941l-60.117 60.118c-18.669 18.668-55.542 33.941-81.942 33.941h-224c-26.4 0-48-21.6-48-48v-416c0-26.4 21.6-48 48-48h352c26.4 0 48 21.6 48 48v288c0 26.4-15.273 63.273-33.941 81.941zM320 412.219c1.098-0.402 2.226-0.84 3.379-1.318 9.030-3.741 15.299-8.088 17.308-10.097l60.118-60.119c2.009-2.009 6.356-8.277 10.097-17.307 0.478-1.153 0.916-2.281 1.318-3.378h-92.22v92.219zM416 32h-320v384h192v-128h128v-256z" /> +<glyph unicode="" d="M446.059 385.941l-60.117 60.118c-18.669 18.668-55.542 33.941-81.942 33.941h-224c-26.4 0-48-21.6-48-48v-416c0-26.4 21.6-48 48-48h352c26.4 0 48 21.6 48 48v288c0 26.4-15.273 63.273-33.941 81.941zM320 412.219c1.098-0.402 2.226-0.84 3.379-1.318 9.030-3.741 15.299-8.088 17.308-10.097l60.118-60.119c2.009-2.009 6.356-8.277 10.097-17.307 0.478-1.153 0.916-2.281 1.318-3.378h-92.22v92.219zM416 32h-320v384h192v-128h128v-256zM128 224h256v-32h-256zM128 160h256v-32h-256zM128 96h256v-32h-256z" /> +<glyph unicode="" d="M451.716 380.285l-71.432 71.431c-15.556 15.556-46.284 28.284-68.284 28.284h-240c-22 0-40-18-40-40v-432c0-22 18-40 40-40h368c22 0 40 18 40 40v304c0 22-12.728 52.729-28.284 68.285zM429.089 357.657c1.565-1.565 3.125-3.487 4.64-5.657h-81.729v81.728c2.17-1.515 4.092-3.075 5.657-4.64l71.432-71.431zM448 8c0-4.336-3.664-8-8-8h-368c-4.336 0-8 3.664-8 8v432c0 4.336 3.664 8 8 8h240c2.416 0 5.127-0.305 8-0.852v-127.148h127.148c0.547-2.873 0.852-5.583 0.852-8v-304z" /> +<glyph unicode="" d="M416 352h-96v32l-96 96h-224v-384h192v-128h320v288l-96 96zM416 306.745l50.745-50.745h-50.745v50.745zM224 434.745l50.745-50.745h-50.745v50.745zM32 448h160v-96h96v-224h-256v320zM480 0h-256v96h96v224h64v-96h96v-224z" /> +<glyph unicode="" d="M432 416h-32v-32h16v-256h-128v-128h-192v384h16v32h-32c-8.801 0-16-7.2-16-16v-416c0-8.8 7.199-16 16-16h252l116 116v316c0 8.8-7.2 16-16 16zM320 0v96h96l-96-96zM384 416h-64v32c0 17.6-14.4 32-32 32h-64c-17.602 0-32-14.4-32-32v-32h-64v-64h256v64zM288 416h-64v31.943c0.017 0.019 0.036 0.039 0.057 0.057h63.884c0.021-0.018 0.041-0.038 0.059-0.057v-31.943z" /> +<glyph unicode="" d="M320 352v128h-224l-96-96v-288h192v-128h320v384h-192zM96 434.745v-50.745h-50.745l50.745 50.745zM32 128v224h96v96h160v-96l-96-96v-128h-160zM288 306.745v-50.745h-50.745l50.745 50.745zM480 0h-256v224h96v96h160v-320z" /> +<glyph unicode="" d="M352 416h-64v32c0 17.6-14.4 32-32 32h-64c-17.602 0-32-14.4-32-32v-32h-64v-64h256v64zM256 416h-64v31.943c0.017 0.019 0.036 0.039 0.057 0.057h63.884c0.021-0.018 0.041-0.038 0.059-0.057v-31.943zM416 320v80c0 8.8-7.2 16-16 16h-32v-32h16v-64h-192v-224h-128v288h16v32h-32c-8.801 0-16-7.2-16-16v-320c0-8.8 7.199-16 16-16h144v-96h224l96 96v256h-96zM416 13.255v50.745h50.745l-50.745-50.745zM480 96h-96v-96h-160v288h256v-192z" /> +<glyph unicode="" d="M416 320v80c0 8.8-7.2 16-16 16h-112v32c0 17.6-14.4 32-32 32h-64c-17.602 0-32-14.4-32-32v-32h-112c-8.801 0-16-7.2-16-16v-320c0-8.8 7.199-16 16-16h144v-96h224l96 96v256h-96zM192 447.943c0.017 0.019 0.036 0.039 0.057 0.057h63.884c0.021-0.018 0.041-0.038 0.059-0.057v-31.943h-64v31.943zM96 352v32h256v-32h-256zM416 13.255v50.745h50.745l-50.745-50.745zM480 96h-96v-96h-160v288h256v-192z" /> +<glyph unicode="" d="M352 416h-64v32c0 17.6-14.4 32-32 32h-64c-17.602 0-32-14.4-32-32v-32h-64v-64h256v64zM256 416h-64v31.943c0.017 0.019 0.036 0.039 0.057 0.057h63.884c0.021-0.018 0.041-0.038 0.059-0.057v-31.943zM416 320v80c0 8.8-7.2 16-16 16h-32v-32h16v-64h-96l-96-96v-128h-128v288h16v32h-32c-8.801 0-16-7.2-16-16v-320c0-8.8 7.199-16 16-16h144v-96h320v352h-96zM288 274.745v-50.745h-50.745l50.745 50.745zM480 0h-256v192h96v96h160v-288z" /> +<glyph unicode="" d="M512 320l-256 128-256-128 256-128 256 128zM256 405.515l171.029-85.515-171.029-85.515-171.029 85.515 171.029 85.515zM460.722 249.639l51.278-25.639-256-128-256 128 51.278 25.639 204.722-102.361zM460.722 153.639l51.278-25.639-256-128-256 128 51.278 25.639 204.722-102.361z" /> +<glyph unicode="" d="M0 320h512l-32-320h-448l-32 320zM464 384l16-32h-448l32 64h176l16-32h208z" /> +<glyph unicode="" d="M416 0l96 256h-416l-96-256zM64 288l-64-288v416h144l64-64h208v-64z" /> +<glyph unicode="" d="M463.906 480h-144.281c-26.453 0-63.398-15.303-82.102-34.007l-223.495-223.495c-18.704-18.704-18.704-49.312 0-68.016l172.455-172.453c18.704-18.705 49.311-18.705 68.015 0l223.495 223.494c18.704 18.705 34.007 55.651 34.007 82.102v144.281c0 26.452-21.643 48.094-48.094 48.094zM400 320c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48z" /> +<glyph unicode="" d="M496 448h-112c-26.4 0-63.273-15.273-81.941-33.941l-188.118-188.118c-18.667-18.667-18.667-49.214 0-67.882l140.118-140.117c18.667-18.668 49.214-18.668 67.882 0l188.117 188.117c18.669 18.668 33.942 55.541 33.942 81.941v112c0 26.4-21.6 48-48 48zM432 288c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zM43.313 180.687l171.189-171.189c-18.132-9.58-41.231-6.769-56.443 8.444l-140.118 140.117c-18.667 18.668-18.667 49.215 0 67.882l188.118 188.118c18.668 18.668 55.541 33.941 81.941 33.941l-244.687-244.686c-6.222-6.223-6.222-16.404 0-22.627z" horiz-adv-x="544" /> +<glyph unicode="" d="M0 416h64v-320h-64zM96 416h32v-320h-32zM160 416h32v-320h-32zM256 416h32v-320h-32zM384 416h32v-320h-32zM480 416h32v-320h-32zM320 416h16v-320h-16zM224 416h16v-320h-16zM432 416h16v-320h-16zM0 64h32v-32h-32zM96 64h32v-32h-32zM160 64h32v-32h-32zM320 64h32v-32h-32zM480 64h32v-32h-32zM384 64h64v-32h-64zM224 64h64v-32h-64z" /> +<glyph unicode="" d="M160 448h-128v-128h128v128zM192 480v0-192h-192v192h192zM64 416h64v-64h-64zM480 448h-128v-128h128v128zM512 480v0-192h-192v192h192zM384 416h64v-64h-64zM160 128h-128v-128h128v128zM192 160v0-192h-192v192h192zM64 96h64v-64h-64zM224 480h32v-32h-32zM256 448h32v-32h-32zM224 416h32v-32h-32zM256 384h32v-32h-32zM224 352h32v-32h-32zM256 320h32v-32h-32zM224 288h32v-32h-32zM224 224h32v-32h-32zM256 192h32v-32h-32zM224 160h32v-32h-32zM256 128h32v-32h-32zM224 96h32v-32h-32zM256 64h32v-32h-32zM224 32h32v-32h-32zM256 0h32v-32h-32zM480 224h32v-32h-32zM32 224h32v-32h-32zM64 256h32v-32h-32zM0 256h32v-32h-32zM128 256h32v-32h-32zM160 224h32v-32h-32zM192 256h32v-32h-32zM288 224h32v-32h-32zM320 256h32v-32h-32zM352 224h32v-32h-32zM384 256h32v-32h-32zM416 224h32v-32h-32zM448 256h32v-32h-32zM480 160h32v-32h-32zM288 160h32v-32h-32zM320 192h32v-32h-32zM352 160h32v-32h-32zM416 160h32v-32h-32zM448 192h32v-32h-32zM480 96h32v-32h-32zM288 96h32v-32h-32zM320 128h32v-32h-32zM384 128h32v-32h-32zM416 96h32v-32h-32zM448 128h32v-32h-32zM480 32h32v-32h-32zM320 64h32v-32h-32zM352 32h32v-32h-32zM384 64h32v-32h-32zM416 32h32v-32h-32zM320 0h32v-32h-32zM384 0h32v-32h-32zM448 0h32v-32h-32z" /> +<glyph unicode="" d="M287.998 320l63.999-63.999-127.997-127.997-63.999 63.999zM500.763 331.248l-36.758 36.758-16.004-16.004c-8.189-8.19-19.505-13.255-32-13.255-24.994 0-45.257 20.261-45.257 45.255 0 12.501 5.070 23.819 13.267 32.009l15.994 15.993-36.759 36.758c-14.984 14.984-39.504 14.984-54.488 0l-297.52-297.519c-14.983-14.984-14.983-39.505 0-54.488l36.76-36.759 15.981 15.982c8.191 8.203 19.515 13.276 32.022 13.276 24.994 0 45.255-20.262 45.255-45.255 0-12.503-5.070-23.82-13.267-32.011l-15.992-15.993 36.758-36.759c14.983-14.983 39.504-14.983 54.488 0l297.52 297.52c14.982 14.988 14.982 39.508 0 54.492zM224.001 64.002l-128 128 192 192 128-128-192-192z" /> +<glyph unicode="" d="M64 16c0 26.51 21.49 48 48 48s48-21.49 48-48c0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48zM384 16c0 26.51 21.49 48 48 48s48-21.49 48-48c0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48zM480 224v192h-416c0 35.346-28.653 64-64 64v-32c17.645 0 32-14.355 32-32l24.037-206.027c-14.647-11.729-24.037-29.75-24.037-49.973 0-35.347 28.654-64 64-64h384v32h-384c-17.673 0-32 14.327-32 32 0 0.11 0.007 0.218 0.008 0.328l415.992 63.672z" /> +<glyph unicode="" d="M423.609 192c17.6 0 35.956 13.846 40.791 30.769l46.418 162.463c4.835 16.922-5.609 30.768-23.209 30.768h-327.609c0 35.346-28.654 64-64 64h-96v-64h96v-272c0-26.51 21.49-48 48-48h304c17.673 0 32 14.327 32 32s-14.327 32-32 32h-288v32h263.609zM160 352h289.403l-27.429-96h-261.974v96zM192 8c0-22-18-40-40-40h-16c-22 0-40 18-40 40v16c0 22 18 40 40 40h16c22 0 40-18 40-40v-16zM480 8c0-22-18-40-40-40h-16c-22 0-40 18-40 40v16c0 22 18 40 40 40h16c22 0 40-18 40-40v-16z" /> +<glyph unicode="" d="M488.791 382.769c-16.992 4.854-34.705-4.985-39.56-21.978l-2.511-8.791h-298.471l-4.496 35.969c-2.002 16.014-15.615 28.031-31.753 28.031h-80c-17.673 0-32-14.327-32-32s14.327-32 32-32h51.751l28.496-227.969c2.002-16.013 15.615-28.031 31.753-28.031h272c14.287 0 26.844 9.472 30.769 23.209l64 224c4.855 16.993-4.985 34.705-21.978 39.56zM256 224v32h63.998v-32h-63.998zM319.998 192v-32h-63.998v32h63.998zM256 288v32h63.998v-32h-63.998zM152.249 320h71.751v-32h-67.751l-4 32zM160.249 256h63.751v-32h-59.751l-4 32zM168.249 192h55.751v-32h-51.751l-4 32zM391.862 160h-39.864v32h49.007l-9.143-32zM410.148 224h-58.15v32h67.293l-9.143-32zM428.434 288h-76.436v32h85.579l-9.143-32zM128 16c0 26.51 21.49 48 48 48s48-21.49 48-48c0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48zM320 16c0 26.51 21.49 48 48 48s48-21.49 48-48c0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48z" /> +<glyph unicode="" d="M240 448c-132.548 0-240-107.452-240-240 0-132.549 107.452-240 240-240 132.549 0 240 107.451 240 240 0 132.548-107.451 240-240 240zM240 16c-106.039 0-192 85.961-192 192s85.961 192 192 192c106.039 0 192-85.961 192-192 0-106.039-85.961-192-192-192zM256 224v64h64v32h-64v32h-32v-32h-64v-128h64v-64h-64v-32h64v-32h32v32h64.001l-0.001 128h-64zM224 224h-32v64h32v-64zM288.001 128h-32.001v64h32.001v-64z" /> +<glyph unicode="" d="M464 416h-416c-26.4 0-48-21.6-48-48v-288c0-26.4 21.6-48 48-48h416c26.4 0 48 21.6 48 48v288c0 26.4-21.6 48-48 48zM48 384h416c8.673 0 16-7.327 16-16v-48h-448v48c0 8.673 7.327 16 16 16zM464 64h-416c-8.673 0-16 7.327-16 16v144h448v-144c0-8.673-7.327-16-16-16zM64 160h32v-64h-32zM128 160h32v-64h-32zM192 160h32v-64h-32z" /> +<glyph unicode="" d="M192 448h-160c-17.6 0-32-14.4-32-32v-160c0-17.6 14.398-32 32-32h160c17.6 0 32 14.4 32 32v160c0 17.6-14.4 32-32 32zM192 320h-160v32h160v-32zM448 448h-160c-17.602 0-32-14.4-32-32v-416c0-17.6 14.398-32 32-32h160c17.6 0 32 14.4 32 32v416c0 17.6-14.4 32-32 32zM448 160h-160v32h160v-32zM448 256h-160v32h160v-32zM192 192h-160c-17.6 0-32-14.4-32-32v-160c0-17.6 14.398-32 32-32h160c17.6 0 32 14.4 32 32v160c0 17.6-14.4 32-32 32zM192 64h-64v-64h-32v64h-64v32h64v64h32v-64h64v-32z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM160 224c0 53.020 42.98 96 96 96s96-42.98 96-96-42.98-96-96-96-96 42.98-96 96zM462.99 138.262v0l-88.71 36.745c6.259 15.092 9.72 31.638 9.72 48.993s-3.461 33.901-9.72 48.993l88.71 36.745c10.954-26.411 17.010-55.365 17.010-85.738s-6.057-59.327-17.010-85.738v0zM341.739 430.99v0 0l-36.745-88.71c-15.092 6.259-31.638 9.72-48.994 9.72s-33.901-3.461-48.993-9.72l-36.745 88.711c26.411 10.952 55.366 17.009 85.738 17.009 30.373 0 59.327-6.057 85.739-17.010zM49.010 309.738l88.711-36.745c-6.259-15.092-9.721-31.638-9.721-48.993s3.461-33.901 9.72-48.993l-88.71-36.745c-10.953 26.411-17.010 55.365-17.010 85.738s6.057 59.327 17.010 85.738zM170.262 17.010l36.745 88.71c15.092-6.259 31.638-9.72 48.993-9.72s33.901 3.461 48.993 9.72l36.745-88.71c-26.411-10.952-55.365-17.010-85.738-17.010-30.372 0-59.327 6.057-85.738 17.010z" /> +<glyph unicode="" d="M352 160c-32-32-32-64-64-64s-64 32-96 64-64 64-64 96 32 32 64 64-64 128-96 128-96-96-96-96c0-64 65.75-193.75 128-256s192-128 256-128c0 0 96 64 96 96s-96 128-128 96z" /> +<glyph unicode="" d="M508.689 192.003c4.002-27.741 6.608-65.696-5.832-80.223-20.571-24.022-150.856-24.022-150.856 24.021 0 24.199 21.428 40.067 0.856 64.089-20.236 23.631-56.513 24.015-96.857 24.021-40.343-0.006-76.621-0.39-96.857-24.021-20.571-24.023 0.857-39.89 0.857-64.089 0-48.043-130.285-48.043-150.857-24.022-12.439 14.527-9.834 52.482-5.831 80.223 3.080 18.519 10.862 38.498 35.774 63.997 0 0.001 0.001 0.001 0.001 0.002 37.369 34.871 93.923 63.369 214.913 63.984v0.015c0.672 0 1.332-0.005 2-0.007 0.669 0.002 1.328 0.007 2 0.007v-0.014c120.99-0.615 177.544-29.113 214.913-63.984 0.001-0.001 0.001-0.002 0.001-0.002 24.912-25.498 32.695-45.477 35.775-63.997z" /> +<glyph unicode="" d="M480 352c17.673 0 32 14.327 32 32v64h-64v32h-416c-17.6 0-32-14.399-32-32v-448c0-17.6 14.398-32 32-32h416v128h32c17.673 0 32 14.327 32 32v64h-64v32h32c17.673 0 32 14.327 32 32v64h-64v32h32zM288 351.835c35.255 0 63.835-28.58 63.835-63.835s-28.58-63.835-63.835-63.835c-35.255 0-63.835 28.58-63.835 63.835s28.58 63.835 63.835 63.835zM128 0h-32v448h32v-448zM384 96h-192v32c0 35.347 28.654 64 64 64v0h64c35.348 0 64-28.653 64-64v-32z" /> +<glyph unicode="" d="M449.18 448h-385.18v-64h-46.82c-8.8 0-17.18-6.264-17.18-15.064v-32c0-8.8 8.38-16.936 17.18-16.936h46.82v-32h-46.82c-8.8 0-17.18-6.264-17.18-15.064v-32c0-8.8 8.38-16.936 17.18-16.936h46.82v-32h-46.82c-8.8 0-17.18-6.264-17.18-15.064v-32c0-8.799 8.38-16.936 17.18-16.936h46.82v-32h-46.82c-8.8 0-17.18-6.264-17.18-15.064v-32c0-8.8 8.38-16.936 17.18-16.936h46.82v-64h385.18c17.674 0 30.82 15.263 30.82 32.936v416c0 17.673-13.146 31.064-30.82 31.064zM160 0h-64v32h17.18c8.8 0 14.82 8.136 14.82 16.936v32c0 8.801-6.021 15.064-14.82 15.064h-17.18v32h17.18c8.8 0 14.82 8.136 14.82 16.936v32c0 8.801-6.021 15.064-14.82 15.064h-17.18v32h17.18c8.8 0 14.82 8.136 14.82 16.936v32c0 8.801-6.021 15.064-14.82 15.064h-17.18v32h17.18c8.8 0 14.82 8.136 14.82 16.936v32c0 8.801-6.020 15.064-14.82 15.064h-17.18v32h64v-416z" /> +<glyph unicode="" d="M464 416h-416c-26.4 0-48-21.6-48-48v-320c0-26.4 21.6-48 48-48h416c26.4 0 48 21.6 48 48v320c0 26.4-21.6 48-48 48zM199.37 204.814l-135.37-105.446v250.821l135.37-145.375zM88.19 352h335.62l-167.81-126-167.81 126zM204.644 199.151l51.356-55.151 51.355 55.151 105.277-135.151h-313.264l105.276 135.151zM312.63 204.814l135.37 145.375v-250.821l-135.37 105.446z" /> +<glyph unicode="" d="M272 480l-48-48 48-48-112-128h-112l88-88-136-180.308v-19.692h19.692l180.308 136 88-88v112l128 112 48-48 48 48-240 240zM224 208l-32 32 112 112 32-32-112-112z" /> +<glyph unicode="" d="M256 480c-88.366 0-160-71.634-160-160 0-160 160-352 160-352s160 192 160 352c0 88.366-71.635 160-160 160zM256 224c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96z" /> +<glyph unicode="" d="M256 480c-88.366 0-160-71.634-160-160 0-160 160-352 160-352s160 192 160 352c0 88.366-71.635 160-160 160zM256 222c-54.124 0-98 43.876-98 98s43.876 98 98 98 98-43.876 98-98-43.876-98-98-98zM194 320c0 34.241 27.758 62 62 62s62-27.759 62-62c0-34.241-27.759-62-62-62-34.242 0-62 27.759-62 62z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 16c-114.875 0-208 93.125-208 208s93.125 208 208 208 208-93.125 208-208-93.125-208-208-208zM304 272l-144 80h-32v-32l80-144 144-80h32v32l-80 144zM256 192c-17.673 0-32 14.327-32 32s14.327 32 32 32c17.673 0 32-14.327 32-32 0-17.673-14.327-32-32-32z" /> +<glyph unicode="" d="M336 384l-160 64-176-64v-384l176 64 160-64 176 64v384l-176-64zM192 407.135l128-51.2v-315.069l-128 51.199v315.070zM32 361.586l128 46.545v-315.9l-128-46.544v315.899zM480 86.414l-128-46.546v315.9l128 46.545v-315.899z" /> +<glyph unicode="" d="M288 448c123.712 0 224-100.288 224-224s-100.288-224-224-224v48c47.012 0 91.209 18.307 124.451 51.549 33.242 33.242 51.549 77.439 51.549 124.451 0 47.011-18.307 91.209-51.549 124.451-33.242 33.242-77.439 51.549-124.451 51.549-47.011 0-91.209-18.307-124.451-51.549-25.57-25.569-42.291-57.623-48.653-92.451h93.104l-112-128-112 128h82.285c15.53 108.551 108.869 192 221.715 192zM384 256v-64h-128v160h64v-96z" /> +<glyph unicode="" d="M329.372 105.372l-105.372 105.373v141.255h64v-114.745l86.628-86.627zM256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 32c-106.039 0-192 85.961-192 192s85.961 192 192 192c106.039 0 192-85.961 192-192 0-106.039-85.961-192-192-192z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM329.372 105.372l-105.372 105.373v141.255h64v-114.745l86.628-86.627-45.256-45.256z" /> +<glyph unicode="" d="M288 205.255l54.627-54.628-45.254-45.254-73.373 73.372v109.255h64zM416 448c53.020 0 96-42.98 96-96 0-32.492-16.145-61.209-40.846-78.579-23.295 61.522-72.211 110.438-133.733 133.733 17.37 24.701 46.088 40.846 78.579 40.846zM174.579 407.154c-61.522-23.295-110.438-72.211-133.733-133.733-24.701 17.37-40.846 46.087-40.846 78.579 0 53.020 42.98 96 96 96 32.492 0 61.209-16.145 78.579-40.846zM256 384c-106.039 0-192-85.961-192-192 0-46.337 16.416-88.839 43.747-122.010l-11.747-101.99h32l31.996 57.694c28.242-16.339 61.029-25.694 96.004-25.694 34.974 0 67.76 9.355 96.002 25.693l-0.002-0.002 32-57.691h32l-11.751 101.984c27.334 33.173 43.751 75.676 43.751 122.016 0 106.039-85.961 192-192 192zM256 64c-70.692 0-128 57.308-128 128s57.308 128 128 128 128-57.308 128-128-57.308-128-128-128z" /> +<glyph unicode="" d="M256 416c-123.712 0-224-100.288-224-224s100.288-224 224-224 224 100.288 224 224-100.288 224-224 224zM256 12c-99.412 0-180 80.589-180 180 0 99.412 80.588 180 180 180 99.411 0 180-80.588 180-180 0-99.411-80.589-180-180-180zM467.392 336.413c8.021 14.026 12.608 30.271 12.608 47.587 0 53.020-42.98 96-96 96-30.909 0-58.401-14.611-75.96-37.298 65.942-13.618 122.603-52.599 159.352-106.289zM203.96 442.702c-17.558 22.687-45.051 37.298-75.96 37.298-53.020 0-96-42.98-96-96 0-17.316 4.587-33.561 12.608-47.587 36.75 53.69 93.411 92.671 159.352 106.289zM224 320h32v-160h-32v160zM256 192h96v-32h-96v32z" /> +<glyph unicode="" d="M512.75 80c0 144-128 112-128 224 0 9.28-0.894 17.21-2.524 23.964-8.415 56.509-46.078 101.86-94.886 115.68 0.433 1.974 0.66 4.016 0.66 6.105 0 16.639-14.4 30.251-32 30.251-17.6 0-32-13.612-32-30.25 0-2.090 0.228-4.132 0.66-6.105-54.735-15.499-95.457-70.649-96.627-136.721-0.020-0.96-0.033-1.932-0.033-2.923 0-112.001-128-80.001-128-224.001 0-38.113 85.295-69.998 199.485-78.040 10.762-20.202 32.028-33.96 56.515-33.96s45.754 13.758 56.515 33.96c114.19 8.042 199.485 39.927 199.485 78.040 0 0.114-0.013 0.228-0.014 0.341l0.764-0.341zM413.123 52.952c-27.115-7.235-59.079-12.438-93.384-15.324-2.852 32.709-30.291 58.372-63.739 58.372s-60.887-25.663-63.739-58.372c-34.304 2.886-66.269 8.089-93.384 15.324-37.315 9.957-55.155 21.095-61.684 27.048 6.529 5.953 24.369 17.091 61.684 27.048 43.386 11.576 99.186 17.952 157.123 17.952s113.737-6.376 157.123-17.952c37.315-9.957 55.155-21.095 61.684-27.048-6.529-5.953-24.369-17.091-61.684-27.048z" /> +<glyph unicode="" d="M256.001 383.394v32.606h64v32c0 17.673-14.327 32-32.001 32h-95.999c-17.673 0-32-14.327-32-32v-32h64v-32.606c-107.399-8.169-192-97.901-192-207.394 0-114.875 93.125-208 208-208 114.875 0 208 93.125 208 208 0 109.492-84.601 199.224-192 207.394zM353.138 62.863c-30.221-30.22-70.399-46.863-113.137-46.863s-82.917 16.643-113.137 46.863c-30.22 30.22-46.863 70.4-46.863 113.137s16.643 82.917 46.863 113.137c29.020 29.019 67.224 45.509 108.057 46.774l-10.839-157.010c-0.93-13.145 6.232-18.901 15.918-18.901s16.849 5.756 15.918 18.901l-10.838 157.011c40.833-1.266 79.038-17.756 108.058-46.775 30.22-30.22 46.863-70.4 46.863-113.137s-16.643-82.917-46.863-113.137z" /> +<glyph unicode="" d="M160 288h64v-64h-64zM256 288h64v-64h-64zM352 288h64v-64h-64zM64 96h64v-64h-64zM160 96h64v-64h-64zM256 96h64v-64h-64zM160 192h64v-64h-64zM256 192h64v-64h-64zM352 192h64v-64h-64zM64 192h64v-64h-64zM416 480v-32h-64v32h-224v-32h-64v32h-64v-512h480v512h-64zM448 0h-416v352h416v-352z" /> +<glyph unicode="" d="M448 416h-48v-16c0-17.645-14.355-32-32-32s-32 14.355-32 32v16h-160v-16c0-17.645-14.355-32-32-32s-32 14.355-32 32v16h-48c-17.6 0-32-14.4-32-32v-352c0-17.6 14.4-32 32-32h384c17.6 0 32 14.4 32 32v352c0 17.6-14.4 32-32 32zM448 32.058c-0.017-0.020-0.038-0.041-0.058-0.058h-383.885c-0.020 0.017-0.041 0.038-0.057 0.058v287.942h384v-287.942zM144 384c8.836 0 16 7.164 16 16v64c0 8.836-7.164 16-16 16s-16-7.164-16-16v-64c0-8.836 7.164-16 16-16zM368 384c8.836 0 16 7.164 16 16v64c0 8.836-7.164 16-16 16s-16-7.164-16-16v-64c0-8.836 7.164-16 16-16zM288 288h-160v-32h128v-64h-128v-32h128v-64h-128v-32h160zM352 64h32v224h-64v-32h32zM436-12h-360c-17.6 0-32 10.4-32 28v-16c0-17.6 14.4-32 32-32h360c17.6 0 32 14.4 32 32v16c0-17.6-14.4-28-32-28z" /> +<glyph unicode="" d="M128 448h256v-64h-256zM480 352h-448c-17.6 0-32-14.4-32-32v-160c0-17.6 14.398-32 32-32h96v-128h256v128h96c17.6 0 32 14.4 32 32v160c0 17.6-14.4 32-32 32zM352 32h-192v160h192v-160zM487.2 304c0-12.813-10.387-23.2-23.199-23.2-12.813 0-23.201 10.387-23.201 23.2s10.388 23.2 23.201 23.2c12.813 0 23.199-10.387 23.199-23.2z" /> +<glyph unicode="" d="M544 416h-512c-17.6 0-32-14.4-32-32v-320c0-17.6 14.4-32 32-32h512c17.6 0 32 14.4 32 32v320c0 17.6-14.4 32-32 32zM320 352h64v-64h-64v64zM416 256v-64h-64v64h64zM224 352h64v-64h-64v64zM320 256v-64h-64v64h64zM128 352h64v-64h-64v64zM224 256v-64h-64v64h64zM64 352h32v-64h-32v64zM64 256h64v-64h-64v64zM96 96h-32v64h32v-64zM384 96h-256v64h256v-64zM512 96h-96v64h96v-64zM512 192h-64v64h64v-64zM512 288h-96v64h96v-64z" horiz-adv-x="576" /> +<glyph unicode="" d="M512 64v384h-512v-384h224v-32h-96v-32h256v32h-96v32h224zM64 384h384v-256h-384v256z" /> +<glyph unicode="" d="M448 128v256c0 17.6-14.4 32-32 32h-320c-17.6 0-32-14.4-32-32v-256h-64v-96h512v96h-64zM320 64h-128v32h128v-32zM416 128h-320v255.943c0.017 0.020 0.038 0.041 0.057 0.057h319.885c0.020-0.017 0.041-0.038 0.058-0.058v-255.942z" /> +<glyph unicode="" d="M368 480h-224c-26.4 0-48-21.6-48-48v-416c0-26.4 21.6-48 48-48h224c26.4 0 48 21.6 48 48v416c0 26.4-21.6 48-48 48zM192 456h128v-16h-128v16zM256 0c-17.673 0-32 14.327-32 32s14.327 32 32 32 32-14.327 32-32-14.327-32-32-32zM384 96h-256v320h256v-320z" /> +<glyph unicode="" d="M384 480h-288c-17.6 0-32-14.399-32-32v-448c0-17.6 14.399-32 32-32h288c17.6 0 32 14.4 32 32v448c0 17.601-14.4 32-32 32zM240-8.891c-13.746 0-24.891 11.145-24.891 24.891s11.145 24.891 24.891 24.891 24.891-11.145 24.891-24.891-11.145-24.891-24.891-24.891zM384 64h-288v352h288v-352z" /> +<glyph unicode="" d="M400 480h-320c-26.4 0-48-21.6-48-48v-416c0-26.4 21.6-48 48-48h320c26.4 0 48 21.6 48 48v416c0 26.4-21.6 48-48 48zM240-16c-8.836 0-16 7.163-16 16s7.164 16 16 16 16-7.163 16-16-7.164-16-16-16zM384 32h-288v384h288v-384z" /> +<glyph unicode="" d="M490.594 335.946c-44.404 6.384-91.691 11.008-141.038 13.61l82.444 82.444-32 32-112.279-112.278c-10.503 0.184-21.078 0.278-31.721 0.278v0l-128 128-32-32 97.098-97.098c-60.461-2.121-118.169-7.262-171.693-14.956-13.766-53.863-21.405-113.376-21.405-175.946s7.639-122.083 21.402-175.945c71.821-10.326 151.17-16.055 234.598-16.055 83.428 0 162.775 5.729 234.594 16.055 13.767 53.862 21.406 113.375 21.406 175.945s-7.639 122.083-21.406 175.946zM431.946 42.703c-53.865-6.883-113.375-10.703-175.946-10.703-62.571 0-122.083 3.82-175.946 10.703-10.324 35.908-16.054 75.583-16.054 117.297 0 41.715 5.729 81.39 16.054 117.298 53.863 6.883 113.375 10.702 175.946 10.702 62.568 0 122.081-3.819 175.943-10.702 10.328-35.908 16.057-75.583 16.057-117.298 0-41.714-5.729-81.389-16.054-117.297z" /> +<glyph unicode="" d="M352 480h-192l-96-64v-128h384v128l-96 64zM320 320h-32v21.333c0 5.867-4.8 10.667-10.667 10.667h-42.666c-5.866 0-10.667-4.8-10.667-10.667v-21.333h-32v53.333c0 5.867 4.801 10.667 10.667 10.667h106.665c5.867 0 10.668-4.8 10.668-10.667v-53.333zM64 127.999h384v128.001h-384v-128.001zM192 213.334c0 5.867 4.801 10.666 10.667 10.666h106.665c5.867 0 10.668-4.799 10.668-10.666v-53.334h-32v21.334c0 5.867-4.8 10.666-10.667 10.666h-42.666c-5.866 0-10.667-4.799-10.667-10.666v-21.334h-32v53.334zM64-32h384v127.999h-384v-127.999zM192 53.334c0 5.867 4.801 10.666 10.667 10.666h106.665c5.867 0 10.668-4.799 10.668-10.666v-53.334h-32v21.334c0 5.867-4.8 10.666-10.667 10.666h-42.666c-5.866 0-10.667-4.799-10.667-10.666v-21.334h-32v53.334z" /> +<glyph unicode="" d="M352 384h-192l-160-192v-128c0-17.673 14.327-32 32-32h448c17.674 0 32 14.327 32 32v128l-160 192zM384 192l-64-64h-128l-64 64h-86.345l133.333 160h162.024l133.333-160h-86.345z" /> +<glyph unicode="" d="M352 384h-192l-160-192v-128c0-17.673 14.327-32 32-32h448c17.674 0 32 14.327 32 32v128l-160 192zM320 128h-128l-32 32h192l-32-32zM41.655 192l133.333 160h162.024l133.333-160h-428.69zM142.482 288h227.036l-26.667 32h-173.703zM89.149 224h333.703l-26.667 32h-280.37z" /> +<glyph unicode="" d="M449.248 480l33.622-285.78-37.74-4.44-30.026 255.22h-318.208l-30.026-255.22-37.74 4.44 33.621 285.78zM128 416h256v-32h-256zM128 352h256v-32h-256zM128 288h256v-32h-256zM128 224h256v-32h-256zM496 160h-480c-8.8 0-13.723-6.83-10.94-15.179l53.88-161.642c2.783-8.349 12.26-15.179 21.060-15.179h352c8.8 0 18.276 6.83 21.060 15.179l53.881 161.643c2.783 8.348-2.141 15.178-10.941 15.178zM320 96h-128v32h128v-32z" /> +<glyph unicode="" d="M416 448h-320l-96-96v-336c0-8.837 7.163-16 16-16h480c8.836 0 16 7.163 16 16v336l-96 96zM256 64l-160 128h96v96h128v-96h96l-160-128zM77.255 384l32 32h293.489l32-32h-357.489z" /> +<glyph unicode="" d="M416 448h-320l-96-96v-336c0-8.837 7.163-16 16-16h480c8.836 0 16 7.163 16 16v336l-96 96zM320 160v-96h-128v96h-96l160 128 160-128h-96zM77.255 384l32 32h293.488l32-32h-357.488z" /> +<glyph unicode="" d="M256 192l128 128h-96v128h-64v-128h-96zM372.363 244.364l-35.87-35.871 130.040-48.493-210.533-78.509-210.533 78.509 130.040 48.493-35.871 35.871-139.636-52.364v-128l256-96 256 96v128z" /> +<glyph unicode="" d="M224 192h64v128h96l-128 128-128-128h96zM320 264v-49.356l146.533-54.644-210.533-78.509-210.533 78.509 146.533 54.644v49.356l-192-72v-128l256-96 256 96v128z" /> +<glyph unicode="" d="M448 480h-448v-512h512v448l-64 64zM256 416h64v-128h-64v128zM448 32h-384v384h32v-160h288v160h37.489l26.511-26.509v-357.491z" /> +<glyph unicode="" d="M96 32h320c53.019 0 96 42.98 96 96h-512c0-53.020 42.981-96 96-96zM416 96h32v-32h-32v32zM480 416h-448l-32-256h512z" /> +<glyph unicode="" d="M256 448c-70.692 0-134.688-28.66-181.016-74.989l-74.984 74.989v-192h192l-71.766 71.761c34.748 34.746 82.746 56.239 135.766 56.239 106.034 0 192-85.962 192-192 0-57.348-25.146-108.818-65.009-144l42.333-48c53.151 46.908 86.676 115.538 86.676 192 0 141.385-114.615 256-256 256z" /> +<glyph unicode="" d="M0 192c0-76.462 33.524-145.092 86.675-192l42.333 48c-39.863 35.182-65.008 86.652-65.008 144 0 106.038 85.965 192 192 192 53.021 0 101.019-21.493 135.765-56.239l-71.765-71.761h192v192l-74.985-74.989c-46.327 46.329-110.322 74.989-181.015 74.989-141.385 0-256-114.615-256-256z" /> +<glyph unicode="" d="M0 288h512v192zM512 0v192h-512z" /> +<glyph unicode="" d="M288 480v-512h192zM0-32h192v512z" /> +<glyph unicode="" d="M380.931-32c56.863 103.016 66.444 260.153-156.931 254.912v-126.912l-192 192 192 192v-124.186c267.481 6.971 297.285-236.107 156.931-387.814z" /> +<glyph unicode="" d="M288 355.814v124.186l192-192-192-192v126.912c-223.375 5.241-213.794-151.896-156.93-254.912-140.356 151.707-110.55 394.785 156.93 387.814z" /> +<glyph unicode="" d="M131.070 480c-56.864-103.016-66.445-260.152 156.93-254.912v126.912l192-192-192-192v124.186c-267.48-6.971-297.286 236.107-156.93 387.814z" /> +<glyph unicode="" d="M224 92.186v-124.186l-192 192 192 192v-126.912c223.375-5.24 213.794 151.896 156.931 254.912 140.355-151.707 110.55-394.785-156.931-387.814z" /> +<glyph unicode="" d="M256 448c141.385 0 256-93.125 256-208 0-114.876-114.615-208-256-208-13.578 0-26.905 0.867-39.912 2.522-54.989-54.989-120.625-64.85-184.088-66.298v13.458c34.268 16.789 64 47.37 64 82.318 0 4.877-0.379 9.665-1.082 14.348-57.898 38.132-94.918 96.377-94.918 161.652 0 114.875 114.615 208 256 208z" /> +<glyph unicode="" d="M544 29.417c0-22.75 13.014-42.454 32-52.092v-7.969c-5.313-0.727-10.736-1.112-16.25-1.112-34.004 0-64.674 14.264-86.361 37.132-13.111-3.491-27.001-5.376-41.389-5.376-79.529 0-144 57.308-144 128 0 70.692 64.471 128 144 128 79.529 0 144-57.308 144-128 0-27.674-9.882-53.296-26.678-74.233-3.412-7.412-5.322-15.656-5.322-24.35zM256 480c139.229 0 252.496-90.307 255.918-202.76-24.591 10.96-51.793 16.76-79.918 16.76-47.78 0-92.908-16.723-127.069-47.089-35.423-31.486-54.931-73.717-54.931-118.911 0-22.336 4.772-43.944 13.868-63.894-2.614-0.063-5.234-0.106-7.868-0.106-13.578 0-26.905 0.867-39.912 2.522-54.989-54.989-120.625-64.85-184.088-66.298v13.458c34.268 16.789 64 47.37 64 82.318 0 4.877-0.379 9.665-1.082 14.348-57.898 38.132-94.918 96.377-94.918 161.652 0 114.875 114.615 208 256 208z" horiz-adv-x="576" /> +<glyph unicode="" d="M240 480v0c132.548 0 240-86.957 240-194.224s-107.452-194.224-240-194.224c-12.729 0-25.223 0.81-37.417 2.355-51.553-51.347-111.086-60.554-170.583-61.907v12.567c32.126 15.677 58 44.233 58 76.867 0 4.553-0.356 9.024-1.015 13.397-54.279 35.607-88.985 89.994-88.985 150.945 0 107.267 107.452 194.224 240 194.224zM498 44.657c0-27.971 18.157-52.449 46-65.886v-10.771c-51.563 1.159-98.893 9.051-143.571 53.063-10.57-1.325-21.397-2.020-32.429-2.020-47.735 0-91.704 12.879-126.807 34.52 72.337 0.253 140.63 23.427 192.417 65.336 26.104 21.126 46.697 45.913 61.207 73.674 15.383 29.433 23.183 60.791 23.183 93.203 0 5.224-0.225 10.418-0.629 15.584 36.285-29.967 58.629-70.811 58.629-115.838 0-52.244-30.079-98.861-77.12-129.382-0.571-3.748-0.88-7.58-0.88-11.483z" horiz-adv-x="576" /> +<glyph unicode="" d="M256 384c-27.466 0-53.994-4.331-78.847-12.871-23.356-8.027-44.153-19.372-61.814-33.722-33.107-26.899-51.339-61.492-51.339-97.407 0-20.149 5.594-39.689 16.626-58.076 11.376-18.96 28.491-36.293 49.494-50.126 15.178-9.996 25.39-25.974 28.088-43.947 0.9-5.992 1.464-12.044 1.685-18.062 3.735 3.097 7.375 6.423 10.94 9.988 12.077 12.076 28.39 18.745 45.251 18.745 2.684 0 5.381-0.168 8.078-0.512 10.487-1.333 21.199-2.010 31.838-2.010 27.467 0 53.994 4.33 78.847 12.871 23.356 8.027 44.153 19.372 61.814 33.722 33.107 26.898 51.339 61.492 51.339 97.407 0 35.915-18.232 70.508-51.339 97.407-17.661 14.349-38.458 25.695-61.814 33.722-24.853 8.54-51.38 12.871-78.847 12.871zM256 448v0c141.385 0 256-93.125 256-208 0-114.876-114.615-208-256-208-13.578 0-26.905 0.867-39.912 2.522-54.989-54.989-120.625-64.85-184.088-66.298v13.458c34.268 16.789 64 47.37 64 82.318 0 4.877-0.379 9.665-1.082 14.348-57.898 38.132-94.918 96.377-94.918 161.652 0 114.875 114.615 208 256 208z" /> +<glyph unicode="" d="M544 29.417c0-22.75 13.014-42.454 32-52.092v-7.969c-5.313-0.727-10.736-1.112-16.25-1.112-34.004 0-64.674 14.264-86.361 37.132-13.111-3.491-27.001-5.376-41.389-5.376-79.529 0-144 57.308-144 128 0 70.692 64.471 128 144 128 79.529 0 144-57.308 144-128 0-27.674-9.882-53.296-26.678-74.233-3.412-7.412-5.322-15.656-5.322-24.35zM115.339 369.407c-33.107-26.899-51.339-61.492-51.339-97.407 0-20.149 5.594-39.689 16.626-58.075 11.376-18.96 28.491-36.293 49.494-50.126 15.178-9.996 25.39-25.974 28.088-43.947 0.9-5.992 1.464-12.044 1.685-18.062 3.735 3.097 7.375 6.423 10.94 9.988 12.077 12.076 28.39 18.745 45.251 18.745 2.684 0 5.381-0.168 8.078-0.512 10.474-1.331 21.172-2.008 31.797-2.010v-64c-13.564 0.001-26.877 0.869-39.871 2.521-54.989-54.989-120.625-64.85-184.088-66.298v13.458c34.268 16.789 64 47.37 64 82.318 0 4.877-0.379 9.665-1.082 14.348-57.898 38.132-94.918 96.377-94.918 161.652 0 114.875 114.615 208 256 208 139.229 0 252.496-90.307 255.918-202.76-20.548 9.158-42.92 14.711-66.131 16.289-5.765 28.034-22.701 54.408-49.126 75.878-17.661 14.349-38.458 25.695-61.814 33.722-24.853 8.54-51.38 12.871-78.847 12.871-27.466 0-53.994-4.331-78.847-12.871-23.356-8.027-44.153-19.372-61.814-33.722z" horiz-adv-x="576" /> +<glyph unicode="" d="M240 416c-25.333 0-49.791-3.975-72.693-11.814-21.462-7.347-40.557-17.718-56.751-30.823-30.022-24.295-46.556-55.401-46.556-87.587 0-17.995 5.033-35.474 14.96-51.949 10.343-17.17 25.949-32.897 45.13-45.479 15.22-9.984 25.468-25.976 28.181-43.975 0.451-2.995 0.815-6.003 1.090-9.016 1.361 1.26 2.712 2.557 4.057 3.897 12.069 12.020 28.344 18.656 45.161 18.656 2.674 0 5.359-0.168 8.047-0.509 9.68-1.226 19.562-1.848 29.374-1.848 25.333 0 49.79 3.974 72.692 11.814 21.463 7.346 40.558 17.717 56.752 30.822 30.023 24.295 46.556 55.401 46.556 87.587 0 32.186-16.533 63.291-46.556 87.587-16.194 13.106-35.289 23.476-56.752 30.823-22.902 7.839-47.359 11.814-72.692 11.814zM240 480v0c132.548 0 240-86.957 240-194.224s-107.452-194.224-240-194.224c-12.729 0-25.223 0.81-37.417 2.355-51.553-51.347-111.086-60.554-170.583-61.907v12.567c32.126 15.677 58 44.233 58 76.867 0 4.553-0.356 9.024-1.015 13.397-54.279 35.607-88.985 89.994-88.985 150.945 0 107.267 107.452 194.224 240 194.224zM498 44.657c0-27.971 18.157-52.449 46-65.886v-10.771c-51.563 1.159-98.893 9.051-143.571 53.063-10.57-1.325-21.397-2.020-32.429-2.020-47.735 0-91.704 12.879-126.807 34.52 72.337 0.253 140.63 23.427 192.417 65.336 26.104 21.126 46.697 45.913 61.207 73.674 15.383 29.433 23.183 60.791 23.183 93.203 0 5.224-0.225 10.418-0.629 15.584 36.285-29.967 58.629-70.811 58.629-115.838 0-52.244-30.079-98.861-77.12-129.382-0.571-3.748-0.88-7.58-0.88-11.483z" horiz-adv-x="576" /> +<glyph unicode="" d="M311.413 128.632c-11.055 1.759-11.307 32.157-11.307 32.157s32.484 32.158 39.564 75.401c19.045 0 30.809 45.973 11.761 62.148 0.795 17.027 24.48 133.662-95.431 133.662-119.911 0-96.225-116.635-95.432-133.662-19.047-16.175-7.285-62.148 11.761-62.148 7.079-43.243 39.564-75.401 39.564-75.401s-0.252-30.398-11.307-32.157c-35.61-5.666-168.586-64.317-168.586-128.632h448c0 64.315-132.976 122.966-168.587 128.632z" /> +<glyph unicode="" d="M424-32h-336c-13.255 0-24 10.745-24 24 0 34.431 14.534 76.102 38.879 111.471 20.346 29.559 45.342 51.81 72.339 64.805-11.899 10.822-22.147 24.013-30.254 39.061-13 24.131-19.873 52.024-19.873 80.664 0 39.803 13.102 77.411 36.893 105.895 24.832 29.73 58.221 46.104 94.016 46.104s69.184-16.374 94.017-46.105c23.79-28.484 36.893-66.091 36.893-105.895 0-28.64-6.872-56.533-19.872-80.664-8.107-15.048-18.355-28.239-30.255-39.061 26.997-12.995 51.993-35.246 72.339-64.805 24.344-35.368 38.878-77.039 38.878-111.47 0-13.255-10.745-24-24-24zM115.037 16h281.926c-4.613 19.67-14.26 41.192-27.381 60.255-20.727 30.113-46.588 49.811-72.819 55.463-11.053 2.382-18.944 12.155-18.944 23.462v17.146c0 8.63 4.633 16.595 12.135 20.861 29.739 16.916 48.956 54.133 48.956 94.813 0 57.346-37.192 104-82.909 104-45.716 0-82.909-46.654-82.909-104 0-40.68 19.217-77.896 48.957-94.813 7.501-4.267 12.134-12.231 12.134-20.861v-17.146c0-11.307-7.892-21.080-18.944-23.462-26.231-5.652-52.092-25.35-72.82-55.463-13.123-19.063-22.768-40.585-27.382-60.255z" /> +<glyph unicode="" d="M488-32h-336c-13.255 0-24 10.745-24 24 0 34.431 14.534 76.102 38.879 111.471 20.346 29.559 45.342 51.81 72.339 64.805-11.899 10.822-22.147 24.013-30.254 39.061-13 24.131-19.873 52.024-19.873 80.664 0 39.803 13.102 77.411 36.893 105.895 24.832 29.73 58.221 46.104 94.016 46.104s69.184-16.374 94.017-46.105c23.79-28.484 36.893-66.091 36.893-105.895 0-28.64-6.872-56.533-19.872-80.664-8.107-15.048-18.355-28.239-30.255-39.061 26.997-12.995 51.993-35.246 72.339-64.805 24.344-35.368 38.878-77.039 38.878-111.47 0-13.255-10.745-24-24-24zM179.037 16h281.926c-4.613 19.67-14.26 41.192-27.381 60.255-20.727 30.113-46.588 49.811-72.819 55.463-11.053 2.382-18.944 12.155-18.944 23.462v17.146c0 8.63 4.633 16.595 12.135 20.861 29.739 16.916 48.956 54.133 48.956 94.813 0 57.346-37.192 104-82.909 104s-82.909-46.654-82.909-104c0-40.68 19.217-77.896 48.957-94.813 7.501-4.267 12.134-12.231 12.134-20.861v-17.146c0-11.307-7.892-21.080-18.944-23.462-26.231-5.652-52.092-25.35-72.82-55.463-13.123-19.063-22.768-40.585-27.382-60.255zM98.557 48h-47.52c4.614 19.67 14.259 41.192 27.38 60.255 20.728 30.113 46.589 49.811 72.82 55.463 11.053 2.382 18.944 12.155 18.944 23.462v17.146c0 8.63-4.633 16.595-12.134 20.861-29.74 16.917-48.957 54.133-48.957 94.813 0 57.346 37.192 104 82.909 104 3.127 0 6.213-0.226 9.251-0.651 13.179 14.667 28.117 26.587 44.321 35.502-16.596 8.616-34.75 13.149-53.571 13.149-35.795 0-69.184-16.374-94.017-46.105-23.79-28.484-36.892-66.092-36.892-105.895 0-28.64 6.872-56.533 19.873-80.664 8.107-15.048 18.355-28.238 30.254-39.061-26.997-12.995-51.993-35.246-72.339-64.805-24.345-35.368-38.879-77.039-38.879-111.47 0-13.255 10.745-24 24-24h66.193c0.738 15.513 3.599 31.706 8.364 48z" /> +<glyph unicode="" d="M128 320c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128-70.692 0-128 57.308-128 128zM384 160h-256c-70.692 0-128-57.309-128-128v-32h512v32c0 70.691-57.308 128-128 128z" /> +<glyph unicode="" d="M160 384c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96-53.019 0-96 42.981-96 96zM384.039 256h-17.712l-99.552-202.122 37.225 186.122-48 48-48-48 37.225-186.122-99.551 202.122h-17.712c-63.962 0-63.962-42.993-63.962-96v-160h384v160c0 53.007 0 96-63.961 96z" /> +<glyph unicode="" d="M112.5 256c61.856 0 112-50.145 112-112 0-61.856-50.144-112-112-112-61.856 0-112 50.144-112 112l-0.5 16c0 123.712 100.288 224 224 224v-64c-42.737 0-82.917-16.643-113.137-46.863-5.817-5.818-11.126-12.008-15.915-18.51 5.719 0.9 11.58 1.373 17.552 1.373zM400.5 256c61.855 0 112-50.145 112-112 0-61.856-50.145-112-112-112-61.855 0-112 50.144-112 112l-0.5 16c0 123.712 100.288 224 224 224v-64c-42.737 0-82.917-16.643-113.137-46.863-5.818-5.818-11.127-12.008-15.916-18.51 5.72 0.9 11.58 1.373 17.553 1.373z" /> +<glyph unicode="" d="M364.496 224c68.877 43.667 115.504 127.604 115.504 224 0 10.838-0.596 21.517-1.739 32h-444.521c-1.145-10.484-1.74-21.163-1.74-32 0-96.396 46.627-180.333 115.503-224-68.876-43.667-115.503-127.604-115.503-224 0-10.838 0.595-21.517 1.739-32h444.521c1.144 10.483 1.739 21.162 1.739 32 0.001 96.396-46.626 180.333-115.503 224zM80 0c0 93.456 40.081 172.707 112 198.854v50.293c-71.919 26.145-112 105.396-112 198.853v0h352c0-93.457-40.081-172.708-112-198.853v-50.293c71.919-26.147 112-105.398 112-198.854h-352zM309.813 145.203c-35.827 20.322-37.804 46.684-37.813 62.683v32.114c0 15.997 1.902 42.457 37.872 62.832 19.252 11.182 35.904 28.174 48.524 49.168h-204.791c12.633-21.016 29.306-38.021 48.583-49.203 35.827-20.322 37.803-46.683 37.813-62.683v-32.114c0-15.996-1.902-42.457-37.872-62.832-36.311-21.090-63.369-62.842-71.545-113.168h250.835c-8.182 50.354-35.265 92.124-71.606 113.203z" /> +<glyph unicode="" d="M192 416c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM327.765 359.765c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM416 224c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM359.765 88.235c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM224.001 32c0 0 0 0 0 0 0 17.673 14.327 32 32 32 17.673 0 32-14.327 32-32 0 0 0 0 0 0 0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM88.236 88.235c0 0 0 0 0 0 0 17.673 14.327 32 32 32 17.673 0 32-14.327 32-32 0 0 0 0 0 0 0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM72.236 359.765c0 0 0 0 0 0 0 26.51 21.49 48 48 48 26.509 0 48-21.49 48-48 0 0 0 0 0 0 0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48zM28 224c0 19.882 16.117 36 36 36s36-16.118 36-36c0-19.882-16.118-36-36-36-19.883 0-36 16.118-36 36z" /> +<glyph unicode="" d="M512 224c-0.639 33.431-7.892 66.758-21.288 97.231-13.352 30.5-32.731 58.129-56.521 80.96-23.776 22.848-51.972 40.91-82.492 52.826-30.502 11.962-63.298 17.676-95.699 16.983-32.405-0.641-64.666-7.687-94.167-20.678-29.524-12.948-56.271-31.735-78.367-54.788-22.112-23.041-39.58-50.354-51.093-79.899-11.557-29.531-17.064-61.26-16.373-92.635 0.643-31.38 7.482-62.574 20.067-91.103 12.544-28.55 30.738-54.414 53.055-75.774 22.305-21.377 48.736-38.252 77.307-49.36 28.559-11.152 59.223-16.451 89.571-15.763 30.354 0.645 60.481 7.277 88.038 19.457 27.575 12.141 52.558 29.74 73.183 51.322 20.641 21.57 36.922 47.118 47.627 74.715 6.517 16.729 10.94 34.2 13.271 51.899 0.623-0.036 1.249-0.060 1.881-0.060 17.673 0 32 14.326 32 32 0 0.898-0.047 1.786-0.119 2.666h0.119zM461.153 139.026c-11.736-26.601-28.742-50.7-49.589-70.59-20.835-19.905-45.5-35.593-72.122-45.895-26.614-10.339-55.145-15.226-83.442-14.541-28.302 0.649-56.298 6.868-81.91 18.237-25.625 11.333-48.842 27.745-67.997 47.856-19.169 20.099-34.264 43.882-44.161 69.529-9.935 25.642-14.614 53.107-13.932 80.378 0.651 27.276 6.664 54.206 17.627 78.845 10.929 24.65 26.749 46.985 46.123 65.405 19.365 18.434 42.265 32.935 66.937 42.428 24.669 9.53 51.068 14.003 77.313 13.322 26.25-0.653 52.114-6.459 75.781-17.017 23.676-10.525 45.128-25.751 62.812-44.391 17.698-18.629 31.605-40.647 40.695-64.344 9.124-23.696 13.391-49.029 12.712-74.248h0.119c-0.072-0.88-0.119-1.768-0.119-2.666 0-16.506 12.496-30.087 28.543-31.812-3.112-17.411-8.265-34.409-15.39-50.496z" /> +<glyph unicode="" d="M96 224c0 6.090 0.352 12.098 1.015 18.011l-92.49 30.052c-2.958-15.57-4.525-31.632-4.525-48.063 0-73.615 31.083-139.961 80.827-186.662l57.142 78.648c-26.062 28.463-41.969 66.379-41.969 108.014zM416 224c0-41.634-15.906-79.551-41.969-108.014l57.142-78.648c49.744 46.701 80.827 113.047 80.827 186.662 0 16.431-1.566 32.493-4.524 48.063l-92.49-30.052c0.662-5.914 1.014-11.921 1.014-18.011zM288 380.796c45.967-9.331 84.772-38.371 107.225-77.913l92.489 30.051c-36.598 77.71-111.12 134.030-199.714 145.078v-97.216zM116.775 302.884c22.453 39.542 61.258 68.582 107.225 77.913v97.215c-88.594-11.048-163.115-67.368-199.713-145.077l92.488-30.051zM322.278 78.336c-20.195-9.204-42.636-14.336-66.278-14.336s-46.083 5.132-66.277 14.335l-57.146-78.655c36.603-20.183 78.668-31.68 123.423-31.68s86.82 11.497 123.424 31.68l-57.146 78.656z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 352c70.692 0 128-57.308 128-128s-57.308-128-128-128-128 57.308-128 128 57.308 128 128 128zM408.735 71.265c-40.797-40.797-95.040-63.265-152.735-63.265-57.696 0-111.938 22.468-152.735 63.265-40.797 40.797-63.265 95.039-63.265 152.735 0 57.695 22.468 111.938 63.265 152.735l33.941-33.941c0 0 0 0 0 0-65.503-65.503-65.503-172.085 0-237.588 31.731-31.731 73.919-49.206 118.794-49.206 44.874 0 87.062 17.475 118.794 49.206 65.503 65.503 65.503 172.084 0 237.588l33.941 33.941c40.797-40.797 63.265-95.040 63.265-152.735 0-57.696-22.468-111.938-63.265-152.735z" /> +<glyph unicode="" d="M256 480c-139.374 0-252.729-111.381-255.924-249.987 2.96 120.932 94.916 217.987 207.924 217.987 114.875 0 208-100.288 208-224 0-26.51 21.49-48 48-48 26.51 0 48 21.49 48 48 0 141.385-114.615 256-256 256zM256-32c139.374 0 252.729 111.381 255.924 249.987-2.96-120.932-94.916-217.987-207.924-217.987-114.875 0-208 100.288-208 224 0 26.51-21.49 48-48 48-26.51 0-48-21.49-48-48 0-141.385 114.615-256 256-256z" /> +<glyph unicode="" d="M512 288h-192l71.765 71.765c-36.265 36.263-84.48 56.235-135.765 56.235-51.285 0-99.5-19.972-135.765-56.235-36.263-36.265-56.235-84.48-56.235-135.765 0-51.285 19.972-99.5 56.235-135.765 36.265-36.263 84.48-56.235 135.765-56.235 51.285 0 99.5 19.972 135.764 56.236 3.028 3.027 5.93 6.146 8.728 9.334l48.16-42.141c-46.923-53.583-115.832-87.429-192.652-87.429-141.385 0-256 114.615-256 256 0 141.385 114.615 256 256 256 70.693 0 134.684-28.663 181.008-74.992l74.992 74.992v-192z" /> +<glyph unicode="" d="M32 480h192v-32h-192zM288 480h192v-32h-192zM476 320h-28v128h-128v-128h-128v128h-128v-128h-28c-19.8 0-36-16.2-36-36v-280c0-19.8 16.2-36 36-36h152c19.8 0 36 16.2 36 36v188h64v-188c0-19.8 16.2-36 36-36h152c19.8 0 36 16.2 36 36v280c0 19.8-16.2 36-36 36zM174 0h-124c-9.9 0-18 7.2-18 16s8.1 16 18 16h124c9.9 0 18-7.2 18-16s-8.1-16-18-16zM272 224h-32c-8.8 0-16 7.2-16 16s7.2 16 16 16h32c8.8 0 16-7.2 16-16s-7.2-16-16-16zM462 0h-124c-9.9 0-18 7.2-18 16s8.1 16 18 16h124c9.9 0 18-7.2 18-16s-8.1-16-18-16z" /> +<glyph unicode="" d="M496.131 44.302l-121.276 103.147c-12.537 11.283-25.945 16.463-36.776 15.963 28.628 33.534 45.921 77.039 45.921 124.588 0 106.039-85.961 192-192 192-106.038 0-192-85.961-192-192 0-106.039 85.961-192 192-192 47.549 0 91.054 17.293 124.588 45.922-0.5-10.831 4.68-24.239 15.963-36.776l103.147-121.276c17.661-19.623 46.511-21.277 64.11-3.678s15.946 46.449-3.677 64.11zM192 160c-70.692 0-128 57.308-128 128s57.308 128 128 128 128-57.308 128-128-57.307-128-128-128z" /> +<glyph unicode="" d="M496.131 44.302l-121.276 103.147c-12.537 11.283-25.945 16.463-36.776 15.963 28.628 33.534 45.921 77.039 45.921 124.588 0 106.039-85.961 192-192 192-106.038 0-192-85.961-192-192 0-106.039 85.961-192 192-192 47.549 0 91.054 17.293 124.588 45.922-0.5-10.831 4.68-24.239 15.963-36.776l103.147-121.276c17.661-19.623 46.511-21.277 64.11-3.678s15.946 46.449-3.677 64.11zM192 160c-70.692 0-128 57.308-128 128s57.308 128 128 128 128-57.308 128-128-57.307-128-128-128zM224 384h-64v-64h-64v-64h64v-64h64v64h64v64h-64z" /> +<glyph unicode="" d="M496.131 44.302l-121.276 103.147c-12.537 11.283-25.945 16.463-36.776 15.963 28.628 33.534 45.921 77.039 45.921 124.588 0 106.039-85.961 192-192 192-106.038 0-192-85.961-192-192 0-106.039 85.961-192 192-192 47.549 0 91.054 17.293 124.588 45.922-0.5-10.831 4.68-24.239 15.963-36.776l103.147-121.276c17.661-19.623 46.511-21.277 64.11-3.678s15.946 46.449-3.677 64.11zM192 160c-70.692 0-128 57.308-128 128s57.308 128 128 128 128-57.308 128-128-57.307-128-128-128zM96 320h192v-64h-192z" /> +<glyph unicode="" d="M512 480v-192l-69.13 69.13-106-106-53.74 53.74 106 106-69.13 69.13zM122.87 410.87l106-106-53.74-53.74-106 106-69.13-69.13v192h192zM442.87 90.87l69.13 69.13v-192h-192l69.13 69.13-106 106 53.74 53.74zM228.87 143.13l-106-106 69.13-69.13h-192v192l69.13-69.13 106 106z" /> +<glyph unicode="" d="M32 192h192v-192l-69.13 69.13-101-101-53.74 53.74 101 101zM410.87 122.87l101-101-53.74-53.74-101 101-69.13-69.13v192h192zM480 256h-192v192l69.13-69.13 101 101 53.74-53.74-101-101zM154.87 378.87l69.13 69.13v-192h-192l69.13 69.13-101 101 53.74 53.74z" /> +<glyph unicode="" d="M512 480v-208l-80 80-96-96-48 48 96 96-80 80zM224 144l-96-96 80-80h-208v208l80-80 96 96z" /> +<glyph unicode="" d="M224 192v-208l-80 80-96-96-48 48 96 96-80 80zM512 432l-96-96 80-80h-208v208l80-80 96 96z" /> +<glyph unicode="" d="M501.066 322.879l-50.553 50.552c-12.396 12.397-32.685 32.684-45.081 45.082l-50.553 50.552c-12.396 12.397-34.477 14.583-49.065 4.858l-138.219-92.146c-14.588-9.726-20.109-30.514-12.268-46.195l35.243-70.487c1.077-2.153 2.323-4.448 3.695-6.83l-178.265-178.265-16-112h96v32h64v64h64v64h64v35.593c3.198-1.906 6.267-3.608 9.096-5.022l70.485-35.244c15.683-7.841 36.47-2.319 46.195 12.269l92.147 138.22c9.727 14.586 7.539 36.665-4.857 49.063zM75.314 52.687l-22.627 22.627 155.786 155.785 22.627-22.627-155.786-155.785zM458.51 268.118l-22.628-22.628c-6.223-6.222-16.404-6.222-22.627 0l-135.765 135.765c-6.223 6.222-6.223 16.405 0 22.627l22.628 22.628c6.223 6.222 16.404 6.222 22.627 0l135.765-135.765c6.223-6.222 6.223-16.405 0-22.627z" /> +<glyph unicode="" d="M352 480c-88.365 0-160-71.634-160-160 0-10.013 0.929-19.808 2.688-29.312l-194.688-194.688v-96c0-17.673 14.327-32 32-32h32v32h64v64h64v64h64l41.521 41.521c17.005-6.158 35.348-9.521 54.479-9.521 88.365 0 160 71.634 160 160s-71.635 160-160 160zM399.937 319.937c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48z" /> +<glyph unicode="" d="M416 256h-32v96c0 70.692-57.308 128-128 128s-128-57.308-128-128v-96h-32c-17.6 0-32-14.4-32-32v-224c0-17.6 14.4-32 32-32h320c17.6 0 32 14.4 32 32v224c0 17.6-14.4 32-32 32zM256 64c-17.673 0-32 14.327-32 32s14.327 32 32 32 32-14.327 32-32-14.327-32-32-32zM320 256h-128v96c0 35.29 28.71 64 64 64s64-28.71 64-64v-96z" /> +<glyph unicode="" d="M296 256h-8v96c0 52.935-43.065 96-96 96h-64c-52.935 0-96-43.065-96-96v-96h-8c-13.2 0-24-10.8-24-24v-240c0-13.2 10.8-24 24-24h272c13.2 0 24 10.8 24 24v240c0 13.2-10.8 24-24 24zM192 32h-64l13.92 69.6c-8.404 5.766-13.92 15.437-13.92 26.4 0 17.673 14.327 32 32 32 17.673 0 32-14.327 32-32 0-10.963-5.516-20.634-13.92-26.4l13.92-69.6zM224 256h-128v96c0 17.645 14.355 32 32 32h64c17.645 0 32-14.355 32-32v-96z" /> +<glyph unicode="" d="M384 448h-64c-52.935 0-96-43.065-96-96v-96h-200c-13.2 0-24-10.8-24-24v-240c0-13.2 10.8-24 24-24h272c13.2 0 24 10.8 24 24v240c0 13.2-10.8 24-24 24h-8v96c0 17.645 14.355 32 32 32h64c17.645 0 32-14.355 32-32v-96h64v96c0 52.935-43.065 96-96 96zM192 32h-64l13.92 69.6c-8.404 5.766-13.92 15.437-13.92 26.4 0 17.673 14.327 32 32 32 17.673 0 32-14.327 32-32 0-10.963-5.516-20.634-13.92-26.4l13.92-69.6z" /> +<glyph unicode="" d="M501.467 71.062l-230.276 197.38c10.724 20.149 16.809 43.141 16.809 67.558 0 79.529-64.471 144-144 144-14.547 0-28.586-2.166-41.823-6.177l83.195-83.195c12.445-12.445 12.445-32.81 0-45.255l-50.745-50.745c-12.445-12.445-32.81-12.445-45.255 0l-83.195 83.195c-4.011-13.237-6.177-27.276-6.177-41.823 0-79.529 64.471-144 144-144 24.417 0 47.409 6.085 67.558 16.81l197.38-230.276c11.454-13.362 31.008-14.113 43.452-1.669l50.746 50.746c12.444 12.444 11.693 31.997-1.669 43.451z" /> +<glyph unicode="" d="M224 416v8c0 13.2-10.8 24-24 24h-80c-13.2 0-24-10.8-24-24v-8h-96v-64h96v-8c0-13.2 10.8-24 24-24h80c13.2 0 24 10.8 24 24v8h288v64h-288zM128 352v64h64v-64h-64zM416 264c0 13.2-10.8 24-24 24h-80c-13.2 0-24-10.8-24-24v-8h-288v-64h288v-8c0-13.2 10.8-24 24-24h80c13.2 0 24 10.8 24 24v8h96v64h-96v8zM320 192v64h64v-64h-64zM224 104c0 13.2-10.8 24-24 24h-80c-13.2 0-24-10.8-24-24v-8h-96v-64h96v-8c0-13.2 10.8-24 24-24h80c13.2 0 24 10.8 24 24v8h288v64h-288v8zM128 32v64h64v-64h-64z" /> +<glyph unicode="" d="M448 256h8c13.2 0 24 10.8 24 24v80c0 13.2-10.8 24-24 24h-8v96h-64v-96h-8c-13.2 0-24-10.8-24-24v-80c0-13.2 10.8-24 24-24h8v-288h64v288zM384 352h64v-64h-64v64zM296 64c13.2 0 24 10.8 24 24v80c0 13.2-10.8 24-24 24h-8v288h-64v-288h-8c-13.2 0-24-10.8-24-24v-80c0-13.2 10.8-24 24-24h8v-96h64v96h8zM224 160h64v-64h-64v64zM136 256c13.2 0 24 10.8 24 24v80c0 13.2-10.8 24-24 24h-8v96h-64v-96h-8c-13.2 0-24-10.8-24-24v-80c0-13.2 10.8-24 24-24h8v-288h64v288h8zM64 352h64v-64h-64v64z" /> +<glyph unicode="" d="M466.895 174.875c-26.863 46.527-10.708 106.152 36.076 133.244l-50.313 87.146c-14.375-8.427-31.088-13.259-48.923-13.259-53.768 0-97.354 43.873-97.354 97.995h-100.629c0.133-16.705-4.037-33.641-12.979-49.126-26.862-46.528-86.578-62.351-133.431-35.379l-50.312-87.146c14.485-8.236 27.025-20.294 35.943-35.739 26.819-46.454 10.756-105.96-35.854-133.112l50.313-87.146c14.325 8.348 30.958 13.127 48.7 13.127 53.598 0 97.072-43.596 97.35-97.479h100.627c-0.043 16.537 4.136 33.285 12.983 48.609 26.818 46.453 86.388 62.297 133.207 35.506l50.313 87.145c-14.39 8.233-26.846 20.249-35.717 35.614zM256 120.334c-57.254 0-103.668 46.412-103.668 103.667 0 57.254 46.413 103.667 103.668 103.667 57.254 0 103.666-46.413 103.666-103.667-0.001-57.255-46.412-103.667-103.666-103.667z" /> +<glyph unicode="" d="M181.861 118.974l20.649 28.908-22.627 22.628-28.909-20.648c-5.361 2.997-11.102 5.387-17.133 7.096l-5.841 35.042h-32l-5.84-35.043c-6.031-1.709-11.772-4.099-17.133-7.096l-28.909 20.649-22.628-22.628 20.649-28.908c-2.997-5.36-5.387-11.103-7.096-17.133l-35.043-5.841v-32l35.043-5.841c1.709-6.030 4.099-11.772 7.096-17.133l-20.649-28.908 22.627-22.628 28.909 20.648c5.361-2.997 11.102-5.387 17.133-7.096l5.841-35.042h32l5.84 35.043c6.031 1.709 11.772 4.099 17.133 7.096l28.909-20.648 22.627 22.628-20.649 28.908c2.997 5.36 5.387 11.103 7.096 17.133l35.044 5.84v32l-35.043 5.841c-1.709 6.030-4.099 11.772-7.096 17.133zM112 48c-17.674 0-32 14.327-32 32s14.326 32 32 32 32-14.327 32-32-14.326-32-32-32zM512 288v32l-33.691 6.125c-0.621 4.023-1.416 7.989-2.362 11.895l28.779 18.55-12.246 29.564-33.472-7.234c-2.107 3.455-4.363 6.81-6.746 10.065l19.503 28.171-22.628 22.627-28.171-19.503c-3.256 2.383-6.61 4.638-10.065 6.747l7.234 33.472-29.564 12.247-18.55-28.779c-3.906 0.946-7.872 1.741-11.895 2.362l-6.126 33.691h-32l-6.126-33.691c-4.023-0.621-7.988-1.416-11.895-2.362l-18.549 28.779-29.564-12.246 7.234-33.472c-3.455-2.108-6.81-4.364-10.065-6.747l-28.171 19.503-22.627-22.627 19.503-28.171c-2.383-3.255-4.639-6.61-6.747-10.065l-33.472 7.234-12.246-29.564 28.779-18.55c-0.946-3.906-1.741-7.871-2.362-11.895l-33.692-6.126v-32l33.691-6.125c0.621-4.023 1.416-7.989 2.362-11.895l-28.779-18.55 12.246-29.564 33.472 7.234c2.108-3.455 4.364-6.809 6.747-10.065l-19.503-28.171 22.627-22.628 28.171 19.503c3.255-2.383 6.61-4.638 10.065-6.746l-7.234-33.472 29.564-12.246 18.551 28.779c3.905-0.946 7.871-1.741 11.894-2.362l6.126-33.692h32l6.126 33.691c4.022 0.621 7.988 1.416 11.895 2.362l18.55-28.779 29.564 12.246-7.234 33.472c3.455 2.108 6.81 4.363 10.065 6.746l28.171-19.503 22.628 22.628-19.503 28.171c2.383 3.256 4.638 6.61 6.746 10.065l33.472-7.234 12.246 29.565-28.779 18.55c0.946 3.906 1.741 7.871 2.362 11.895l33.691 6.125zM336 234.4c-38.439 0-69.6 31.161-69.6 69.6s31.16 69.6 69.6 69.6 69.6-31.161 69.6-69.6c0-38.439-31.16-69.6-69.6-69.6z" /> +<glyph unicode="" d="M512 175.953v96.094l-73.387 12.231c-2.979 9.066-6.611 17.834-10.847 26.25l43.227 60.517-67.948 67.949-60.413-43.152c-8.455 4.277-17.269 7.944-26.384 10.951l-12.201 73.207h-96.094l-12.201-73.208c-9.115-3.007-17.929-6.674-26.383-10.951l-60.414 43.152-67.949-67.949 43.227-60.518c-4.235-8.415-7.867-17.183-10.846-26.249l-73.387-12.23v-96.094l73.559-12.26c2.98-8.984 6.605-17.674 10.821-26.015l-43.374-60.724 67.949-67.948 60.827 43.447c8.301-4.175 16.945-7.764 25.882-10.717l12.289-73.736h96.094l12.289 73.737c8.937 2.953 17.581 6.542 25.883 10.716l60.826-43.446 67.948 67.948-43.372 60.723c4.216 8.341 7.839 17.031 10.82 26.016l73.559 12.259zM256 160c-35.346 0-64 28.653-64 64 0 35.346 28.654 64 64 64 35.347 0 64-28.654 64-64 0-35.347-28.653-64-64-64z" /> +<glyph unicode="" d="M504.998 65.512l-150.772 150.772c-9.334 9.334-24.607 9.334-33.941 0l-11.313-11.313-92 92 151.028 151.029h-160l-71.029-71.029-7.030 7.029h-33.941v-33.941l7.029-7.029-103.029-103.030 80-80 103.029 103.029 92-92-11.313-11.313c-9.334-9.334-9.334-24.607 0-33.941l150.772-150.772c9.334-9.334 24.607-9.334 33.941 0l56.568 56.568c9.335 9.333 9.335 24.607 0.001 33.941z" /> +<glyph unicode="" d="M128 384l-64 64h-32v-32l64-64zM160 480h32v-64h-32zM288 320h64v-32h-64zM320 416v32h-32l-64-64 32-32zM0 320h64v-32h-64zM160 192h32v-64h-32zM32 192v-32h32l64 64-32 32zM505 39l-318.059 318.059c-9.334 9.334-24.607 9.334-33.941 0l-30.059-30.059c-9.334-9.334-9.334-24.607 0-33.941l318.059-318.059c9.334-9.334 24.607-9.334 33.941 0l30.059 30.059c9.334 9.334 9.334 24.607 0 33.941zM240 208l-96 96 32 32 96-96-32-32z" /> +<glyph unicode="" d="M448 352h-96v64c0 17.6-14.4 32-32 32h-128c-17.6 0-32-14.4-32-32v-64h-96c-35.2 0-64-28.8-64-64v-256c0-35.2 28.8-64 64-64h384c35.2 0 64 28.8 64 64v256c0 35.2-28.8 64-64 64zM192 416h128v-64h-128v64zM384 128h-96v-96h-64v96h-96v64h96v96h64v-96h96v-64z" /> +<glyph unicode="" d="M512 192v32h-96.645c-2.931 36.343-15.893 69.513-35.835 96.125h80.972l35.030 140.12-31.045 7.761-28.97-115.88h-87.34c-0.446 0.347-0.898 0.687-1.349 1.028 3.355 9.751 5.181 20.211 5.181 31.097 0.001 52.88-42.979 95.749-95.999 95.749s-96-42.869-96-95.75c0-10.886 1.825-21.346 5.181-31.097-0.45-0.342-0.902-0.681-1.349-1.028h-87.34l-28.97 115.88-31.045-7.761 35.030-140.12h80.972c-19.942-26.611-32.903-59.781-35.834-96.124h-96.645v-32h96.685c1.901-22.832 7.754-44.406 16.819-63.875h-61.996l-35.030-140.119 31.045-7.762 28.97 115.881h56.177c29.346-39.016 73.698-63.875 123.33-63.875s93.983 24.859 123.331 63.875h56.177l28.97-115.881 31.045 7.762-35.030 140.119h-61.996c9.065 19.469 14.918 41.043 16.818 63.875h96.685z" /> +<glyph unicode="" d="M224 192v224c-123.712 0-224-100.288-224-224s100.288-224 224-224 224 100.288 224 224c0 36.017-8.514 70.042-23.618 100.191l-200.382-100.191zM456.382 356.191c-36.776 73.408-112.687 123.809-200.382 123.809v-224l200.382 100.191z" /> +<glyph unicode="" d="M64 32h448v-64h-512v512h64zM144 64c-26.51 0-48 21.49-48 48s21.49 48 48 48c1.414 0 2.811-0.074 4.194-0.193l51.596 85.993c-4.92 7.535-7.79 16.531-7.79 26.201 0 26.51 21.49 48 48 48 26.51 0 48-21.49 48-48 0-9.671-2.87-18.666-7.79-26.201l51.596-85.993c1.383 0.119 2.78 0.193 4.194 0.193 1.068 0 2.124-0.047 3.175-0.115l85.178 149.061c-5.268 7.704-8.353 17.018-8.353 27.055 0 26.51 21.49 48 48 48 26.51 0 48-21.49 48-48 0-26.51-21.49-48-48-48-1.070 0-2.124 0.047-3.175 0.116l-85.178-149.062c5.268-7.703 8.353-17.018 8.353-27.055 0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48 0 9.67 2.87 18.666 7.789 26.201l-51.595 85.992c-1.383-0.119-2.78-0.193-4.194-0.193s-2.811 0.073-4.194 0.193l-51.596-85.993c4.92-7.534 7.79-16.53 7.79-26.2 0-26.51-21.49-48-48-48z" /> +<glyph unicode="" d="M0 64h512v-64h-512zM64 192h64v-96h-64zM160 320h64v-224h-64zM256 224h64v-128h-64zM352 416h64v-320h-64z" /> +<glyph unicode="" d="M144 288h-96c-8.8 0-16-7.2-16-16v-288c0-8.8 7.2-16 16-16h96c8.8 0 16 7.2 16 16v288c0 8.8-7.2 16-16 16zM144 0h-96v128h96v-128zM304 352h-96c-8.8 0-16-7.2-16-16v-352c0-8.8 7.2-16 16-16h96c8.8 0 16 7.2 16 16v352c0 8.8-7.2 16-16 16zM304 0h-96v160h96v-160zM464 416h-96c-8.8 0-16-7.2-16-16v-416c0-8.8 7.2-16 16-16h96c8.8 0 16 7.2 16 16v416c0 8.8-7.2 16-16 16zM464 0h-96v192h96v-192z" /> +<glyph unicode="" d="M385.758 320c9.063 6.44 17.756 13.608 25.722 21.574 16.701 16.701 27.873 37.25 31.456 57.861 3.929 22.593-1.836 43.57-15.815 57.55-11.15 11.149-26.255 17.043-43.682 17.043-24.816 0-50.961-11.912-71.73-32.681-33.238-33.238-52.613-79.119-63.038-111.861-7.72 32.901-23.103 77.322-53.009 107.229-16.047 16.046-36.557 24.285-55.923 24.285-15.827 0-30.89-5.502-42.13-16.743-24.993-24.994-21.616-68.893 7.543-98.052 10.396-10.396 22.549-19.031 35.36-26.206h-108.512v-128h32v-224h384v224.001h32v128h-94.242zM337.163 415.891c13.862 13.862 31.161 22.137 46.275 22.137 5.35 0 12.854-1.127 18.225-6.499 13.015-13.014 5.706-43.154-15.64-64.499-21.973-21.973-51.53-37.084-77.216-47.030h-25.336c9.284 28.774 26.029 68.228 53.692 95.891zM116.967 399.555c-0.351 4.56-0.025 13.124 6.098 19.247 5.122 5.122 11.894 6.198 16.674 6.198v0c10.629 0 21.734-5.008 30.466-13.74 16.936-16.936 30.883-43.886 40.334-77.938 0.255-0.92 0.504-1.835 0.748-2.743-0.908 0.243-1.823 0.492-2.743 0.748-34.052 9.452-61.001 23.399-77.937 40.335-7.914 7.913-12.885 18.080-13.64 27.893zM224 0h-128v208h128v-208zM224 224h-160v64h160v-64zM416 0h-128v208h128v-208zM448 224h-160v64h160v-64z" /> +<glyph unicode="" d="M416 384v64h-320v-64h-96v-64c0-53.019 42.979-96 96-96 10.038 0 19.715 1.543 28.81 4.401 23.087-33.004 58.304-56.898 99.19-65.198v-99.203h-32c-35.347 0-64-28.653-64-64h256c0 35.347-28.653 64-64 64h-32v99.203c40.886 8.3 76.103 32.193 99.19 65.198 9.095-2.858 18.772-4.401 28.81-4.401 53.021 0 96 42.981 96 96v64h-96zM96 262c-31.981 0-58 26.019-58 58v32h58v-32c0-20.093 3.715-39.316 10.477-57.034-3.401-0.623-6.899-0.966-10.477-0.966zM474 320c0-31.981-26.019-58-58-58-3.578 0-7.076 0.343-10.477 0.966 6.762 17.718 10.477 36.941 10.477 57.034v32h58v-32z" /> +<glyph unicode="" d="M304 288c-16-16-16-16-16-32v-224h64c17.673 0 32-14.327 32-32h-256c0 17.673 14.327 32 32 32h64v224c0 16 0 16-16 32l-137.373 137.373c-12.445 12.445-8.227 22.627 9.373 22.627h352c17.6 0 21.817-10.182 9.373-22.627l-137.368-137.368c-0.002-0.002-0.003-0.004-0.005-0.005z" /> +<glyph unicode="" d="M416 320h-32v48c0 44.183-85.961 80-192 80-106.039 0-192-35.817-192-80v-288c0-44.183 85.961-80 192-80s192 35.817 192 80v48h32c52.8 0 96 43.2 96 96s-43.2 96-96 96zM88.028 385.199c28.971 9.545 65.895 14.801 103.972 14.801s75.002-5.256 103.972-14.801c18.497-6.094 29.704-12.623 35.705-17.199-6.001-4.576-17.208-11.104-35.705-17.199-28.97-9.545-65.895-14.801-103.972-14.801s-75.001 5.256-103.972 14.801c-18.497 6.095-29.704 12.623-35.705 17.199 6.001 4.576 17.208 11.104 35.705 17.199zM452.182 195.818c-4.414-4.414-13.945-11.818-28.182-11.818h-40v80h40c14.237 0 23.768-7.405 28.182-11.819s11.818-13.944 11.818-28.181-7.404-23.768-11.818-28.182z" /> +<glyph unicode="" d="M432 480c-44.186 0-80-35.816-80-80v-240h64v-192h96v432c0 44.184-35.817 80-80 80zM208 480c-8.838 0-16-7.164-16-16v-112c0-4.418-7.164-8-16-8-8.838 0-16 3.582-16 8v112c0 8.836-7.164 16-16 16-8.837 0-16-7.164-16-16v-112c0-4.418-7.164-8-16-8-8.837 0-16 3.582-16 8v112c0 8.836-7.164 16-16 16-8.837 0-16-7.164-16-16v-112c0-4.418-7.164-8-16-8s-16 3.582-16 8v112c0 8.836-7.164 16-16 16s-16-7.164-16-16v-144c0-14.159 12.529-22.055 26.502-32 17.605-12.532 37.498-28.318 37.498-64v-256h96v256c0 35.682 19.893 51.468 37.496 64 13.973 9.945 26.504 17.841 26.504 32v144c0 8.836-7.163 16-16 16z" /> +<glyph unicode="" d="M352 448l-160-160h-96l-96-128c0 0 101.708 28.326 161.033 15.042l-161.033-207.042 210.951 164.072c29.419-67.327-18.951-164.072-18.951-164.072l128 96v96l160 160 32 160-160-32z" /> +<glyph unicode="" d="M256 448c141.385 0 256-114.615 256-256 0-96.396-53.288-180.333-132.004-224h-247.992c-78.716 43.667-132.004 127.604-132.004 224 0 141.385 114.615 256 256 256zM400.957 47.043c38.719 38.72 60.043 90.199 60.043 144.957h-45v32h42.519c-3.507 22.499-10.695 44.073-21.282 64h-53.237v32h32.142c-4.719 5.881-9.776 11.548-15.185 16.957-23.111 23.11-50.77 40.019-80.957 49.899v-34.856h-32v42.52c-10.491 1.634-21.18 2.48-32 2.48s-21.509-0.845-32-2.48v-42.52h-32v34.856c-30.186-9.88-57.846-26.788-80.957-49.899-5.409-5.409-10.466-11.076-15.185-16.957h32.142v-32h-53.238c-10.587-19.927-17.776-41.501-21.282-64h42.52v-32h-45c0-54.758 21.324-106.237 60.043-144.957 5.355-5.355 10.962-10.364 16.78-15.043h96.177l18.286 256h27.428l18.286-256h96.177c5.818 4.679 11.426 9.689 16.78 15.043z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM151.418 62.924c5.553 15.316 8.582 31.844 8.582 49.076 0 62.175-39.405 115.146-94.604 135.303 5.105 42.462 24.127 81.749 54.839 112.462 36.265 36.263 84.48 56.235 135.765 56.235s99.5-19.972 135.765-56.235c30.714-30.713 49.734-70 54.841-112.462-55.201-20.157-94.606-73.128-94.606-135.303 0-17.234 3.030-33.76 8.583-49.075-30.853-20.121-66.885-30.925-104.583-30.925-37.697 0-73.729 10.804-104.582 30.924zM275.877 159.502c6.939-1.747 12.123-8.040 12.123-15.502v-32c0-8.8-7.2-16-16-16h-32c-8.8 0-16 7.2-16 16v32c0 7.462 5.184 13.755 12.123 15.502l11.877 224.498h16l11.877-224.498z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 32c-106.039 0-192 85.961-192 192s85.961 192 192 192c106.039 0 192-85.961 192-192 0-106.039-85.961-192-192-192zM224 352c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM320 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM128 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM224 128v-32h64v32l-32 160z" /> +<glyph unicode="" d="M505.087 22.125l-274.317 249.729 12.767 12.799c10.447 10.477 16.094 24.015 16.959 37.805 0.501 0.225 1.001 0.456 1.479 0.721l51.495 32.201c6.967 8.196 6.458 21.134-1.142 28.751l-89.56 89.804c-7.595 7.617-20.499 8.131-28.672 1.142l-32.118-51.634c-0.263-0.483-0.495-0.983-0.72-1.487-13.751-0.868-27.25-6.528-37.699-17.003l-48.714-48.851c-10.449-10.478-16.092-24.013-16.959-37.802-0.502-0.225-1.002-0.458-1.482-0.723l-51.493-32.203c-6.971-8.195-6.458-21.132 1.138-28.748l89.56-89.802c7.597-7.619 20.498-8.131 28.675-1.143l32.114 51.635c0.264 0.479 0.494 0.98 0.721 1.483 13.751 0.869 27.252 6.525 37.699 17.002l14.146 14.186 249.061-275.057c7.218-7.972 18.35-9.259 24.737-2.856l25.178 25.244c6.382 6.404 5.098 17.566-2.853 24.807z" /> +<glyph unicode="" d="M160.504-32c-34.123 71.004-15.951 111.689 10.275 150.022 28.72 41.978 36.122 83.533 36.122 83.533 0 0 22.577-29.35 13.546-75.254 39.886 44.4 47.412 115.14 41.391 142.232 90.157-63.006 128.688-199.428 76.761-300.533 276.186 156.266 68.699 390.086 32.577 416.425 12.041-26.338 14.324-70.925-10-92.563-41.176 156.138-142.986 188.138-142.986 188.138 12.041-80.522-43.648-168.572-97.348-234.365-1.887 32.108-3.891 54.264-20.775 84.99-3.79-58.328-48.366-105.874-60.437-164.314-16.351-79.143 12.248-137.090 120.874-198.311z" /> +<glyph unicode="" d="M478.145 77.759l-158.145 263.512v106.729h16c8.8 0 16 7.2 16 16s-7.2 16-16 16h-160c-8.8 0-16-7.2-16-16s7.2-16 16-16h16v-106.729l-158.144-263.512c-36.221-60.367-8.256-109.759 62.144-109.759h320c70.4 0 98.365 49.392 62.145 109.759zM120.519 160l103.481 172.469v115.531h64v-115.531l103.482-172.469h-270.963z" /> +<glyph unicode="" d="M429.751 466.729l-2.297 13.271h-123.454l3.301-18.771c11.173-63.55 37.161-218.268 37.161-282.229 0-49.075-39.684-89-88.462-89-48.778 0-88.461 39.925-88.461 89 0 63.963 25.988 218.68 37.162 282.229l3.299 18.771h-123.454l-2.297-13.271c-13.538-78.211-36.249-219.593-36.249-287.729 0-116.346 94.206-211 210-211 115.794 0 210 94.654 210 211 0 68.133-22.711 209.516-36.249 287.729zM256 0c-98.149 0-178 80.299-178 179 0 40.386 8.46 108.538 18.083 173h58.173c-9.997-65.617-18.717-134.028-18.717-173 0-66.72 54.039-121 120.461-121 66.423 0 120.462 54.28 120.462 121 0 38.971-8.721 107.382-18.718 173h58.173c9.623-64.463 18.083-132.616 18.083-173 0-98.701-79.851-179-178-179z" /> +<glyph unicode="" d="M96-32h320l32 352h-384zM320 416v64h-128v-64h-160v-96l32 32h384l32-32v96h-160zM288 416h-64v32h64v-32z" /> +<glyph unicode="" d="M400 416h-288c-26.51 0-48-21.49-48-48v-16h384v16c0 26.51-21.49 48-48 48zM316.16 448l7.058-50.5h-134.436l7.057 50.5h120.321zM320 480h-128c-13.2 0-25.495-10.696-27.321-23.769l-9.357-66.962c-1.827-13.073 7.478-23.769 20.678-23.769h160c13.2 0 22.505 10.696 20.679 23.769l-9.357 66.962c-1.827 13.073-14.122 23.769-27.322 23.769v0zM408 320h-304c-17.6 0-30.696-14.341-29.103-31.869l26.206-288.263c1.593-17.527 17.297-31.868 34.897-31.868h240c17.6 0 33.304 14.341 34.897 31.868l26.205 288.263c1.594 17.528-11.502 31.869-29.102 31.869zM192 32h-48l-16 224h64v-224zM288 32h-64v224h64v-224zM368 32h-48v224h64l-16-224z" /> +<glyph unicode="" d="M480 352h-128v32c0 17.6-14.4 32-32 32h-128c-17.602 0-32-14.4-32-32v-32h-128c-17.6 0-32-14.4-32-32v-288c0-17.601 14.398-32 32-32h448c17.6 0 32 14.399 32 32v288c0 17.6-14.4 32-32 32zM192 383.942c0.017 0.020 0.037 0.041 0.057 0.058h127.886c0.021-0.017 0.041-0.038 0.059-0.058v-31.942h-128.002v31.942zM480 224h-64v-48c0-8.801-7.2-16-16-16h-32c-8.802 0-16 7.199-16 16v48h-192v-48c0-8.801-7.2-16-16-16h-32c-8.801 0-16 7.199-16 16v48h-64v32h448v-32z" /> +<glyph unicode="" d="M384 160.016l-91.41 91.411 219.41 164.575-64.005 63.998-274.26-109.721-86.35 86.353c-24.89 24.889-59.651 30.853-77.251 13.254-17.599-17.599-11.634-52.363 13.255-77.25l86.343-86.342-109.732-274.291 63.995-64.003 164.595 219.434 91.413-91.414v-127.99h63.997l31.996 95.994 95.994 31.998v63.996l-127.99-0.002z" /> +<glyph unicode="" d="M512 192l-64 128h-96v64c0 17.6-14.4 32-32 32h-288c-17.6 0-32-14.4-32-32v-256l32-32h40.583c-5.449-9.416-8.583-20.339-8.583-32 0-35.346 28.654-64 64-64s64 28.654 64 64c0 11.661-3.134 22.584-8.583 32h177.167c-5.449-9.416-8.584-20.339-8.584-32 0-35.346 28.654-64 64-64s64 28.654 64 64c0 11.661-3.135 22.584-8.584 32h40.584v96zM352 192v80h66.334l40-80h-106.334z" /> +<glyph unicode="" d="M352-32h160l-128 512h-96l16-128h-96l16 128h-96l-128-512h160l16 128h160l16-128zM184 160l16 128h112l16-128h-144z" /> +<glyph unicode="" d="M480 384v32l-224-64-224 64v-32l160-64v-128l-64-224h32l96 224 96-224h32l-64 224v128zM208 432c0 26.51 21.49 48 48 48s48-21.49 48-48c0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48z" /> +<glyph unicode="" d="M512 256h-50.462c-13.82 89.12-84.418 159.718-173.538 173.538v50.462h-64v-50.462c-89.12-13.82-159.718-84.418-173.538-173.538h-50.462v-64h50.462c13.82-89.12 84.418-159.718 173.538-173.538v-50.462h64v50.462c89.12 13.82 159.718 84.418 173.538 173.538h50.462v64zM396.411 256h-49.881c-9.642 27.275-31.255 48.889-58.53 58.53v49.881c53.757-12.245 96.166-54.655 108.411-108.411zM256 192c-17.673 0-32 14.327-32 32s14.327 32 32 32c17.673 0 32-14.327 32-32 0-17.673-14.327-32-32-32zM224 364.411v-49.881c-27.275-9.641-48.889-31.255-58.53-58.53h-49.881c12.245 53.756 54.655 96.166 108.411 108.411zM115.589 192h49.881c9.641-27.275 31.255-48.889 58.53-58.53v-49.881c-53.756 12.245-96.166 54.654-108.411 108.411zM288 83.589v49.881c27.275 9.642 48.889 31.255 58.53 58.53h49.881c-12.245-53.757-54.654-96.166-108.411-108.411z" /> +<glyph unicode="" d="M480 480l-224-64-224 64c0 0-2.25-25.849 0-64l224-70.045 224 70.045c2.249 38.151 0 64 0 64zM36.095 382.447c11.993-125.348 56.745-336.117 219.905-414.447 163.16 78.33 207.912 289.099 219.905 414.447l-219.905-82.679-219.905 82.679z" /> +<glyph unicode="" d="M320 406.706v-67.979c18.103-7.902 34.75-19.204 49.137-33.59 30.221-30.22 46.863-70.4 46.863-113.137s-16.643-82.917-46.863-113.137c-30.22-30.22-70.399-46.863-113.137-46.863s-82.917 16.643-113.137 46.863c-30.22 30.22-46.863 70.4-46.863 113.137s16.643 82.917 46.863 113.137c14.387 14.387 31.034 25.689 49.137 33.591v67.978c-92.524-27.54-160-113.236-160-214.706 0-123.712 100.289-224 224-224 123.712 0 224 100.288 224 224 0 101.47-67.475 187.166-160 214.706zM224 480h64v-256h-64z" /> +<glyph unicode="" d="M512 338.75l-45.253 45.25-89.373-89.376-50.75 50.751 89.375 89.375-45.25 45.25-89.375-89.375-57.374 57.375-43.313-43.312 256.001-256.001 43.312 43.312-57.376 57.376zM137.374 105.373c82.884-82.881 192.597-18.181 259.646 37.732l-221.912 221.912c-55.912-67.048-120.614-176.761-37.734-259.644zM95.999 127.998l63.997-63.998-95.996-95.996-63.998 63.997z" /> +<glyph unicode="" d="M224 82.745l-102.627 118.627 29.254 29.255 73.373-57.372 137.372 121.372 29.256-29.254zM415.886 416c0.039-0.033 0.081-0.075 0.114-0.115v-383.771c-0.033-0.039-0.075-0.081-0.114-0.114h-319.772c-0.040 0.033-0.081 0.075-0.114 0.114v383.772c0.033 0.040 0.075 0.081 0.115 0.114h-64.115v-384c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v384h-64.114zM320 416v32c0 17.673-14.327 32-32 32h-64c-17.673 0-32-14.327-32-32v-32h-64v-64h256v64h-64zM288 416h-64v32h64v-32z" /> +<glyph unicode="" d="M0 480h128v-128h-128zM192 448h320v-64h-320zM0 288h128v-128h-128zM192 256h320v-64h-320zM0 96h128v-128h-128zM192 64h320v-64h-320z" /> +<glyph unicode="" d="M192 448h320v-64h-320v64zM192 256h320v-64h-320v64zM192 64h320v-64h-320v64zM0 416c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM0 224c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM0 32c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64z" /> +<glyph unicode="" d="M192 64h320v-64h-320zM192 256h320v-64h-320zM192 448h320v-64h-320zM96 480v-128h-32v96h-32v32zM64 217v-25h64v-32h-96v73l64 30v25h-64v32h96v-73zM128 128v-160h-96v32h64v32h-64v32h64v32h-64v32z" /> +<glyph unicode="" d="M0 288h352v-64h-352v64zM0 384h352v-64h-352v64zM0 192h352v-64h-352v64zM0 96h352v-64h-352v64zM384 192l64-96 64 96h-128zM512 224l-64 96-64-96h128z" /> +<glyph unicode="" d="M32 384h448v-96h-448zM32 256h448v-96h-448zM32 128h448v-96h-448z" /> +<glyph unicode="" d="M488 96h-8v104c0 30.878-25.121 56-56 56h-136v64h8c13.2 0 24 10.8 24 24v80c0 13.2-10.8 24-24 24h-80c-13.2 0-24-10.8-24-24v-80c0-13.2 10.8-24 24-24h8v-64h-136c-30.878 0-56-25.122-56-56v-104h-8c-13.2 0-24-10.8-24-24v-80c0-13.2 10.8-24 24-24h80c13.2 0 24 10.8 24 24v80c0 13.2-10.8 24-24 24h-8v96h128v-96h-8c-13.2 0-24-10.8-24-24v-80c0-13.2 10.8-24 24-24h80c13.2 0 24 10.8 24 24v80c0 13.2-10.8 24-24 24h-8v96h128v-96h-8c-13.2 0-24-10.8-24-24v-80c0-13.2 10.8-24 24-24h80c13.2 0 24 10.8 24 24v80c0 13.2-10.8 24-24 24zM96 0h-64v64h64v-64zM288 0h-64v64h64v-64zM224 352v64h64v-64h-64zM480 0h-64v64h64v-64z" /> +<glyph unicode="" d="M512 151.229c0 41.045-28.339 75.45-66.498 84.74-1.621 64.35-54.229 116.031-118.931 116.031-37.896 0-71.633-17.747-93.427-45.366-12.221 15.799-31.345 25.98-52.854 25.98-36.905 0-66.821-29.937-66.821-66.861 0-3.218 0.24-6.38 0.682-9.477-5.611 1.012-11.383 1.569-17.285 1.569-53.499 0.001-96.866-43.393-96.866-96.921 0-53.531 43.367-96.924 96.865-96.924l328.131 0.006c48.069 0.092 87.004 39.106 87.004 87.223z" /> +<glyph unicode="" d="M445.502 299.97c-1.621 64.349-54.229 116.030-118.931 116.030-37.896 0-71.633-17.747-93.427-45.366-12.221 15.799-31.345 25.98-52.854 25.98-36.905 0-66.821-29.937-66.821-66.861 0-3.218 0.24-6.38 0.682-9.477-5.611 1.012-11.383 1.569-17.285 1.569-53.499 0.001-96.866-43.393-96.866-96.921 0-53.531 43.367-96.924 96.865-96.924h49.88l109.255-109.255 109.255 109.255 59.741 0.006c48.069 0.092 87.004 39.106 87.004 87.223 0 41.045-28.339 75.45-66.498 84.741zM256 64l-96 96h64v96h64v-96h64l-96-96z" /> +<glyph unicode="" d="M446.134 286.755c1.222 5.555 1.866 11.324 1.866 17.245 0 44.183-35.817 80-80 80-7.111 0-14.007-0.934-20.566-2.676-12.399 38.676-48.645 66.676-91.434 66.676-43.674 0-80.527-29.168-92.163-69.085-11.371 3.311-23.396 5.085-35.837 5.085-70.692 0-128-57.308-128-128 0-70.694 57.308-128 128-128h64v-96h128v96h112c44.183 0 80 35.816 80 80 0 39.36-28.427 72.081-65.866 78.755zM288 160v-96h-64v96h-80l112 112 112-112h-80z" /> +<glyph unicode="" d="M448 224h-80l-112-112-112 112h-80l-64-128v-32h512v32l-64 128zM0 32h512v-32h-512v32zM288 320v128h-64v-128h-112l144-144 144 144h-112z" /> +<glyph unicode="" d="M0 32h512v-32h-512zM512 96v-32h-512v32l64 128h128v-64h128v64h128zM112 320l144 144 144-144h-112v-128h-64v128z" /> +<glyph unicode="" d="M368 256l-128-128-128 128h80v192h96v-192zM240 128h-240v-128h480v128h-240zM448 64h-64v32h64v-32z" /> +<glyph unicode="" d="M240 128h-240v-128h480v128h-240zM448 64h-64v32h64v-32zM112 320l128 128 128-128h-80v-160h-96v160z" /> +<glyph unicode="" d="M240 448c-132.548 0-240-107.452-240-240 0-132.549 107.452-240 240-240 132.549 0 240 107.451 240 240 0 132.548-107.451 240-240 240zM375.795 128c4.29 20.227 6.998 41.696 7.879 64h63.723c-1.668-22.098-6.812-43.557-15.34-64h-56.262zM104.205 288c-4.29-20.227-6.998-41.696-7.879-64h-63.722c1.668 22.097 6.811 43.557 15.339 64h56.262zM343.018 288c4.807-20.481 7.699-41.927 8.64-64h-95.658v64h87.018zM256 320v93.669c7.295-2.123 14.522-5.685 21.614-10.685 13.291-9.37 26.006-23.804 36.77-41.743 7.441-12.401 13.876-26.208 19.248-41.242h-77.632zM165.616 361.242c10.764 17.939 23.478 32.374 36.77 41.743 7.091 5 14.319 8.562 21.614 10.685v-93.67h-77.632c5.373 15.033 11.808 28.84 19.248 41.242zM224 288v-64h-95.657c0.94 22.073 3.833 43.519 8.639 64h87.018zM47.944 128c-8.528 20.443-13.671 41.902-15.339 64h63.722c0.881-22.304 3.589-43.773 7.879-64h-56.262zM128.343 192h95.657v-64h-87.018c-4.806 20.48-7.699 41.927-8.639 64zM224 96v-93.67c-7.294 2.123-14.522 5.686-21.614 10.685-13.292 9.37-26.007 23.805-36.77 41.743-7.441 12.402-13.875 26.209-19.249 41.242h77.633zM314.384 54.758c-10.764-17.938-23.479-32.373-36.77-41.743-7.092-4.999-14.319-8.562-21.614-10.685v93.67h77.633c-5.373-15.033-11.808-28.84-19.249-41.242zM256 128v64h95.657c-0.94-22.073-3.833-43.52-8.64-64h-87.017zM383.674 224c-0.881 22.304-3.589 43.773-7.879 64h56.262c8.528-20.443 13.672-41.903 15.34-64h-63.723zM415.329 320h-47.95c-9.319 29.381-22.188 55.147-37.658 75.714 21.268-10.17 40.529-23.808 57.357-40.636 10.74-10.739 20.181-22.469 28.251-35.078zM92.922 355.078c16.829 16.829 36.090 30.466 57.357 40.636-15.471-20.567-28.338-46.333-37.658-75.714h-47.949c8.069 12.609 17.511 24.339 28.25 35.078zM64.672 96h47.949c9.32-29.381 22.188-55.147 37.659-75.715-21.268 10.17-40.529 23.808-57.357 40.637-10.74 10.739-20.182 22.469-28.251 35.078zM387.078 60.922c-16.828-16.829-36.090-30.467-57.357-40.637 15.471 20.567 28.339 46.334 37.658 75.715h47.95c-8.070-12.609-17.511-24.339-28.251-35.078z" /> +<glyph unicode="" d="M437.020 405.019c48.351-48.352 74.98-112.64 74.98-181.020s-26.629-132.667-74.98-181.019c-48.353-48.351-112.64-74.98-181.020-74.98-68.38 0-132.667 26.629-181.020 74.98-48.351 48.352-74.98 112.639-74.98 181.019 0 68.38 26.627 132.668 74.98 181.020 48.353 48.352 112.64 74.981 181.020 74.981 68.38 0 132.667-26.629 181.020-74.981zM414.392 65.607c31.529 31.53 52.493 70.804 61.136 113.531-6.737-9.918-13.181-13.597-17.172 8.603-4.11 36.195-37.354 13.074-58.258 25.93-22.002-14.829-71.453 28.831-63.049-20.412 12.967-22.211 70.004 29.725 41.574-17.271-18.137-32.808-66.321-105.466-60.053-143.129 0.791-54.872-56.067-11.442-75.657 6.76-13.178 36.46-4.491 100.187-38.949 118.043-37.401 1.624-69.502 5.023-83.997 46.835-8.723 29.914 9.282 74.447 41.339 81.322 46.925 29.483 63.687-34.527 107.695-35.717 13.664 14.297 50.908 18.843 53.996 34.875-28.875 5.095 36.634 24.279-2.764 35.191-21.735-2.556-35.739-22.537-24.184-39.479-42.119-9.821-43.468 60.952-83.955 38.629-1.029-35.295-66.111-11.443-22.518-4.286 14.978 6.544-24.43 25.508-3.14 22.062 10.458 0.568 45.666 12.906 36.138 21.201 19.605 12.17 36.080-29.145 55.269 0.941 13.854 23.133-5.81 27.404-23.175 15.678-9.79 10.962 17.285 34.638 41.166 44.869 7.959 3.41 15.561 5.268 21.373 4.742 12.029-13.896 34.275-16.303 35.439 1.671-29.791 14.267-62.638 21.804-96.646 21.804-48.811 0-95.235-15.512-133.654-44.195 10.325-4.73 16.186-10.619 6.239-18.148-7.728-23.027-39.085-53.938-66.612-49.562-14.293-24.648-23.706-51.803-27.73-80.264 23.056-7.628 28.372-22.725 23.418-27.775-11.748-10.244-18.968-24.765-22.688-40.661 7.505-45.918 29.086-88.238 62.635-121.788 42.308-42.307 98.559-65.607 158.392-65.607 59.832 0 116.084 23.3 158.392 65.607z" /> +<glyph unicode="" d="M476.698 442.679l-2.014 2.021c-47.074 47.067-124.097 47.067-171.163 0l-109.053-109.068c-47.067-47.066-47.067-124.088 0-171.155l2.013-2.013c3.916-3.924 8.073-7.462 12.368-10.729l39.924 39.925c-4.651 2.747-9.063 6.036-13.058 10.030l-2.021 2.021c-25.557 25.549-25.557 67.136 0 92.695l109.064 109.056c25.558 25.559 67.137 25.559 92.693 0l2.021-2.012c25.55-25.558 25.55-67.146 0-92.695l-49.343-49.343c8.566-21.154 12.624-43.7 12.269-66.193l76.302 76.302c47.067 47.068 47.067 124.089-0.002 171.158zM315.521 285.533c-3.916 3.916-8.073 7.461-12.368 10.72l-39.924-39.916c4.652-2.748 9.063-6.037 13.058-10.031l2.021-2.020c25.558-25.558 25.558-67.136 0-92.694l-109.065-109.067c-25.559-25.551-67.138-25.551-92.694 0l-2.021 2.021c-25.549 25.56-25.549 67.138 0 92.694l49.344 49.343c-8.567 21.153-12.623 43.701-12.269 66.193l-76.301-76.299c-47.068-47.066-47.068-124.089 0-171.162l2.013-2.016c47.076-47.064 124.096-47.064 171.164 0l109.055 109.059c47.067 47.066 47.067 124.097 0 171.163l-2.013 2.012z" /> +<glyph unicode="" d="M416 393.847c38.233 0 72.546 20.811 96 36.553v-297.845c-23.454-15.743-57.767-36.555-96-36.555s-72.546 11.335-96 27.078c-23.454 15.74-57.767 27.075-96 27.075-38.233 0-72.545-19.458-96-35.198v297.845c23.455 15.742 57.767 35.2 96 35.2s72.546-11.334 96-27.076c23.454-15.742 57.767-27.077 96-27.077zM64 480c17.673 0 32-14.327 32-32v-480h-64v480c0 17.673 14.327 32 32 32z" /> +<glyph unicode="" d="M348.916 316.476l-32.476 32.461-162.405-162.371c-26.907-26.896-26.907-70.524 0-97.422 26.902-26.896 70.53-26.896 97.437 0l194.886 194.854c44.857 44.831 44.857 117.531 0 162.363-44.833 44.852-117.556 44.852-162.391 0l-204.615-204.589c-0.145-0.152-0.306-0.288-0.438-0.423-62.551-62.548-62.551-163.928 0-226.453 62.527-62.528 163.934-62.528 226.494 0 0.137 0.137 0.258 0.284 0.41 0.438l0.016-0.017 139.666 139.646-32.493 32.46-139.665-139.631c-0.148-0.134-0.282-0.285-0.423-0.422-44.537-44.529-116.99-44.529-161.538 0-44.531 44.521-44.531 116.961 0 161.489 0.152 0.152 0.302 0.291 0.444 0.423l-0.023 0.030 204.64 204.583c26.856 26.869 70.572 26.869 97.443 0 26.856-26.867 26.856-70.574 0-97.42l-194.886-194.85c-8.968-8.961-23.527-8.961-32.486 0-8.947 8.943-8.947 23.516 0 32.46l162.403 162.391z" /> +<glyph unicode="" d="M419.661 331.792c38.822-27.515 70.685-64.546 92.339-107.792-47.561-94.979-144.343-160-256-160-31.283 0-61.396 5.106-89.589 14.542l38.978 38.978c16.529-3.65 33.486-5.52 50.611-5.52 44.779 0 88.427 12.743 126.223 36.852 30.081 19.188 55.572 44.888 74.718 75.149-18.526 29.283-43.007 54.275-71.825 73.247l34.545 34.544zM256 131c-11.362 0-22.376 1.488-32.864 4.267l156.593 156.592c2.781-10.486 4.271-21.497 4.271-32.859 0-70.692-57.308-128-128-128zM480 480h-26.869l-109.806-109.806c-27.538 8.962-56.877 13.806-87.325 13.806-111.659 0-208.441-65.021-256-160 21.329-42.596 52.564-79.154 90.597-106.534l-90.597-90.597v-26.869h26.869l453.131 453.131v26.869zM208 323c24.022 0 43.923-17.647 47.446-40.685l-54.762-54.762c-23.037 3.524-40.684 23.425-40.684 47.447 0 26.51 21.49 48 48 48zM55.058 224c19.146 30.262 44.637 55.962 74.717 75.148 1.959 1.25 3.938 2.461 5.929 3.65-4.979-13.664-7.704-28.411-7.704-43.798 0-29.262 9.825-56.224 26.349-77.781l-29.275-29.275c-28.036 18.821-51.877 43.386-70.016 72.056z" /> +<glyph unicode="" d="M256 320c-104.684 0-197.622-50.278-256-128 58.378-77.723 151.316-128 256-128 104.684 0 197.622 50.277 256 128-58.378 77.722-151.316 128-256 128zM224 256c17.673 0 32-14.327 32-32s-14.327-32-32-32-32 14.327-32 32 14.327 32 32 32zM386.808 127.352c-19.824-10.129-40.826-17.931-62.423-23.188-22.244-5.418-45.251-8.164-68.385-8.164-23.133 0-46.141 2.746-68.384 8.162-21.597 5.259-42.599 13.061-62.423 23.188-31.51 16.101-60.111 38.205-83.82 64.649 23.709 26.444 52.31 48.55 83.82 64.649 16.168 8.261 33.121 14.973 50.541 20.020-9.944-15.121-15.734-33.217-15.734-52.668 0-53.020 42.981-96 96-96 53.019 0 96 42.98 96 96 0 19.451-5.791 37.547-15.733 52.67 17.419-5.048 34.372-11.76 50.541-20.021 31.511-16.099 60.109-38.204 83.819-64.649-23.71-26.443-52.309-48.55-83.819-64.648zM430.459 358.139c-54.36 27.777-113.056 41.861-174.459 41.861-61.403 0-120.099-14.084-174.459-41.861-29.386-15.016-56.866-33.952-81.541-56.038v-54.603c27.669 29.283 60.347 53.877 96.097 72.145 49.81 25.452 103.609 38.357 159.903 38.357s110.093-12.905 159.902-38.358c35.751-18.268 68.429-42.862 96.098-72.145v54.603c-24.675 22.087-52.154 41.023-81.541 56.039z" /> +<glyph unicode="" d="M96 480v-512l160 160 160-160v512z" /> +<glyph unicode="" d="M128 416v-448l160 160 160-160v448zM384 480h-320v-448l32 32v384h288z" /> +<glyph unicode="" d="M256 269c-24.813 0-45-20.187-45-45s20.187-45 45-45c24.813 0 45 20.187 45 45 0 24.813-20.187 45-45 45zM256 320v0c53.020 0 96-42.98 96-96s-42.98-96-96-96c-53.020 0-96 42.98-96 96 0 53.020 42.98 96 96 96zM438.627 86.627c12.498-12.497 12.497-32.758 0-45.254-12.497-12.498-32.757-12.498-45.254 0l-32 32c-12.498 12.497-12.498 32.757 0 45.254 12.496 12.497 32.757 12.498 45.254 0l32-32zM150.627 374.627c12.498-12.497 12.497-32.758 0-45.254-12.497-12.498-32.757-12.498-45.254 0l-32 32c-12.498 12.497-12.498 32.757 0 45.254 12.496 12.497 32.757 12.498 45.254 0l32-32zM393.372 406.627c12.497 12.498 32.758 12.497 45.254 0 12.498-12.497 12.498-32.757 0.001-45.254l-32-32c-12.498-12.498-32.758-12.498-45.254 0-12.498 12.496-12.498 32.757 0 45.254l31.999 32zM105.373 118.627c12.497 12.498 32.757 12.497 45.254 0 12.498-12.497 12.498-32.757 0-45.254l-32-32c-12.497-12.498-32.757-12.498-45.254 0-12.497 12.496-12.498 32.757 0 45.254l32 32zM256 448c17.673 0 32-14.327 32-32v-32c0-17.673-14.327-32-32-32s-32 14.327-32 32v32c0 17.673 14.327 32 32 32zM256 96c17.673 0 32-14.326 32-32v-32c0-17.674-14.327-32-32-32s-32 14.326-32 32v32c0 17.674 14.327 32 32 32zM32 224c0 17.673 14.327 32 32 32h32c17.673 0 32-14.327 32-32 0-17.674-14.327-32-32-32h-32c-17.673 0-32 14.326-32 32zM384 224c0 17.673 14.326 32 32 32h32c17.674 0 32-14.327 32-32s-14.326-32-32-32h-32c-17.674 0-32 14.327-32 32z" /> +<glyph unicode="" d="M256 352c-70.692 0-128-57.308-128-128s57.308-128 128-128 128 57.308 128 128-57.308 128-128 128zM256 144v160c44.112 0 80-35.888 80-80s-35.888-80-80-80zM256 64c17.673 0 32-14.327 32-32v-32c0-17.673-14.327-32-32-32s-32 14.327-32 32v32c0 17.673 14.327 32 32 32zM256 384c-17.673 0-32 14.327-32 32v32c0 17.673 14.327 32 32 32s32-14.327 32-32v-32c0-17.673-14.327-32-32-32zM480 256c17.673 0 32-14.327 32-32s-14.327-32-32-32h-32c-17.673 0-32 14.327-32 32s14.327 32 32 32h32zM96 224c0-17.673-14.327-32-32-32h-32c-17.673 0-32 14.327-32 32s14.327 32 32 32h32c17.673 0 32-14.327 32-32zM414.392 110.863l22.628-22.628c12.496-12.496 12.496-32.758 0-45.255-12.497-12.496-32.759-12.496-45.255 0l-22.628 22.628c-12.496 12.496-12.496 32.758 0 45.255 12.497 12.496 32.759 12.496 45.255 0zM97.608 337.137l-22.628 22.628c-12.497 12.497-12.497 32.758 0 45.255 12.497 12.497 32.758 12.497 45.255 0l22.628-22.628c12.497-12.497 12.497-32.758 0-45.255s-32.758-12.497-45.255 0zM414.392 337.137c-12.496-12.496-32.758-12.496-45.255 0-12.496 12.497-12.496 32.758 0 45.255l22.628 22.627c12.496 12.497 32.758 12.497 45.255 0 12.496-12.497 12.496-32.758 0-45.255l-22.628-22.627zM97.608 110.863c12.496 12.496 32.758 12.496 45.254 0 12.497-12.497 12.497-32.759 0-45.255l-22.627-22.628c-12.497-12.496-32.758-12.496-45.255 0-12.497 12.497-12.497 32.759 0 45.255l22.628 22.628z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM64 224c0 106.039 85.961 192 192 192v-384c-106.039 0-192 85.961-192 192z" /> +<glyph unicode="" d="M512 281.475l-176.89 25.704-79.11 160.291-79.108-160.291-176.892-25.704 128-124.769-30.216-176.176 158.216 83.179 158.216-83.179-30.217 176.176 128.001 124.769zM256 103.251l-111.731-58.74 21.338 124.415-90.393 88.111 124.92 18.152 55.866 113.198 55.868-113.198 124.918-18.152-90.394-88.111 21.339-124.415-111.731 58.74z" /> +<glyph unicode="" d="M512 281.475l-176.89 25.704-79.11 160.291-79.108-160.291-176.892-25.704 128-124.769-30.216-176.176 158.216 83.179 158.216-83.179-30.217 176.176 128.001 124.769zM256 103.251l-0.471-0.248 0.471 285.384 55.868-113.198 124.918-18.152-90.394-88.111 21.339-124.415-111.731 58.74z" /> +<glyph unicode="" d="M512 281.475l-176.89 25.704-79.11 160.291-79.108-160.291-176.892-25.704 128-124.769-30.216-176.176 158.216 83.179 158.216-83.179-30.217 176.176 128.001 124.769z" /> +<glyph unicode="" d="M512 300.922c0-43.181-18.609-82.015-48.245-108.922h0.245l-160-160c-16-16-32-32-48-32s-32 16-48 32l-159.755 160c-29.636 26.907-48.245 65.741-48.245 108.922 0 81.229 65.849 147.078 147.078 147.078 43.181 0 82.015-18.609 108.922-48.245 26.907 29.636 65.741 48.245 108.922 48.245 81.228 0 147.078-65.849 147.078-147.078z" /> +<glyph unicode="" d="M512 300.922c0 81.229-65.85 147.078-147.078 147.078-43.181 0-82.015-18.609-108.922-48.245-26.907 29.636-65.741 48.245-108.922 48.245-81.229 0-147.078-65.849-147.078-147.078 0-43.181 18.609-82.015 48.245-108.922h-0.245l160-160c16-16 32-32 48-32s32 16 48 32l159.755 160c29.636 26.907 48.245 65.741 48.245 108.922zM420.734 239.384l-161.989-162.129c-0.839-0.839-1.766-1.766-2.745-2.74-0.98 0.975-1.907 1.901-2.745 2.74l-161.989 162.128c-17.583 15.964-27.266 37.819-27.266 61.539 0 45.809 37.269 83.078 83.078 83.078 23.72 0 45.575-9.683 61.538-27.266l47.384-52.19 47.384 52.189c15.964 17.584 37.818 27.267 61.538 27.267 45.809 0 83.078-37.269 83.078-83.078 0-23.72-9.684-45.575-27.266-61.538z" /> +<glyph unicode="" d="M512 300.922c0-43.181-18.609-82.015-48.245-108.922h0.245l-160-160c-16-16-32-32-48-32s-32 16-48 32l-159.755 160c-29.636 26.907-48.245 65.741-48.245 108.922 0 81.229 65.849 147.078 147.078 147.078 27.725 0 53.651-7.682 75.786-21.018l-46.864-74.982 112-64-64-160 176 192-112 64 39.446 59.17c11.966 3.144 24.523 4.83 37.476 4.83 81.228 0 147.078-65.849 147.078-147.078z" /> +<glyph unicode="" d="M464 192c36.5 0 16-96-16-96 16 0 0-80-32-80 0-32-32-48-64-48-135.176 0-87.632 33.825-224 48v256c120.461 36.134 240 126.712 240 208 26.5 0 96-32 0-192 0 0 80 0 96 0 48 0 32-96 0-96zM96 272v-256h32v-16h-64c-17.6 0-32 21.6-32 48v192c0 26.4 14.4 48 32 48h64v-16h-32z" /> +<glyph unicode="" d="M48 256c-36.5 0-16 96 16 96-16 0 0 80 32 80 0 32 32 48 64 48 135.176 0 87.632-33.825 224-48v-256c-120.461-36.134-240-126.712-240-208-26.5 0-96 32 0 192 0 0-80 0-96 0-48 0-32 96 0 96zM416 176v256h-32v16h64c17.6 0 32-21.6 32-48v-192c0-26.4-14.4-48-32-48h-64v16h32z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM256 180.62c57.975 0 113.115 15.403 160 42.46-7.287-89.219-76.564-159.080-160-159.080-83.434 0-152.711 69.936-160 159.152 46.885-27.056 102.025-42.532 160-42.532zM128 304c0 26.51 14.327 48 32 48s32-21.49 32-48c0-26.51-14.327-48-32-48-17.673 0-32 21.49-32 48zM320 304c0 26.51 14.327 48 32 48s32-21.49 32-48c0-26.51-14.327-48-32-48-17.673 0-32 21.49-32 48z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM352 352c17.674 0 32-21.49 32-48s-14.326-48-32-48-32 21.49-32 48 14.326 48 32 48zM160 352c17.673 0 32-21.49 32-48s-14.327-48-32-48-32 21.49-32 48 14.327 48 32 48zM256 32c-83.434 0-152.711 69.936-160 159.152 46.885-27.057 102.025-42.532 160-42.532 57.975 0 113.115 15.403 160 42.46-7.287-89.219-76.564-159.080-160-159.080z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM128 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM320 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM352.049 166.37l41.164-24.698c-27.981-46.535-78.958-77.672-137.213-77.672s-109.232 31.137-137.213 77.672l41.164 24.698c19.587-32.574 55.271-54.37 96.049-54.37s76.462 21.796 96.049 54.37z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM352 352c17.673 0 32-14.327 32-32s-14.327-32-32-32-32 14.327-32 32 14.327 32 32 32zM160 352c17.673 0 32-14.327 32-32s-14.327-32-32-32-32 14.327-32 32 14.327 32 32 32zM256 64c-58.255 0-109.232 31.137-137.213 77.672l41.164 24.698c19.587-32.574 55.271-54.37 96.049-54.37s76.462 21.796 96.049 54.37l41.164-24.698c-27.981-46.535-78.958-77.672-137.213-77.672z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM128 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM320 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM384 192v-32h-32v-48c0-26.51-21.49-48-48-48s-48 21.49-48 48v48h-128v32h256z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM160 352c17.673 0 32-14.327 32-32s-14.327-32-32-32-32 14.327-32 32 14.327 32 32 32zM384 160h-32v-48c0-26.51-21.49-48-48-48s-48 21.49-48 48v48h-128v32h256v-32zM352 288c-17.673 0-32 14.327-32 32s14.327 32 32 32 32-14.327 32-32-14.327-32-32-32z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM128 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM320 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM159.951 89.63l-41.164 24.698c27.981 46.535 78.958 77.672 137.213 77.672 58.254 0 109.231-31.137 137.213-77.672l-41.164-24.698c-19.587 32.574-55.271 54.37-96.049 54.37-40.779 0-76.462-21.796-96.049-54.37z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM352 352c17.673 0 32-14.327 32-32s-14.327-32-32-32-32 14.327-32 32 14.327 32 32 32zM160 352c17.673 0 32-14.327 32-32s-14.327-32-32-32-32 14.327-32 32 14.327 32 32 32zM352.049 89.63c-19.587 32.574-55.272 54.37-96.049 54.37-40.778 0-76.462-21.796-96.049-54.37l-41.164 24.698c27.98 46.535 78.958 77.672 137.213 77.672 58.254 0 109.232-31.137 137.213-77.672l-41.164-24.698z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM271.37 124.486c70.124 13.853 124.555 45.771 144.227 88.297-10.827-83.978-80.759-148.783-165.425-148.783-59.621 0-111.929 32.141-141.446 80.474 35.205-27.529 97.267-32.904 162.644-19.988zM320 304c0 26.51 14.327 48 32 48s32-21.49 32-48c0-26.51-14.327-48-32-48-17.673 0-32 21.49-32 48zM176 294.25c-20.898 0-38.667-7.828-45.258-18.75-1.77 2.933-2.742 16.087-2.742 19.375 0 15.533 21.49 28.125 48 28.125 26.51 0 48-12.592 48-28.125 0-3.288-0.972-16.442-2.742-19.375-6.591 10.922-24.36 18.75-45.258 18.75z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.614-256-256 0-141.385 114.614-256 256-256 141.385 0 256 114.615 256 256 0 141.386-114.615 256-256 256zM352 352c17.673 0 32-21.49 32-48s-14.327-48-32-48-32 21.49-32 48 14.327 48 32 48zM176 323.969c29.823 0 51-11.166 51-28.641 0-3.699 1.906-21.497-0.085-24.797-7.414 12.288-27.405 21.094-50.915 21.094s-43.501-8.806-50.915-21.094c-1.991 3.3-0.085 21.098-0.085 24.797 0 17.475 21.177 28.641 51 28.641zM250.172 64c-59.621 0-111.929 32.14-141.446 80.476 35.205-27.53 97.267-32.905 162.644-19.989 70.124 13.853 124.555 45.771 144.227 88.297-10.827-83.98-80.759-148.784-165.425-148.784z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM96 224v-32c0-70.4 57.6-128 128-128h64c70.4 0 128 57.6 128 128v32h-320zM192 101.506c-13.269 4.729-25.462 12.411-35.772 22.723-18.203 18.201-28.228 42.27-28.228 67.771h64v-90.494zM288 96h-64v96h64v-96zM355.772 124.229c-10.312-10.312-22.505-17.994-35.772-22.723v90.494h64c0-25.501-10.024-49.57-28.228-67.771zM112.676 288c0.001 0 0 0 0 0 4.884 0 9.054 3.528 9.862 8.345 3.079 18.342 18.834 31.655 37.462 31.655s34.383-13.313 37.462-31.655c0.808-4.816 4.978-8.345 9.861-8.345 4.884 0 9.054 3.528 9.862 8.344 0.541 3.218 0.814 6.467 0.814 9.656 0 31.981-26.019 58-58 58s-58-26.019-58-58c0-3.189 0.274-6.438 0.814-9.656 0.81-4.816 4.98-8.344 9.863-8.344zM304.676 288c0.001 0 0 0 0 0 4.885 0 9.056 3.528 9.862 8.345 3.079 18.342 18.834 31.655 37.462 31.655s34.383-13.313 37.462-31.655c0.808-4.816 4.979-8.345 9.861-8.345s9.054 3.528 9.861 8.344c0.541 3.218 0.814 6.467 0.814 9.656 0 31.981-26.019 58-58 58s-58-26.019-58-58c0-3.189 0.272-6.438 0.813-9.656 0.812-4.816 4.982-8.344 9.865-8.344z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.613-256 256-256c141.385 0 256 114.615 256 256s-114.615 256-256 256zM352 362c31.981 0 58-26.019 58-58 0-3.189-0.273-6.438-0.814-9.656-0.809-4.816-4.979-8.344-9.862-8.344s-9.054 3.528-9.861 8.345c-3.080 18.342-18.835 26.655-37.463 26.655s-34.383-8.313-37.462-26.655c-0.808-4.816-4.978-8.345-9.861-8.345-0.001 0 0 0-0.001 0-4.883 0-9.053 3.528-9.861 8.344-0.542 3.218-0.815 6.467-0.815 9.656 0 31.981 26.019 58 58 58zM160 362c31.981 0 58-26.019 58-58 0-3.189-0.274-6.438-0.814-9.656-0.809-4.816-4.978-8.344-9.862-8.344-4.884 0-9.053 3.528-9.861 8.345-3.080 18.342-18.835 26.655-37.463 26.655s-34.383-8.313-37.462-26.655c-0.808-4.816-4.978-8.345-9.861-8.345 0 0 0 0 0 0-4.883 0-9.053 3.528-9.862 8.344-0.541 3.218-0.815 6.467-0.815 9.656 0 31.981 26.019 58 58 58zM96 192h96v-123.923c-55.047 14.303-96 64.562-96 123.923zM224 64v128h64v-128h-64zM320 68.077v123.923h96c0-59.361-40.952-109.62-96-123.923z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM400 352c8.8 0 16-7.2 16-16v-48c0-17.6-14.4-32-32-32h-64c-17.6 0-32 14.4-32 32h-64c0-17.6-14.4-32-32-32h-64c-17.6 0-32 14.4-32 32v48c0 8.8 7.2 16 16 16h96c8.8 0 16-7.2 16-16v-16h64v16c0 8.8 7.2 16 16 16h96zM256 96c46.604 0 87.386 24.909 109.773 62.139l27.44-16.467c-27.983-46.535-78.958-77.672-137.213-77.672-24.229 0-47.192 5.398-67.77 15.041l16.581 27.639c15.677-6.857 32.982-10.68 51.189-10.68z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.613-256 256-256c141.385 0 256 114.615 256 256s-114.615 256-256 256zM256 64c-24.229 0-47.192 5.398-67.771 15.041l16.581 27.638c15.678-6.856 32.983-10.679 51.19-10.679 46.604 0 87.386 24.909 109.771 62.139l27.441-16.467c-27.982-46.535-78.957-77.672-137.212-77.672zM416 288c0-17.6-14.4-32-32-32h-64c-17.6 0-32 14.4-32 32h-64c0-17.6-14.4-32-32-32h-64c-17.6 0-32 14.4-32 32v48c0 8.8 7.2 16 16 16h96c8.8 0 16-7.2 16-16v-16h64v16c0 8.8 7.2 16 16 16h96c8.8 0 16-7.2 16-16v-48z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM352.049 89.63c-19.587 32.574-55.272 54.37-96.049 54.37-40.778 0-76.462-21.796-96.049-54.37l-41.164 24.698c27.98 46.535 78.958 77.672 137.213 77.672 58.254 0 109.232-31.137 137.213-77.672l-41.164-24.698zM383.521 339.88c2.142-8.572-3.070-17.259-11.641-19.402-8.813-2.225-19.261-6.060-28.468-10.675 5.324-5.715 8.587-13.376 8.587-21.803 0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32 0 0.585 0.018 1.165 0.049 1.742 1.016 23.727 22.606 39.473 40.796 48.569 17.371 8.685 34.551 13.030 35.274 13.211 8.573 2.144 17.259-3.069 19.403-11.642zM128.479 339.88c2.144 8.573 10.83 13.786 19.403 11.642 0.723-0.181 17.903-4.526 35.274-13.211 18.19-9.096 39.78-24.842 40.796-48.569 0.031-0.577 0.049-1.157 0.049-1.742 0-17.673-14.327-32-32-32s-32 14.327-32 32c0 8.427 3.263 16.088 8.587 21.803-9.207 4.615-19.655 8.45-28.468 10.675-8.571 2.143-13.783 10.83-11.641 19.402z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM288.047 289.742c1.016 23.727 22.605 39.474 40.796 48.569 17.371 8.686 34.552 13.030 35.274 13.211 8.573 2.144 17.26-3.069 19.403-11.642 2.143-8.573-3.069-17.259-11.642-19.403-8.812-2.225-19.261-6.060-28.468-10.675 5.324-5.715 8.587-13.376 8.587-21.803 0-17.673-14.327-32-32-32s-32 14.327-32 32c0.001 0.585 0.019 1.166 0.050 1.743zM128.479 339.88c2.144 8.573 10.83 13.786 19.403 11.642 0.723-0.181 17.903-4.526 35.274-13.211 18.19-9.096 39.78-24.842 40.796-48.569 0.031-0.577 0.049-1.157 0.049-1.742 0-17.673-14.327-32-32-32s-32 14.327-32 32c0 8.427 3.263 16.088 8.587 21.803-9.207 4.615-19.655 8.45-28.468 10.675-8.571 2.143-13.783 10.83-11.641 19.402zM352.049 89.63c-19.587 32.574-55.272 54.37-96.049 54.37-40.778 0-76.462-21.796-96.049-54.37l-41.164 24.698c27.98 46.535 78.958 77.672 137.213 77.672 58.254 0 109.232-31.137 137.213-77.672l-41.164-24.698z" /> +<glyph unicode="" d="M319.998 256c-17.673 0-32 14.327-31.999 32.001 0 0.585 0.018 1.165 0.049 1.742 1.016 23.727 22.606 39.473 40.796 48.569 17.371 8.685 34.551 13.030 35.274 13.211 8.573 2.144 17.259-3.069 19.403-11.642 2.142-8.573-3.070-17.259-11.642-19.403-8.813-2.225-19.261-6.060-28.468-10.675 5.324-5.715 8.587-13.376 8.587-21.803 0-17.673-14.327-32-32-32zM140.121 320.478c-8.572 2.143-13.784 10.83-11.641 19.402 2.143 8.573 10.83 13.786 19.403 11.642 0.722-0.181 17.903-4.525 35.274-13.211 18.191-9.095 39.78-24.842 40.796-48.569 0.031-0.577 0.049-1.158 0.049-1.742 0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32 0 8.427 3.263 16.088 8.587 21.803-9.207 4.615-19.656 8.45-28.468 10.675zM256 112c40.777 0 76.462 21.796 96.049 54.37l41.164-24.698c-27.981-46.535-78.958-77.672-137.213-77.672s-109.232 31.137-137.213 77.672l41.164 24.698c19.587-32.574 55.271-54.37 96.049-54.37zM512 448c0 22.758-4.762 44.4-13.326 64-16.788-38.418-48.224-68.966-87.247-84.589-43.097 32.98-96.968 52.589-155.427 52.589s-112.33-19.609-155.427-52.589c-39.024 15.623-70.459 46.171-87.247 84.589-8.564-19.6-13.326-41.242-13.326-64 0-36.787 12.425-70.664 33.294-97.689-21.185-37.271-33.294-80.375-33.294-126.311 0-141.385 114.615-256 256-256s256 114.615 256 256c0 45.936-12.109 89.040-33.294 126.311 20.869 27.025 33.294 60.902 33.294 97.689zM256 16c-114.875 0-208 93.125-208 208s93.125 208 208 208 208-93.125 208-208-93.125-208-208-208z" /> +<glyph unicode="" d="M512 448c0 22.758-4.762 44.4-13.326 64-16.788-38.418-48.224-68.966-87.247-84.589-43.097 32.98-96.968 52.589-155.427 52.589s-112.33-19.609-155.427-52.589c-39.024 15.623-70.459 46.171-87.247 84.589-8.564-19.6-13.326-41.242-13.326-64 0-36.787 12.425-70.664 33.294-97.689-21.185-37.271-33.294-80.375-33.294-126.311 0-141.385 114.615-256 256-256s256 114.615 256 256c0 45.936-12.109 89.040-33.294 126.311 20.869 27.025 33.294 60.902 33.294 97.689zM288.047 289.742c1.016 23.727 22.605 39.474 40.796 48.569 17.371 8.686 34.552 13.030 35.274 13.211 8.573 2.144 17.26-3.069 19.403-11.642 2.143-8.573-3.069-17.259-11.642-19.403-8.812-2.225-19.261-6.060-28.468-10.675 5.324-5.715 8.587-13.376 8.587-21.803 0-17.673-14.327-32-32-32s-32 14.327-32 32c0.001 0.585 0.019 1.166 0.050 1.743zM128.479 339.88c2.144 8.573 10.83 13.786 19.403 11.642 0.723-0.181 17.903-4.526 35.274-13.211 18.19-9.096 39.78-24.842 40.796-48.569 0.031-0.577 0.049-1.157 0.049-1.742 0-17.673-14.327-32-32-32s-32 14.327-32 32c0 8.427 3.263 16.088 8.587 21.803-9.207 4.615-19.655 8.45-28.468 10.675-8.571 2.143-13.783 10.83-11.641 19.402zM256 64c-58.255 0-109.232 31.137-137.213 77.672l41.164 24.698c19.587-32.574 55.271-54.37 96.049-54.37 40.777 0 76.462 21.796 96.049 54.37l41.164-24.698c-27.981-46.535-78.958-77.672-137.213-77.672z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM192 128c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM320 304c0 26.51 14.327 48 32 48s32-21.49 32-48c0-26.51-14.327-48-32-48-17.673 0-32 21.49-32 48zM128 304c0 26.51 14.327 48 32 48s32-21.49 32-48c0-26.51-14.327-48-32-48-17.673 0-32 21.49-32 48z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM160 256c-17.673 0-32 21.49-32 48s14.327 48 32 48 32-21.49 32-48-14.327-48-32-48zM256 64c-35.346 0-64 28.654-64 64s28.654 64 64 64c35.346 0 64-28.654 64-64s-28.654-64-64-64zM352 256c-17.673 0-32 21.49-32 48s14.327 48 32 48 32-21.49 32-48-14.327-48-32-48z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM128 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM320 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM363.053 160h32.432c4.623-36.253-16.226-72.265-51.979-85.28-41.452-15.088-87.45 6.358-102.54 47.808-9.054 24.872-36.653 37.741-61.524 28.686-22.781-8.294-35.478-32.149-30.494-55.212h-32.43c-4.621 36.254 16.225 72.264 51.978 85.28 41.452 15.089 87.451-6.358 102.541-47.807 9.052-24.874 36.653-37.741 61.522-28.686 22.781 8.292 35.478 32.149 30.494 55.211z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.613-256 256-256c141.385 0 256 114.615 256 256s-114.615 256-256 256zM352 352c17.673 0 32-14.327 32-32s-14.327-32-32-32-32 14.327-32 32c0 17.673 14.327 32 32 32zM160 352c17.673 0 32-14.327 32-32s-14.327-32-32-32-32 14.327-32 32c0 17.673 14.327 32 32 32zM343.505 74.72c-41.451-15.090-87.45 6.356-102.54 47.807-9.054 24.871-36.653 37.739-61.524 28.686-22.781-8.294-35.479-32.148-30.494-55.212h-32.43c-4.622 36.254 16.225 72.266 51.978 85.28 41.452 15.090 87.451-6.356 102.541-47.807 9.054-24.871 36.653-37.738 61.523-28.685 22.781 8.292 35.479 32.147 30.494 55.211h32.432c4.62-36.253-16.227-72.266-51.98-85.28z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM128 320c0-17.673 14.327-32 32-32s32 14.327 32 32-14.327 32-32 32-32-14.327-32-32zM320 320c0-17.673 14.327-32 32-32s32 14.327 32 32-14.327 32-32 32-32-14.327-32-32zM192 128h128v-32h-128v32z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.613-256 256-256c141.385 0 256 114.615 256 256s-114.615 256-256 256zM320 96h-128v32h128v-32zM352 352c17.673 0 32-14.327 32-32s-14.327-32-32-32-32 14.327-32 32c0 17.673 14.327 32 32 32zM160 352c17.673 0 32-14.327 32-32s-14.327-32-32-32-32 14.327-32 32c0 17.673 14.327 32 32 32z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM372.87 179.19l11.244-38.388-218.504-64.001-11.244 38.388zM128 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM320 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM352 352c17.673 0 32-14.327 32-32s-14.327-32-32-32-32 14.327-32 32 14.327 32 32 32zM128 320c0 17.673 14.327 32 32 32s32-14.327 32-32-14.327-32-32-32-32 14.327-32 32zM165.622 76.807l-11.244 38.387 218.5 64 11.244-38.387-218.5-64z" /> +<glyph unicode="" d="M160 416v-173.904c-40.455 11.228-50.296 16.904-93 16.904-36.944 0-67-30.056-67-67 0-36.943 30.056-67 67-67 51.986 0 75.975-19.361 102.855-57.545 0.798-1.134 1.581-2.289 2.355-3.455h-44.21v-96h320v96h-28.502c2.151 31.831 11.096 40.56 22.042 51.223 8.445 8.226 18.956 18.464 26.638 37.015 8.065 19.477 11.822 44.823 11.822 79.762v32.49c0 30.969-25.634 56.163-57.143 56.163-5.235 0-10.438-0.712-15.45-2.095-10.498 9.855-24.501 15.482-39.407 15.482-5.234 0-10.438-0.712-15.449-2.095-10.499 9.855-24.503 15.482-39.408 15.482-9.018 0-17.55-2.071-25.143-5.744v74.317c0 35.347-28.653 64-64 64-35.346 0-64-28.653-64-64zM416 16c0-8.836-7.163-16-16-16s-16 7.164-16 16 7.163 16 16 16 16-7.164 16-16zM256 413v-128h32v3.266c0 13.323 11.279 24.163 25.143 24.163 8.685 0 16.645-4.234 21.293-11.327l8.122-12.394 12.979 7.149c3.781 2.083 8.091 3.184 12.463 3.184 8.685 0 16.644-4.234 21.291-11.326l8.122-12.395 12.98 7.149c3.781 2.083 8.091 3.184 12.464 3.184 13.863 0 25.143-10.84 25.143-24.163v-32.49c0-63.281-19.103-76.044-32.975-89.556-14.16-13.794-29.992-29.245-33.364-75.444h-167.187c-4.132 7.878-8.632 15.35-13.545 22.329-33.929 48.196-69.773 73.671-133.929 73.671-15.991 0-29 15.010-29 31s13.009 30 29 30c42.83 0 52.706-6.207 93-18.48 11.371-3.062 22.635-5.961 31.667-7.938l0.333 218.418c0 17.645 14.355 32 32 32s32-14.355 32-32z" /> +<glyph unicode="" d="M448 288h-173.904c11.228 40.455 16.904 50.296 16.904 93 0 36.944-30.056 67-67 67-36.943 0-67-30.056-67-67 0-51.986-19.361-75.975-57.545-102.855-1.134-0.798-2.289-1.581-3.455-2.355v44.21h-96v-320h96v28.502c31.831-2.151 40.56-11.096 51.223-22.042 8.226-8.445 18.464-18.956 37.015-26.638 19.477-8.065 44.823-11.822 79.762-11.822h32.49c30.969 0 56.163 25.634 56.163 57.143 0 5.235-0.712 10.438-2.095 15.45 9.855 10.498 15.482 24.501 15.482 39.407 0 5.234-0.712 10.438-2.095 15.449 9.855 10.499 15.482 24.503 15.482 39.408 0 9.018-2.071 17.55-5.744 25.143h74.317c35.347 0 64 28.653 64 64 0 35.346-28.653 64-64 64zM48 32c-8.836 0-16 7.163-16 16s7.164 16 16 16 16-7.163 16-16-7.164-16-16-16zM445 192h-128v-32h3.266c13.323 0 24.163-11.279 24.163-25.143 0-8.685-4.234-16.645-11.327-21.293l-12.394-8.122 7.149-12.979c2.083-3.781 3.184-8.091 3.184-12.463 0-8.685-4.234-16.644-11.326-21.291l-12.395-8.122 7.149-12.98c2.083-3.781 3.184-8.091 3.184-12.464 0-13.863-10.84-25.143-24.163-25.143h-32.49c-63.281 0-76.044 19.103-89.556 32.975-13.794 14.16-29.245 29.992-75.444 33.364v167.187c7.878 4.132 15.35 8.632 22.329 13.545 48.196 33.929 73.671 69.773 73.671 133.929 0 15.991 15.010 29 31 29s30-13.009 30-29c0-42.83-6.207-52.706-18.48-93-3.062-11.371-5.961-22.635-7.938-31.667l218.418-0.333c17.645 0 32-14.355 32-32s-14.355-32-32-32z" /> +<glyph unicode="" d="M160 32v173.904c-40.455-11.228-50.296-16.904-93-16.904-36.944 0-67 30.056-67 67 0 36.943 30.056 67 67 67 51.986 0 75.975 19.361 102.855 57.545 0.798 1.134 1.581 2.289 2.355 3.455h-44.21v96h320v-96h-28.502c2.151-31.831 11.096-40.56 22.042-51.223 8.445-8.226 18.956-18.464 26.638-37.015 8.065-19.477 11.822-44.823 11.822-79.762v-32.49c0-30.969-25.634-56.163-57.143-56.163-5.235 0-10.438 0.712-15.45 2.095-10.498-9.855-24.501-15.482-39.407-15.482-5.234 0-10.438 0.712-15.449 2.095-10.499-9.855-24.503-15.482-39.408-15.482-9.018 0-17.55 2.071-25.143 5.744v-74.317c0-35.347-28.653-64-64-64-35.346 0-64 28.653-64 64zM416 432c0 8.836-7.163 16-16 16s-16-7.164-16-16 7.163-16 16-16 16 7.164 16 16zM256 35v128h32v-3.266c0-13.323 11.279-24.163 25.143-24.163 8.685 0 16.645 4.234 21.293 11.327l8.122 12.394 12.979-7.149c3.781-2.083 8.091-3.184 12.463-3.184 8.685 0 16.644 4.234 21.291 11.326l8.122 12.395 12.98-7.149c3.781-2.083 8.091-3.184 12.464-3.184 13.863 0 25.143 10.84 25.143 24.163v32.49c0 63.281-19.103 76.044-32.975 89.556-14.16 13.794-29.992 29.245-33.364 75.444h-167.187c-4.132-7.878-8.632-15.35-13.545-22.329-33.929-48.196-69.773-73.671-133.929-73.671-15.991 0-29-15.010-29-31s13.009-30 29-30c42.83 0 52.706 6.207 93 18.48 11.371 3.062 22.635 5.961 31.667 7.938l0.333-218.418c0-17.645 14.355-32 32-32s32 14.355 32 32z" /> +<glyph unicode="" d="M64 288h173.904c-11.228 40.455-16.904 50.296-16.904 93 0 36.944 30.056 67 67 67 36.943 0 67-30.056 67-67 0-51.986 19.361-75.975 57.545-102.855 1.134-0.798 2.289-1.581 3.455-2.355v44.21h96v-320h-96v28.502c-31.831-2.151-40.56-11.096-51.223-22.042-8.226-8.445-18.464-18.956-37.015-26.638-19.477-8.065-44.823-11.822-79.762-11.822h-32.49c-30.969 0-56.163 25.634-56.163 57.143 0 5.235 0.712 10.438 2.095 15.45-9.855 10.498-15.482 24.501-15.482 39.407 0 5.234 0.712 10.438 2.095 15.449-9.855 10.499-15.482 24.503-15.482 39.408 0 9.018 2.071 17.55 5.744 25.143h-74.317c-35.347 0-64 28.653-64 64 0 35.346 28.653 64 64 64zM464 32c8.836 0 16 7.163 16 16s-7.164 16-16 16-16-7.163-16-16 7.164-16 16-16zM67 192h128v-32h-3.266c-13.323 0-24.163-11.279-24.163-25.143 0-8.685 4.234-16.645 11.327-21.293l12.394-8.122-7.149-12.979c-2.083-3.781-3.184-8.091-3.184-12.463 0-8.685 4.234-16.644 11.326-21.291l12.395-8.122-7.149-12.98c-2.083-3.781-3.184-8.091-3.184-12.464 0-13.863 10.84-25.143 24.163-25.143h32.49c63.281 0 76.044 19.103 89.556 32.975 13.794 14.16 29.245 29.992 75.444 33.364v167.187c-7.878 4.132-15.35 8.632-22.329 13.545-48.196 33.929-73.671 69.773-73.671 133.929 0 15.991-15.010 29-31 29s-30-13.009-30-29c0-42.83 6.207-52.706 18.48-93 3.062-11.371 5.961-22.635 7.938-31.667l-218.418-0.333c-17.645 0-32-14.355-32-32s14.355-32 32-32z" /> +<glyph unicode="" d="M256 400.638l-172.417-368.638h344.834l-172.417 368.638zM256 480v0c11.035 0 22.070-7.441 30.442-22.324l218.536-435.556c16.745-29.766 2.5-54.12-31.651-54.12h-434.654c-34.152 0-48.395 24.354-31.652 54.12l218.537 435.556c8.372 14.883 19.407 22.324 30.442 22.324zM224 96c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM256 288c17.673 0 32-14.327 32-32l-10-96h-44l-10 96c0 17.673 14.327 32 32 32z" /> +<glyph unicode="" d="M256 432c-55.559 0-107.792-21.636-147.078-60.922s-60.922-91.519-60.922-147.078c0-55.559 21.636-107.792 60.922-147.078 39.286-39.286 91.519-60.922 147.078-60.922 55.559 0 107.792 21.636 147.078 60.922 39.286 39.286 60.922 91.519 60.922 147.078 0 55.559-21.636 107.792-60.922 147.078-39.286 39.286-91.519 60.922-147.078 60.922zM256 480v0c141.385 0 256-114.615 256-256s-114.615-256-256-256c-141.385 0-256 114.615-256 256 0 141.385 114.615 256 256 256zM224 128h64v-64h-64zM224 384h64v-192h-64z" /> +<glyph unicode="" d="M224 128h64v-64h-64zM352 352c17.673 0 32-14.327 32-32v-96l-96-64h-64v32l96 64v32h-160v64h192zM256 432c-55.559 0-107.792-21.636-147.078-60.922s-60.922-91.519-60.922-147.078c0-55.559 21.636-107.792 60.922-147.078 39.286-39.286 91.519-60.922 147.078-60.922 55.559 0 107.792 21.636 147.078 60.922 39.286 39.286 60.922 91.519 60.922 147.078 0 55.559-21.636 107.792-60.922 147.078-39.286 39.286-91.519 60.922-147.078 60.922zM256 480v0c141.385 0 256-114.615 256-256s-114.615-256-256-256c-141.385 0-256 114.615-256 256 0 141.385 114.615 256 256 256z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 16c-114.875 0-208 93.125-208 208s93.125 208 208 208 208-93.125 208-208-93.125-208-208-208zM224 352h64v-64h-64zM320 96h-128v32h32v96h-32v32h96v-128h32z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM224 384h64v-64h-64v64zM320 64h-128v32h32v128h-32v32h96v-160h32v-32z" /> +<glyph unicode="" d="M0 224c0-141.385 114.615-256 256-256 141.386 0 256 114.615 256 256s-114.614 256-256 256c-141.385 0-256-114.615-256-256zM448 224c0-36.618-10.256-70.84-28.044-99.956l-263.911 263.912c29.115 17.789 63.337 28.044 99.955 28.044 106.038 0 192-85.961 192-192zM64 224c0 36.618 10.256 70.839 28.045 99.956l263.911-263.912c-29.117-17.789-63.338-28.044-99.956-28.044-106.038 0-192 85.961-192 192z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM384 306.745l-82.744-82.745 82.744-82.744v-45.256h-45.256l-82.744 82.744-82.745-82.744h-45.255v45.256l82.745 82.744-82.745 82.745v45.255h45.255l82.745-82.745 82.744 82.745h45.256v-45.255z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM208 64l-106 138 47 49 59-75 185 151 23-23-208-240z" /> +<glyph unicode="" d="M512 112l-144 368h-224l-144-144v-224l144-144h224l144 144v224l-144 144zM288 64h-64v64h64v-64zM288 192h-64v192h64v-192z" /> +<glyph unicode="" d="M507.331 68.67c-0.002 0.002-0.004 0.004-0.006 0.005l-155.322 155.325 155.322 155.325c0.002 0.002 0.004 0.003 0.006 0.005 1.672 1.673 2.881 3.627 3.656 5.708 2.123 5.688 0.912 12.341-3.662 16.915l-73.373 73.373c-4.574 4.573-11.225 5.783-16.914 3.66-2.080-0.775-4.035-1.984-5.709-3.655 0-0.002-0.002-0.003-0.004-0.005l-155.324-155.326-155.324 155.325c-0.002 0.002-0.003 0.003-0.005 0.005-1.673 1.671-3.627 2.88-5.707 3.655-5.69 2.124-12.341 0.913-16.915-3.66l-73.374-73.374c-4.574-4.574-5.784-11.226-3.661-16.914 0.776-2.080 1.985-4.036 3.656-5.708 0.002-0.001 0.003-0.003 0.005-0.005l155.325-155.324-155.325-155.326c-0.001-0.002-0.003-0.003-0.004-0.005-1.671-1.673-2.88-3.627-3.657-5.707-2.124-5.688-0.913-12.341 3.661-16.915l73.374-73.373c4.575-4.574 11.226-5.784 16.915-3.661 2.080 0.776 4.035 1.985 5.708 3.656 0.001 0.002 0.003 0.003 0.005 0.005l155.324 155.325 155.324-155.325c0.002-0.001 0.004-0.003 0.006-0.004 1.674-1.672 3.627-2.881 5.707-3.657 5.689-2.123 12.342-0.913 16.914 3.661l73.373 73.374c4.574 4.574 5.785 11.227 3.662 16.915-0.776 2.080-1.985 4.034-3.657 5.707z" /> +<glyph unicode="" d="M432 416l-240-240-112 112-80-80 192-192 320 320z" /> +<glyph unicode="" d="M198.717 21.152l-198.934 195.8 98.689 97.135 100.245-98.666 214.81 211.426 98.689-97.135-313.499-308.56zM53.956 216.952l144.762-142.481 259.328 255.241-44.518 43.816-214.81-211.426-100.245 98.667-44.517-43.817z" /> +<glyph unicode="" d="M64 352h64v-96h32v192c0 17.6-14.4 32-32 32h-64c-17.6 0-32-14.4-32-32v-192h32v96zM64 448h64v-64h-64v64zM480 448v32h-96c-17.601 0-32-14.4-32-32v-160c0-17.6 14.399-32 32-32h96v32h-96v160h96zM320 400v48c0 17.6-14.4 32-32 32h-96v-224h96c17.6 0 32 14.4 32 32v48c0 17.6-4.4 32-22 32 17.6 0 22 14.4 22 32zM288 288h-64v64h64v-64zM288 384h-64v64h64v-64zM416 192l-208-224-112 144 41 35 71-74 176 151z" /> +<glyph unicode="" d="M0 272v-96c0-8.836 7.164-16 16-16h480c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16h-480c-8.836 0-16-7.164-16-16z" /> +<glyph unicode="" d="M496 288h-176v176c0 8.836-7.164 16-16 16h-96c-8.836 0-16-7.164-16-16v-176h-176c-8.836 0-16-7.164-16-16v-96c0-8.836 7.164-16 16-16h176v-176c0-8.836 7.164-16 16-16h96c8.836 0 16 7.164 16 16v176h176c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16z" /> +<glyph unicode="" d="M192 224h-160v64h160v64l96-96-96-96zM512 480v-416l-192-96v96h-192v128h32v-96h160v288l128 64h-288v-128h-32v160z" /> +<glyph unicode="" d="M384 160v64h-160v64h160v64l96-96zM352 192v-128h-160v-96l-192 96v416h352v-160h-32v128h-256l128-64v-288h128v96z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 16c-114.875 0-208 93.125-208 208s93.125 208 208 208 208-93.125 208-208-93.125-208-208-208zM192 336l192-112-192-112z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 16c-114.875 0-208 93.125-208 208s93.125 208 208 208 208-93.125 208-208-93.125-208-208-208zM160 320h64v-192h-64zM288 320h64v-192h-64z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 16c-114.875 0-208 93.125-208 208s93.125 208 208 208 208-93.125 208-208-93.125-208-208-208zM160 320h192v-192h-192z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM352 144l-112 80 112 80zM224 144l-112 80 112 80z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 16c-114.875 0-208 93.125-208 208s93.125 208 208 208 208-93.125 208-208-93.125-208-208-208zM160 304l112-80-112-80zM288 304l112-80-112-80z" /> +<glyph unicode="" d="M96 416l320-192-320-192z" /> +<glyph unicode="" d="M64 416h160v-384h-160zM288 416h160v-384h-160z" /> +<glyph unicode="" d="M64 416h384v-384h-384z" /> +<glyph unicode="" d="M288 400v-160l160 160v-352l-160 160v-160l-176 176z" /> +<glyph unicode="" d="M256 48v160l-160-160v352l160-160v160l176-176z" /> +<glyph unicode="" d="M64 32v384h64v-176l160 160v-160l160 160v-352l-160 160v-160l-160 160v-176z" /> +<glyph unicode="" d="M448 416v-384h-64v176l-160-160v160l-160-160v352l160-160v160l160-160v176z" /> +<glyph unicode="" d="M128 32v384h64v-176l160 160v-352l-160 160v-176z" /> +<glyph unicode="" d="M384 416v-384h-64v176l-160-160v352l160-160v176z" /> +<glyph unicode="" d="M0 96h512v-64h-512zM256 416l256-256h-512z" /> +<glyph unicode="" d="M445.020 18.98c-6.143 0-12.284 2.343-16.971 7.029-9.372 9.373-9.372 24.568 0 33.941 43.819 43.821 67.952 102.080 67.952 164.050 0 61.969-24.133 120.229-67.952 164.049-9.372 9.373-9.372 24.569 0 33.941 9.372 9.372 24.569 9.372 33.941 0 52.885-52.886 82.011-123.2 82.011-197.99 0-74.791-29.126-145.104-82.011-197.99-4.686-4.687-10.828-7.030-16.97-7.030zM359.765 64.235c-6.143 0-12.284 2.343-16.971 7.029-9.372 9.372-9.372 24.568 0 33.941 65.503 65.503 65.503 172.085 0 237.588-9.372 9.373-9.372 24.569 0 33.941 9.372 9.371 24.569 9.372 33.941 0 40.797-40.796 63.265-95.038 63.265-152.734 0-57.695-22.468-111.938-63.265-152.735-4.686-4.687-10.828-7.030-16.97-7.030zM274.51 109.49c-6.143 0-12.284 2.343-16.971 7.029-9.373 9.373-9.373 24.568 0 33.941 40.55 40.55 40.55 106.529 0 147.078-9.373 9.373-9.373 24.569 0 33.941 9.373 9.372 24.568 9.372 33.941 0 59.265-59.265 59.265-155.696 0-214.961-4.686-4.685-10.828-7.028-16.97-7.028zM200.666 440.666c12.834 12.834 23.334 8.484 23.334-9.666v-414c0-18.15-10.5-22.499-23.334-9.665l-120.666 120.665h-80v192h80l120.666 120.666z" horiz-adv-x="544" /> +<glyph unicode="" d="M359.765 64.235c-6.143 0-12.284 2.343-16.971 7.029-9.372 9.372-9.372 24.568 0 33.941 65.503 65.503 65.503 172.085 0 237.588-9.372 9.373-9.372 24.569 0 33.941 9.372 9.371 24.569 9.372 33.941 0 40.797-40.796 63.265-95.038 63.265-152.734 0-57.695-22.468-111.938-63.265-152.735-4.686-4.687-10.828-7.030-16.97-7.030zM274.51 109.49c-6.143 0-12.284 2.343-16.971 7.029-9.373 9.373-9.373 24.568 0 33.941 40.55 40.55 40.55 106.529 0 147.078-9.373 9.373-9.373 24.569 0 33.941 9.373 9.372 24.568 9.372 33.941 0 59.265-59.265 59.265-155.696 0-214.961-4.686-4.685-10.828-7.028-16.97-7.028zM200.666 440.666c12.834 12.834 23.334 8.484 23.334-9.666v-414c0-18.15-10.5-22.499-23.334-9.665l-120.666 120.665h-80v192h80l120.666 120.666z" /> +<glyph unicode="" d="M274.51 109.49c-6.143 0-12.284 2.343-16.971 7.029-9.373 9.373-9.373 24.568 0 33.941 40.55 40.55 40.55 106.529 0 147.078-9.373 9.373-9.373 24.569 0 33.941 9.373 9.372 24.568 9.372 33.941 0 59.265-59.265 59.265-155.696 0-214.961-4.686-4.685-10.828-7.028-16.97-7.028zM200.666 440.666c12.834 12.834 23.334 8.484 23.334-9.666v-414c0-18.15-10.5-22.499-23.334-9.665l-120.666 120.665h-80v192h80l120.666 120.666z" /> +<glyph unicode="" d="M200.666 440.666c12.834 12.834 23.334 8.484 23.334-9.666v-414c0-18.15-10.5-22.499-23.334-9.665l-120.666 120.665h-80v192h80l120.666 120.666z" /> +<glyph unicode="" d="M200.666 440.666c12.834 12.834 23.334 8.484 23.334-9.666v-414c0-18.15-10.5-22.499-23.334-9.665l-120.666 120.665h-80v192h80l120.666 120.666zM480 170.426v-42.426h-42.426l-53.574 53.574-53.574-53.574h-42.426v42.426l53.574 53.574-53.574 53.574v42.426h42.426l53.574-53.574 53.574 53.574h42.426v-42.426l-53.574-53.574z" /> +<glyph unicode="" d="M214.082 448.041c5.988 0 9.918-5.939 9.919-17.041v-414c0-11.103-3.928-17.041-9.918-17.041-3.802 0-8.434 2.394-13.417 7.376l-120.666 120.665h-80v192h80l120.666 120.666c4.983 4.983 9.614 7.375 13.416 7.375zM512 192h-96v-96h-64v96h-96v64h96v96h64v-96h96z" /> +<glyph unicode="" d="M214.082 448.041c5.988 0 9.918-5.939 9.919-17.041v-414c0-11.103-3.928-17.041-9.918-17.041-3.802 0-8.434 2.394-13.417 7.376l-120.666 120.665h-80v192h80l120.666 120.666c4.983 4.983 9.614 7.375 13.416 7.375zM256 256h256v-64h-256z" /> +<glyph unicode="" d="M64 320h320v-96l128 128-128 128v-96h-384v-192h64zM448 128h-320v96l-128-128 128-128v96h384v192h-64z" /> +<glyph unicode="" d="M437.011 405.010c-46.326 46.328-110.318 74.99-181.011 74.99-109.744 0-203.345-69.064-239.749-166.094l59.938-22.477c27.302 72.773 97.503 124.571 179.811 124.571 53.020 0 101.010-21.5 135.753-56.247l-71.753-71.753h192v192l-74.989-74.99zM256 32c-53.020 0-101.013 21.496-135.756 56.244l71.756 71.756h-192v-192l74.997 74.997c46.323-46.331 110.309-74.997 181.003-74.997 109.745 0 203.346 69.064 239.75 166.094l-59.938 22.477c-27.302-72.773-97.503-124.571-179.812-124.571z" /> +<glyph unicode="" d="M160 160v96h96l-128 128-128-128h96v-160h192l-64 64zM416 192v160h-192l64-64h64v-96h-96l128-128 128 128z" /> +<glyph unicode="" d="M512 352l-128 128v-96c-65.386 0-115.376-15.604-152.825-47.704-2.625-2.25-5.142-4.55-7.581-6.887 13.76-19.082 24.358-38.758 33.886-57.545 24.161 29.201 59.027 48.136 126.52 48.136v-192c-108.223 0-132.563 48.68-163.378 110.311-17.153 34.306-34.89 69.78-67.796 97.985-37.45 32.1-87.44 47.704-152.826 47.704v-64c108.223 0 132.563-48.68 163.378-110.311 17.153-34.306 34.89-69.78 67.796-97.985 37.45-32.1 87.441-47.704 152.826-47.704v-96l128 128-128 128 128 128zM0 128v-64c65.386 0 115.375 15.604 152.825 47.704 2.625 2.249 5.142 4.55 7.581 6.888-13.76 19.081-24.359 38.758-33.886 57.545-24.16-29.201-59.026-48.137-126.52-48.137z" /> +<glyph unicode="" d="M0 96l128 128 256-256 128 128-256 256 127.999 128h-383.999z" /> +<glyph unicode="" d="M256.001 480l-256.001-256h160v-255.999l192-0.001v256h160z" /> +<glyph unicode="" d="M128 480l128.001-128-256.001-256 128-128 256 256 128-127.999v383.999z" /> +<glyph unicode="" d="M512 224l-256 256v-160h-255.999l-0.001-192h256v-160z" /> +<glyph unicode="" d="M512 352l-128-128-256 256-128-128 256.001-256-128-128h383.999z" /> +<glyph unicode="" d="M256-32l256 256h-160v255.999l-192 0.001v-256h-160z" /> +<glyph unicode="" d="M384-32l-128 128 256 256-128 128-256-256.001-128 128v-383.999z" /> +<glyph unicode="" d="M0 224l256-256v160h255.999l0.001 192h-256v160z" /> +<glyph unicode="" d="M64 192c0-17.674 14.327-32 32-32s32 14.326 32 32v114.746l265.373-265.374c12.496-12.496 32.758-12.496 45.254 0 6.249 6.249 9.373 14.439 9.373 22.628s-3.124 16.379-9.373 22.627l-265.373 265.373h114.746c17.673 0 32 14.327 32 32s-14.327 32-32 32h-224v-224z" /> +<glyph unicode="" d="M438.627 278.627l-160 160c-12.496 12.497-32.757 12.497-45.254 0l-160-160c-12.497-12.497-12.497-32.758 0-45.255 12.497-12.498 32.758-12.498 45.255 0l105.372 105.373v-306.745c0-17.673 14.327-32 32-32s32 14.327 32 32v306.745l105.373-105.373c6.248-6.248 14.438-9.372 22.627-9.372s16.379 3.124 22.627 9.373c12.497 12.497 12.497 32.757 0 45.254z" /> +<glyph unicode="" d="M416.010 416c-0.006 0-0.014 0-0.020 0h-191.99c-17.673 0-32-14.327-32-32s14.327-32 32-32h114.746l-265.373-265.373c-12.497-12.496-12.497-32.758 0-45.254 6.248-6.249 14.438-9.373 22.627-9.373s16.379 3.124 22.627 9.373l265.373 265.373v-114.746c0-17.673 14.327-32 32-32s32 14.327 32 32v224h-31.99z" /> +<glyph unicode="" d="M310.627 41.373l160 160c12.497 12.496 12.497 32.758 0 45.255l-160 160c-12.497 12.496-32.758 12.496-45.255 0-12.497-12.497-12.497-32.758 0-45.255l105.373-105.373h-306.745c-17.673 0-32-14.327-32-32s14.327-32 32-32h306.745l-105.373-105.373c-6.248-6.248-9.372-14.438-9.372-22.627s3.124-16.379 9.372-22.627c12.497-12.497 32.758-12.497 45.255 0z" /> +<glyph unicode="" d="M448 256c0 17.674-14.326 32-32 32-17.673 0-32-14.326-32-32v-114.746l-265.373 265.374c-12.496 12.496-32.758 12.496-45.254 0-6.249-6.249-9.373-14.439-9.373-22.628s3.124-16.379 9.373-22.627l265.373-265.373h-114.746c-17.673 0-32-14.327-32-32s14.327-32 32-32h224v224z" /> +<glyph unicode="" d="M73.373 169.373l160-160c12.496-12.497 32.758-12.497 45.255 0l160 160c12.496 12.497 12.496 32.758 0 45.255-12.497 12.497-32.758 12.497-45.255 0l-105.373-105.373v306.745c0 17.673-14.327 32-32 32s-32-14.327-32-32v-306.745l-105.373 105.373c-6.248 6.248-14.438 9.372-22.627 9.372s-16.379-3.124-22.627-9.372c-12.497-12.497-12.497-32.758 0-45.255z" /> +<glyph unicode="" d="M288 32c17.674 0 32 14.326 32 32 0 17.673-14.326 32-32 32h-114.746l265.374 265.373c12.496 12.496 12.496 32.758 0 45.254-6.249 6.249-14.439 9.373-22.628 9.373s-16.379-3.124-22.627-9.373l-265.373-265.373v114.746c0 17.673-14.327 32-32 32s-32-14.327-32-32v-224h224z" /> +<glyph unicode="" d="M201.373 406.627l-160-160c-12.497-12.496-12.497-32.758 0-45.254l160-160c12.497-12.496 32.758-12.496 45.255 0 12.498 12.496 12.498 32.758 0 45.254l-105.374 105.373h306.746c17.673 0 32 14.326 32 32 0 17.673-14.327 32-32 32h-306.746l105.373 105.373c6.248 6.248 9.373 14.438 9.373 22.627s-3.124 16.379-9.372 22.627c-12.498 12.497-32.758 12.497-45.255 0z" /> +<glyph unicode="" d="M256 480c141.385 0 256-114.615 256-256s-114.615-256-256-256-256 114.615-256 256 114.615 256 256 256zM256 16c114.875 0 208 93.125 208 208s-93.125 208-208 208-208-93.125-208-208 93.125-208 208-208zM320 352c17.673 0 32-14.327 32-32s-14.327-32-32-32h-82.744l137.371-137.372c12.497-12.497 12.497-32.759 0-45.256-6.248-6.248-14.438-9.372-22.627-9.372s-16.379 3.124-22.627 9.372l-137.373 137.373v-82.745c0-17.673-14.327-32-32-32s-32 14.327-32 32v192h192z" /> +<glyph unicode="" d="M512 224c0-141.385-114.615-256-256-256s-256 114.615-256 256 114.615 256 256 256 256-114.615 256-256zM48 224c0-114.875 93.125-208 208-208s208 93.125 208 208-93.125 208-208 208-208-93.125-208-208zM278.627 374.628l128-128.001c12.497-12.496 12.497-32.757 0-45.254s-32.758-12.497-45.255 0l-73.372 73.372v-178.745c0-17.673-14.327-32-32-32s-32 14.327-32 32v178.745l-73.372-73.373c-12.497-12.497-32.759-12.497-45.256 0-6.248 6.249-9.372 14.439-9.372 22.628s3.124 16.379 9.372 22.627l128 128.001c12.497 12.496 32.759 12.496 45.255 0z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 16c-114.875 0-208 93.125-208 208s93.125 208 208 208 208-93.125 208-208-93.125-208-208-208zM192 352c-17.673 0-32-14.327-32-32s14.327-32 32-32h82.744l-137.371-137.372c-12.497-12.497-12.497-32.759 0-45.256 6.248-6.248 14.438-9.372 22.627-9.372s16.379 3.124 22.627 9.372l137.373 137.373v-82.745c0-17.673 14.327-32 32-32s32 14.327 32 32v192h-192z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 16c-114.875 0-208 93.125-208 208s93.125 208 208 208 208-93.125 208-208-93.125-208-208-208zM406.628 246.627l-128.001 128c-12.496 12.497-32.757 12.497-45.254 0s-12.497-32.758 0-45.255l73.372-73.372h-178.745c-17.673 0-32-14.327-32-32s14.327-32 32-32h178.745l-73.373-73.372c-12.497-12.497-12.497-32.759 0-45.256 6.249-6.248 14.439-9.372 22.628-9.372s16.379 3.124 22.627 9.372l128.001 128c12.496 12.497 12.496 32.759 0 45.255z" /> +<glyph unicode="" d="M256-32c-141.385 0-256 114.615-256 256s114.615 256 256 256 256-114.615 256-256-114.615-256-256-256zM256 432c-114.875 0-208-93.125-208-208s93.125-208 208-208 208 93.125 208 208-93.125 208-208 208zM192 96c-17.673 0-32 14.327-32 32s14.327 32 32 32h82.744l-137.371 137.372c-12.497 12.497-12.497 32.759 0 45.256 6.248 6.248 14.438 9.372 22.627 9.372s16.379-3.124 22.627-9.372l137.373-137.373v82.745c0 17.673 14.327 32 32 32s32-14.327 32-32v-192h-192z" /> +<glyph unicode="" d="M512 224c0 141.385-114.615 256-256 256s-256-114.615-256-256 114.615-256 256-256 256 114.615 256 256zM48 224c0 114.875 93.125 208 208 208s208-93.125 208-208-93.125-208-208-208-208 93.125-208 208zM278.627 73.372l128 128.001c12.497 12.496 12.497 32.757 0 45.254s-32.758 12.497-45.255 0l-73.372-73.372v178.745c0 17.673-14.327 32-32 32s-32-14.327-32-32v-178.745l-73.372 73.373c-12.497 12.497-32.759 12.497-45.256 0-6.248-6.249-9.372-14.439-9.372-22.628s3.124-16.379 9.372-22.627l128-128.001c12.497-12.496 32.759-12.496 45.255 0z" /> +<glyph unicode="" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM320 96c17.673 0 32 14.327 32 32s-14.327 32-32 32h-82.744l137.371 137.372c12.497 12.497 12.497 32.759 0 45.256-6.248 6.248-14.438 9.372-22.627 9.372s-16.379-3.124-22.627-9.372l-137.373-137.373v82.745c0 17.673-14.327 32-32 32s-32-14.327-32-32v-192h192z" /> +<glyph unicode="" d="M256 480c141.385 0 256-114.615 256-256s-114.615-256-256-256-256 114.615-256 256 114.615 256 256 256zM256 16c114.875 0 208 93.125 208 208s-93.125 208-208 208-208-93.125-208-208 93.125-208 208-208zM105.372 246.627l128.001 128c12.496 12.497 32.757 12.497 45.254 0s12.497-32.758 0-45.255l-73.372-73.372h178.745c17.673 0 32-14.327 32-32s-14.327-32-32-32h-178.745l73.373-73.372c12.497-12.497 12.497-32.759 0-45.256-6.249-6.248-14.439-9.372-22.628-9.372s-16.379 3.124-22.627 9.372l-128.001 128c-12.496 12.497-12.496 32.759 0 45.255z" /> +<glyph unicode="" d="M352 384h-352v-64h352v-96l128 128-128 128zM480 480v-256h32v256zM160 224l-128-128 128-128v96h352v64h-352zM0 224v-256h32v256z" /> +<glyph unicode="" d="M0 480v-512h512v512h-512zM480 0h-448v448h448v-448zM384 368l-160-160-96 96-64-64 160-160 224 224-64 64z" /> +<glyph unicode="" d="M0 480v-512h512v512h-512zM480 0h-448v448h448v-448z" /> +<glyph unicode="" d="M0 480v-512h512v512h-512zM480 0h-448v448h448v-448zM128 352h256v-256h-256z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 32c-106.039 0-192 85.961-192 192s85.961 192 192 192c106.039 0 192-85.961 192-192 0-106.039-85.961-192-192-192zM160 224c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96-53.019 0-96 42.981-96 96z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 32c-106.039 0-192 85.961-192 192s85.961 192 192 192c106.039 0 192-85.961 192-192 0-106.039-85.961-192-192-192z" /> +<glyph unicode="" d="M416 352l96 96-32 32-96-96h-224v96h-64v-96h-96v-64h96v-256h256v-96h64v96h96v64h-96v224zM160 320h160l-160-160v160zM192 128l160 160v-160h-160z" /> +<glyph unicode="" d="M445.387 125.423c-22.827 22.778-51.864 34.536-78.973 34.536h-14.556l-31.952 32.004 127.81 128.019c31.952 32.005 31.952 96.014 0 128.019l-191.715-192.028-191.716 192.027c-31.952-32.004-31.952-96.014 0-128.019l127.811-128.017-31.953-32.004h-14.557c-27.11 0-56.146-11.759-78.974-34.538-40.811-40.721-46.325-101.242-12.315-135.175 14.985-14.951 35.144-22.247 56.498-22.247 27.108 0 56.145 11.757 78.973 34.536 26.792 26.732 38.371 62 33.542 92.674l32.692 32.744 32.688-32.744c-4.828-30.674 6.753-65.941 33.542-92.674 22.831-22.779 51.866-34.536 78.974-34.536 21.354 0 41.512 7.296 56.497 22.248 34.010 33.933 28.494 94.454-12.316 135.175zM176.512 57.231c-3.849-8.941-9.505-17.173-16.813-24.463-7.318-7.302-15.586-12.959-24.574-16.812-8.066-3.458-16.48-5.284-24.331-5.284-7.573 0-18.306 1.701-26.431 9.806-8.068 8.052-9.76 18.659-9.76 26.144 0 7.771 1.821 16.105 5.263 24.106 3.85 8.942 9.507 17.173 16.813 24.463 7.317 7.303 15.586 12.957 24.575 16.812 8.067 3.457 16.48 5.284 24.332 5.284 7.573 0 18.306-1.7 26.429-9.807 8.067-8.049 9.761-18.658 9.761-26.142 0.001-7.771-1.819-16.108-5.264-24.107zM256.002 146.702c-24.957 0-45.188 20.266-45.188 45.263 0 24.996 20.231 45.26 45.188 45.26s45.186-20.264 45.186-45.26c0-24.999-20.23-45.263-45.186-45.263zM427.636 20.479c-8.124-8.104-18.856-9.806-26.43-9.806-7.852 0-16.265 1.826-24.333 5.284-8.986 3.853-17.254 9.51-24.571 16.812-7.307 7.29-12.963 15.521-16.813 24.463-3.443 7.999-5.263 16.336-5.263 24.106 0 7.483 1.692 18.094 9.76 26.143 8.123 8.104 18.856 9.807 26.43 9.807 7.85 0 16.265-1.827 24.33-5.284 8.989-3.854 17.258-9.509 24.575-16.812 7.305-7.29 12.962-15.521 16.813-24.463 3.442-7.999 5.263-16.335 5.263-24.106-0.001-7.485-1.695-18.093-9.761-26.144z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-35.817-256-80v-48l192-192v-160c0-17.673 28.653-32 64-32 35.346 0 64 14.327 64 32v160l192 192v48c0 44.183-114.615 80-256 80zM47.192 410.588c11.972 6.829 28.791 13.31 48.639 18.744 43.972 12.038 100.854 18.668 160.169 18.668 59.314 0 116.197-6.63 160.169-18.668 19.848-5.434 36.667-11.915 48.64-18.744 7.896-4.503 12.162-8.312 14.148-10.588-1.986-2.276-6.253-6.084-14.148-10.588-11.973-6.829-28.792-13.31-48.64-18.744-43.971-12.038-100.854-18.668-160.169-18.668-59.315 0-116.197 6.63-160.169 18.668-19.848 5.434-36.667 11.915-48.639 18.744-7.896 4.504-12.162 8.312-14.149 10.588 1.987 2.276 6.253 6.084 14.149 10.588z" /> +<glyph unicode="" d="M0 416l192-192v-192l128 32v160l192 192z" /> +<glyph unicode="" d="M399.798 471.896c-45.263 0-74.31 8.104-120.924 8.104-150.642 0-220.896-85.792-220.896-172.936 0-51.339 24.32-68.229 72.282-68.229-3.379 7.432-9.457 15.54-9.457 52.017 0 102.005 38.503 131.729 87.818 133.755 0 0-40.459-396.687-157.889-444.271v-12.336h158.297l54.013 256h98.922l22.036 64h-107.454l25.972 123.095c29.723-6.078 58.771-12.158 83.766-12.158 31.074 0 59.447 9.457 74.984 81.063-18.913-6.080-39.181-8.104-61.47-8.104z" /> +<glyph unicode="" d="M448 96h64l-80-96-80 96h64v256h-64l80 96 80-96h-64zM320 448v-128l-32 64h-96v-352h64v-32h-192v32h64v352h-96l-32-64v128z" /> +<glyph unicode="" d="M128 32v-64l-96 80 96 80v-64h256v64l96-80-96-80v64zM416 448v-128l-32 64h-96v-224h64v-32h-192v32h64v224h-96l-32-64v128z" /> +<glyph unicode="" d="M353.94 237.674c18.749 22.271 30.060 51.004 30.060 82.326 0 70.58-57.421 128-128 128h-160v-448h192c70.579 0 128 57.421 128 128 0 46.478-24.899 87.248-62.060 109.674zM192 384h50.75c27.984 0 50.75-28.71 50.75-64s-22.766-64-50.75-64h-50.75v128zM271.5 64h-79.5v128h79.5c29.225 0 53-28.71 53-64s-23.775-64-53-64z" /> +<glyph unicode="" d="M352 448h64v-208c0-79.529-71.634-144-160-144-88.365 0-160 64.471-160 144v208h64v-208c0-20.083 9.119-39.352 25.677-54.253 18.448-16.602 43.423-25.747 70.323-25.747 26.9 0 51.875 9.145 70.323 25.747 16.558 14.901 25.677 34.17 25.677 54.253v208zM96 64h320v-64h-320z" /> +<glyph unicode="" d="M448 448v-32h-64l-160-384h64v-32h-224v32h64l160 384h-64v32z" /> +<glyph unicode="" d="M512 224v-32h-117.253c13.752-19.255 21.253-41.346 21.253-64 0-35.439-18.33-69.513-50.29-93.482-29.679-22.259-68.642-34.518-109.71-34.518-41.069 0-80.031 12.259-109.71 34.518-31.96 23.969-50.29 58.043-50.29 93.482h64c0-34.691 43.963-64 96-64s96 29.309 96 64c0 34.691-43.963 64-96 64h-256v32h149.759c-1.169 0.827-2.328 1.662-3.469 2.518-31.96 23.97-50.29 58.043-50.29 93.482 0 35.439 18.33 69.512 50.29 93.482 29.679 22.259 68.641 34.518 109.71 34.518 41.068 0 80.031-12.259 109.71-34.518 31.96-23.97 50.29-58.043 50.29-93.482h-64c0 34.691-43.963 64-96 64-52.037 0-96-29.309-96-64 0-34.691 43.963-64 96-64 39.489 0 77.027-11.339 106.241-32h149.759z" /> +<glyph unicode="" d="M352 32h128l32 64v-128h-192v107.107c65.556 28.242 112 98.581 112 180.893 0 107.216-78.799 191.133-176 191.133-97.203 0-176-83.916-176-191.133 0-82.312 46.443-152.651 112-180.893v-107.107h-192v128l32-64h128v16.295c-93.815 33.23-160 113.701-160 207.705 0 123.712 114.615 224 256 224 141.385 0 256-100.288 256-224 0-94.004-66.185-174.475-160-207.705v-16.295z" /> +<glyph unicode="" d="M470.803 112.646l22.197 47.354h19l-32-192h-480v37.121l165.773 195.606-165.773 165.773v113.5h490l22-128h-17.188l-9.36 19.44c-17.659 36.682-30.952 44.56-69.452 44.56h-331l176.528-176.528-148.71-175.472h271.182c58.004 0 73.324 20.789 86.803 48.646z" /> +<glyph unicode="" d="M0 384v-352h512v352h-512zM192 160v64h128v-64h-128zM320 128v-64h-128v64h128zM320 320v-64h-128v64h128zM160 320v-64h-128v64h128zM32 224h128v-64h-128v64zM352 224h128v-64h-128v64zM352 256v64h128v-64h-128zM32 128h128v-64h-128v64zM352 64v64h128v-64h-128z" /> +<glyph unicode="" d="M0 448v-448h512v448h-512zM192 160v96h128v-96h-128zM320 128v-96h-128v96h128zM320 384v-96h-128v96h128zM160 384v-96h-128v96h128zM32 256h128v-96h-128v96zM352 256h128v-96h-128v96zM352 288v96h128v-96h-128zM32 128h128v-96h-128v96zM352 32v96h128v-96h-128z" /> +<glyph unicode="" d="M192 384h64v-32h-64zM288 384h64v-32h-64zM448 384v-128h-96v32h64v64h-32v32zM160 288h64v-32h-64zM256 288h64v-32h-64zM96 352v-64h32v-32h-64v128h96v-32zM192 192h64v-32h-64zM288 192h64v-32h-64zM448 192v-128h-96v32h64v64h-32v32zM160 96h64v-32h-64zM256 96h64v-32h-64zM96 160v-64h32v-32h-64v128h96v-32zM480 448h-448v-448h448v448zM512 480v0-512h-512v512h512z" /> +<glyph unicode="" d="M192 480h256v-64h-64v-448h-64v448h-64v-448h-64v256c-70.692 0-128 57.308-128 128s57.308 128 128 128z" /> +<glyph unicode="" d="M256 480c-70.692 0-128-57.308-128-128s57.308-128 128-128v-256h64v448h64v-448h64v448h64v64h-256zM0 128l128 128-128 128z" /> +<glyph unicode="" d="M128 480c-70.692 0-128-57.308-128-128s57.308-128 128-128v-256h64v448h64v-448h64v448h64v64h-256zM512 384l-128-128 128-128z" /> +<glyph unicode="" d="M0 384h512v-32h-512zM0 320h352v-32h-352zM0 256h512v-32h-512zM0 192h352v-32h-352zM0 128h512v-32h-512zM0 64h352v-32h-352z" /> +<glyph unicode="" d="M0 384h512v-32h-512zM96 320h320v-32h-320zM96 192h320v-32h-320zM96 64h320v-32h-320zM0 256h512v-32h-512zM0 128h512v-32h-512z" /> +<glyph unicode="" d="M0 384h512v-32h-512zM160 320h352v-32h-352zM0 256h512v-32h-512zM160 192h352v-32h-352zM0 128h512v-32h-512zM160 64h352v-32h-352z" /> +<glyph unicode="" d="M0 320h512v-32h-512zM0 192h512v-32h-512zM0 64h512v-32h-512zM0 384h512v-32h-512zM0 256h512v-32h-512zM0 128h512v-32h-512z" /> +<glyph unicode="" d="M0 448h512v-64h-512zM0 352h320v-64h-320zM0 160h320v-64h-320zM0 256h512v-64h-512zM0 64h512v-64h-512z" /> +<glyph unicode="" d="M0 448h512v-64h-512zM96 352h320v-64h-320zM96 160h320v-64h-320zM0 256h512v-64h-512zM0 64h512v-64h-512z" /> +<glyph unicode="" d="M0 448h512v-64h-512zM192 352h320v-64h-320zM192 160h320v-64h-320zM0 256h512v-64h-512zM0 64h512v-64h-512z" /> +<glyph unicode="" d="M0 448h512v-64h-512zM0 352h512v-64h-512zM0 256h512v-64h-512zM0 160h512v-64h-512zM0 64h512v-64h-512z" /> +<glyph unicode="" d="M0 448h512v-64h-512zM192 352h320v-64h-320zM192 256h320v-64h-320zM192 160h320v-64h-320zM0 64h512v-64h-512zM0 128v192l128-96z" /> +<glyph unicode="" d="M0 448h512v-64h-512zM192 352h320v-64h-320zM192 256h320v-64h-320zM192 160h320v-64h-320zM0 64h512v-64h-512zM128 320v-192l-128 96z" /> +<glyph unicode="" d="M96 448v-384h384v384h-384zM448 96h-320v320h320v-320zM64 32v320l-32 32v-384h384l-32 32zM214.627 137.373l96 96 73.373-73.373v192h-192l73.373-73.373-96-96z" /> +<glyph unicode="" d="M144 352l-128-128 128-128h64l-128 128 128 128h-64zM368 352h-64l128-128-128-128h64l128 128-128 128z" /> +<glyph unicode="" d="M64 224l128 128h-64l-128-128 128-128h64zM384 352h-64l128-128-128-128h64l128 128zM272 416l-80-384h48l80 384z" /> +<glyph unicode="" d="M0 448v-448h512v448h-512zM480 32h-448v384h448v-384zM448 384h-384v-320h384v320zM224 224h-32v-32h-32v-32h-32v32h32v32h32v32h-32v32h-32v32h32v-32h32v-32h32v-32zM352 160h-96v32h96v-32z" /> +<glyph unicode="" d="M432 128c-22.58 0-42.96-9.369-57.506-24.415l-215.502 107.751c0.657 4.126 1.008 8.353 1.008 12.664s-0.351 8.538-1.008 12.663l215.502 107.751c14.546-15.045 34.926-24.414 57.506-24.414 44.183 0 80 35.817 80 80s-35.817 80-80 80-80-35.817-80-80c0-4.311 0.352-8.538 1.008-12.663l-215.502-107.752c-14.546 15.045-34.926 24.415-57.506 24.415-44.183 0-80-35.818-80-80 0-44.184 35.817-80 80-80 22.58 0 42.96 9.369 57.506 24.414l215.502-107.751c-0.656-4.125-1.008-8.352-1.008-12.663 0-44.184 35.817-80 80-80s80 35.816 80 80c0 44.182-35.817 80-80 80z" /> +<glyph unicode="" d="M426.655 480h-341.31c-46.94 0-85.345-38.392-85.345-85.329v-341.328c0-46.938 38.405-85.343 85.345-85.343h341.311c46.969 0 85.344 38.405 85.344 85.343v341.328c0 46.937-38.375 85.329-85.345 85.329zM128 352h256c4.569 0 9.002-0.981 13.072-2.831l-141.072-164.584-141.072 164.585c4.070 1.848 8.503 2.83 13.072 2.83zM96 128v192c0 0.67 0.028 1.336 0.070 2l93.832-109.47-92.799-92.8c-0.722 2.669-1.103 5.443-1.103 8.27zM384 96h-256c-2.827 0-5.601 0.381-8.27 1.103l91.059 91.059 45.211-52.748 45.212 52.747 91.058-91.059c-2.67-0.721-5.443-1.102-8.27-1.102zM416 128c0-2.827-0.381-5.6-1.103-8.27l-92.799 92.799 93.832 109.471c0.042-0.664 0.070-1.33 0.070-2v-192z" /> +<glyph unicode="" d="M426.671 480h-341.328c-46.937 0-85.343-38.405-85.343-85.345v-341.311c0-46.969 38.406-85.344 85.343-85.344h341.328c46.938 0 85.329 38.375 85.329 85.345v341.31c0 46.94-38.391 85.345-85.329 85.345zM426.671 416c3.994 0 7.773-1.167 11.010-3.171l-181.681-150.202-181.677 150.2c3.239 2.005 7.022 3.173 11.020 3.173h341.328zM85.343 32c-0.962 0-1.91 0.073-2.842 0.204l112.813 156.483-14.628 14.627-116.686-116.685v305.569l192-232.198 192 232.197v-305.568l-116.686 116.685-14.627-14.627 112.814-156.484c-0.929-0.13-1.873-0.203-2.831-0.203h-341.327z" /> +<glyph unicode="" d="M426.671 480h-341.328c-46.937 0-85.343-38.405-85.343-85.345v-341.311c0-46.969 38.406-85.344 85.343-85.344h341.328c46.938 0 85.329 38.375 85.329 85.345v341.31c0 46.94-38.391 85.345-85.329 85.345zM91.314 36.687l-38.628 38.627 128 128 14.628-14.627-104-152zM76.686 380.686l14.628 14.628 164.686-132.687 164.687 132.687 14.627-14.628-179.314-211.313-179.314 211.313zM420.687 36.687l-104 152 14.627 14.627 128-128-38.627-38.627z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM128 352h256c4.569 0 9.002-0.981 13.072-2.831l-141.072-164.584-141.072 164.585c4.070 1.848 8.503 2.83 13.072 2.83zM96 128v192c0 0.67 0.028 1.336 0.070 2l93.832-109.471-92.799-92.799c-0.722 2.668-1.103 5.443-1.103 8.27zM384 96h-256c-2.827 0-5.601 0.381-8.27 1.104l91.059 91.059 45.211-52.749 45.212 52.747 91.058-91.060c-2.67-0.72-5.443-1.101-8.27-1.101zM416 128c0-2.827-0.381-5.6-1.103-8.27l-92.8 92.799 93.833 109.471c0.042-0.664 0.070-1.33 0.070-2v-192z" /> +<glyph unicode="" d="M394.767 448c0 0-100.478 0-133.97 0-60.061 0-116.585-45.503-116.585-98.211 0-53.863 40.941-97.333 102.044-97.333 4.249 0 8.378 0.085 12.42 0.376-3.964-7.593-6.8-16.144-6.8-25.021 0-14.969 8.052-27.105 18.234-37.012-7.693 0-15.121-0.224-23.226-0.224-74.391 0.001-131.65-47.38-131.65-96.511 0-48.389 62.771-78.656 137.167-78.656 84.812 0 131.653 48.122 131.653 96.514 0 38.801-11.448 62.036-46.843 87.067-12.108 8.571-35.266 29.418-35.266 41.672 0 14.36 4.098 21.434 25.714 38.323 22.156 17.312 37.837 41.651 37.837 69.958 0 33.703-15.011 66.549-43.187 77.386h42.478l29.98 21.672zM347.974 120.271c1.063-4.486 1.642-9.104 1.642-13.814 0-39.1-25.195-69.655-97.487-69.655-51.421 0-88.558 32.552-88.558 71.65 0 38.321 46.063 70.222 97.482 69.666 12-0.127 23.184-2.058 33.334-5.345 27.914-19.414 47.938-30.38 53.587-52.502zM265.643 266.112c-34.519 1.032-67.318 38.613-73.276 83.93-5.958 45.333 17.185 80.021 51.694 78.995 34.504-1.037 67.318-37.407 73.279-82.729 5.953-45.33-17.195-81.229-51.697-80.196z" /> +<glyph unicode="" d="M279.533 448c0 0-100.478 0-133.97 0-60.060 0-116.585-45.503-116.585-98.211 0-53.863 40.941-97.333 102.044-97.333 4.249 0 8.378 0.085 12.421 0.376-3.965-7.593-6.801-16.144-6.801-25.021 0-14.969 8.052-27.105 18.234-37.012-7.693 0-15.121-0.224-23.226-0.224-74.391 0.001-131.65-47.379-131.65-96.51 0-48.389 62.771-78.657 137.167-78.657 84.812 0 131.653 48.122 131.653 96.514 0 38.8-11.448 62.036-46.843 87.067-12.108 8.572-35.265 29.418-35.265 41.672 0 14.36 4.098 21.434 25.714 38.323 22.156 17.312 37.836 41.651 37.836 69.958 0 33.703-15.010 66.549-43.186 77.386h42.477l29.98 21.672zM232.74 120.271c1.063-4.486 1.642-9.103 1.642-13.814 0-39.1-25.196-69.655-97.487-69.655-51.421 0-88.558 32.552-88.558 71.65 0 38.321 46.063 70.222 97.482 69.666 12-0.127 23.184-2.058 33.335-5.345 27.913-19.413 47.938-30.381 53.586-52.502zM150.409 266.112c-34.519 1.032-67.318 38.613-73.276 83.93-5.958 45.333 17.185 80.021 51.694 78.995 34.505-1.037 67.319-37.407 73.279-82.729 5.953-45.33-17.195-81.229-51.697-80.196zM416 352v96h-32v-96h-96v-32h96v-96h32v96h96v32z" /> +<glyph unicode="" d="M426.756 480h-342.135c-47.050 0-84.621-38.893-84.621-85.939v-340.176c0-48.211 37.571-85.885 84.621-85.885h342.134c47.048 0 85.245 37.674 85.245 85.885v340.176c0 47.046-38.197 85.939-85.244 85.939zM352 464v-80h-80v80h80zM240 464v-80h-80v80h80zM16 384v10.061c0 38.564 30.783 69.939 68.621 69.939h43.379v-80h-112zM384 160h-96v-96h-64v96h-96v64h96v96h64v-96h96v-64zM496 384h-112v80h42.756c38.182 0 69.244-31.375 69.244-69.939v-10.061z" /> +<glyph unicode="" d="M0.403 45.168c-0.122 1.266-0.226 2.535-0.292 3.815 0.065-1.28 0.17-2.549 0.292-3.815zM117.954 197.426c46.005-1.369 76.867 46.349 68.931 106.599-7.947 60.24-51.698 108.584-97.704 109.961-46.013 1.365-76.87-44.741-68.926-105 7.941-60.234 51.676-110.187 97.699-111.56zM512 352v42.655c0 46.94-38.391 85.345-85.329 85.345h-341.328c-46.138 0-84.006-37.116-85.282-82.963 29.181 25.693 69.662 47.158 111.437 47.158 44.652 0 178.622 0 178.622 0l-39.974-33.809h-56.634c37.565-14.402 57.578-58.062 57.578-102.861 0-37.624-20.905-69.977-50.444-92.984-28.822-22.451-34.286-31.854-34.286-50.939 0-16.289 30.873-44 47.016-55.394 47.191-33.269 62.458-64.156 62.458-115.728 0-8.214-1.021-16.415-3.033-24.48h153.871c46.937 0 85.328 38.375 85.328 85.345v266.654h-96v-95.999h-32v96h-95.999v32h95.999v96h32v-96h96zM92.943 97.032c10.807 0 20.711 0.295 30.968 0.295-13.573 13.167-24.313 29.3-24.313 49.19 0 11.804 3.782 23.168 9.067 33.26-5.391-0.385-10.895-0.497-16.563-0.497-37.178 0-68.753 12.038-92.102 31.927v-33.621l0.003-100.865c26.72 12.687 58.444 20.311 92.94 20.311zM1.71 36.371c-0.556 2.729-0.983 5.503-1.271 8.317 0.287-2.814 0.715-5.588 1.271-8.317zM227.725 3.577c-7.529 29.403-34.227 43.982-71.444 69.784-13.536 4.366-28.447 6.937-44.447 7.104-44.809 0.482-86.554-17.471-110.108-44.186 7.96-38.853 42.517-68.279 83.617-68.279h143.222c0.908 5.564 1.348 11.316 1.348 17.216 0 6.267-0.767 12.396-2.188 18.361z" /> +<glyph unicode="" d="M218.503 70.919c0-37.534-23.195-67.196-88.879-69.588-38.492 21.893-70.745 53.476-93.454 91.433 11.845 29.248 48.846 51.523 91.158 51.057 12.011-0.126 23.205-2.057 33.372-5.35 27.954-19.433 50.5-31.576 56.162-53.724 1.057-4.482 1.641-9.103 1.641-13.828zM256 480c-73.97 0-140.598-31.385-187.333-81.549 18.467 10.226 40.269 16.319 63.451 16.319 33.534 0 128.219 0 128.219 0l-28.652-30.070h-33.655c23.748-13.606 36.376-41.624 36.376-72.506 0-28.346-15.708-51.19-37.89-68.529-21.64-16.901-25.746-23.983-25.746-38.367 0-12.271 25.861-30.549 37.75-39.468 41.409-31.056 49.789-50.592 49.789-89.435 0-39.363-34.468-78.552-92.933-91.871 28.174-10.669 58.713-16.524 90.624-16.524 141.385 0 256 114.615 256 256s-114.615 256-256 256zM384 288v-64h-32v64h-64v32h64v64h32v-64h64v-32h-64zM182.884 310.264c5.961-45.388-13.923-74.595-48.467-73.567-34.563 1.041-67.403 32.746-73.37 78.121-5.964 45.394 17.209 80.127 51.765 79.098 34.545-1.037 64.11-38.271 70.072-83.652zM110.443 158.966c-37.34 0-69.064-12.884-91.421-31.932-12.251 29.91-19.022 62.645-19.022 96.966 0 28.383 4.628 55.684 13.156 81.198 3.687-49.721 38.676-88.096 96.485-88.096 4.257 0 8.382 0.221 12.437 0.511-3.975-7.615-6.811-16.095-6.811-24.991 0-14.985 8.244-23.535 18.434-33.447-7.701 0-15.135-0.209-23.258-0.209z" /> +<glyph unicode="" d="M229.665 150.084l-85.327-147.834h282.327l85.335 147.834zM487.806 192l-146.467 253.75h-170.674l146.478-253.75zM146.418 403.743l-146.418-253.659 85.338-147.834 146.416 253.662z" /> +<glyph unicode="" d="M426.672 480h-341.33c-46.936 0-85.342-38.407-85.342-85.344v-341.313c0-46.969 38.406-85.343 85.342-85.343l341.33 0.001c46.938 0 85.328 38.373 85.328 85.344v341.311c0 46.937-38.391 85.344-85.328 85.344zM435.296 224h-83.296v-224h-96v224h-46.263v73.282h46.263v47.593c0 64.671 27.896 103.125 103.935 103.125h87.622v-79.285h-71.565c-21.241 0.035-23.876-11.076-23.876-31.756l-0.116-39.677h96l-12.704-73.282z" /> +<glyph unicode="" d="M256 480c141.385 0 256-114.615 256-256 0-130.547-97.719-238.265-224-254.013v190.013h88l8 64h-96v32c0 17.673 14.327 32 32 32h64v64h-64c-53.020 0-96-42.98-96-96v-32h-48v-64h48v-190.013c-126.281 15.748-224 123.466-224 254.013 0 141.385 114.615 256 256 256z" /> +<glyph unicode="" d="M427 480h-342c-46.75 0-85-38.25-85-85v-342c0-46.75 38.25-85 85-85h342c46.75 0 85 38.25 85 85v342c0 46.75-38.25 85-85 85zM163.9 256h184.2c3.494-10.029 5.4-20.795 5.4-32 0-53.762-43.738-97.5-97.5-97.5-53.762 0-97.5 43.738-97.5 97.5 0 11.205 1.906 21.971 5.4 32zM448 255.975v-191.975c0-17.6-14.4-32-32-32h-320c-17.6 0-32 14.4-32 32v192h50.054c-2.321-10.301-3.554-21.008-3.554-32 0-80.229 65.271-145.5 145.5-145.5 80.229 0 145.5 65.271 145.5 145.5 0 10.992-1.232 21.699-3.554 32l50.054-0.025zM448 368c0-8.8-7.2-16-16-16h-32c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-32z" /> +<glyph unicode="" d="M426.671 480h-341.328c-46.937 0-85.343-38.405-85.343-85.345v-341.311c0-46.969 38.406-85.344 85.343-85.344h341.328c46.938 0 85.329 38.375 85.329 85.345v341.31c0 46.94-38.391 85.345-85.329 85.345zM419.026 309.083c0.164-3.671 0.245-7.364 0.245-11.074 0-113.107-84.608-243.534-239.329-243.534-47.502 0-91.717 14.174-128.943 38.459 6.58-0.794 13.276-1.197 20.065-1.197 39.411 0 75.679 13.685 104.467 36.641-36.808 0.69-67.872 25.438-78.577 59.441 5.137-1 10.406-1.537 15.826-1.537 7.672 0 15.103 1.048 22.16 3.004-38.48 7.866-67.475 42.458-67.475 83.928 0 0.361 0 0.719 0.008 1.076 11.34-6.41 24.312-10.26 38.1-10.705-22.571 15.349-37.421 41.546-37.421 71.244 0 15.685 4.147 30.389 11.389 43.029 41.487-51.785 103.468-85.86 173.377-89.431-1.435 6.266-2.179 12.798-2.179 19.507 0 47.269 37.663 85.59 84.115 85.59 24.195 0 46.059-10.393 61.401-27.029 19.16 3.838 37.162 10.96 53.416 20.771-6.281-19.988-19.617-36.761-36.983-47.355 17.013 2.069 33.226 6.67 48.31 13.477-11.273-17.162-25.535-32.238-41.972-44.305z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM403.121 299.456c0.146-3.254 0.221-6.528 0.221-9.819 0-100.311-76.354-215.982-215.979-215.982-42.868 0-82.768 12.568-116.363 34.107 5.938-0.704 11.981-1.063 18.108-1.063 35.565 0 68.295 12.138 94.275 32.497-33.217 0.61-61.25 22.561-70.912 52.716 4.637-0.884 9.392-1.361 14.283-1.361 6.923 0 13.629 0.928 19.999 2.662-34.726 6.976-60.893 37.656-60.893 74.434 0 0.32 0 0.639 0.008 0.955 10.235-5.685 21.939-9.1 34.382-9.494-20.37 13.611-33.77 36.846-33.77 63.184 0 13.911 3.744 26.952 10.278 38.162 37.439-45.927 93.374-76.146 156.462-79.314-1.294 5.559-1.965 11.351-1.965 17.302 0 41.92 33.99 75.906 75.909 75.906 21.833 0 41.562-9.218 55.409-23.97 17.29 3.404 33.537 9.721 48.206 18.42-5.668-17.727-17.705-32.603-33.376-41.997 15.355 1.834 29.984 5.916 43.597 11.952-10.175-15.224-23.045-28.593-37.879-39.297z" /> +<glyph unicode="" d="M68.147 104.535c-37.598 0-68.146-30.667-68.146-68.038 0-37.577 30.55-67.901 68.146-67.901 37.733 0 68.247 30.324 68.247 67.901-0.001 37.371-30.512 68.038-68.247 68.038zM0.078 306.035v-98.129c63.892 0 123.979-24.986 169.229-70.256 45.192-45.159 70.141-105.518 70.141-169.65h98.561c-0.001 186.41-151.641 338.035-337.931 338.035zM0.194 480v-98.178c227.891 0 413.378-185.667 413.378-413.822h98.428c0 282.235-229.627 512-511.806 512z" /> +<glyph unicode="" d="M426.67 480h-341.327c-46.938 0-85.343-38.406-85.343-85.344v-341.314c0-46.967 38.406-85.342 85.344-85.342h341.326c46.938 0 85.33 38.374 85.33 85.342v341.314c0 46.938-38.392 85.344-85.33 85.344zM139.472 64.376c-23.985 0-43.472 19.346-43.472 43.314 0 23.842 19.486 43.406 43.472 43.406 24.079 0 43.53-19.564 43.53-43.406-0.001-23.968-19.452-43.314-43.53-43.314zM248.734 64.002c0 40.905-15.904 79.409-44.73 108.222-28.857 28.875-67.188 44.813-107.952 44.813v62.593c118.826 0 215.563-96.721 215.563-215.627l-62.881-0.001zM359.814 64.002c0 145.531-118.329 263.97-263.688 263.97v62.624c180.001 0 326.473-146.562 326.473-326.596l-62.785 0.002z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM160 96c-17.673 0-32 14.327-32 32s14.327 32 32 32 32-14.327 32-32-14.327-32-32-32zM248 96c0 66.168-53.832 120-120 120v48c92.636 0 168-75.364 168-168h-48zM344 96c0 57.695-22.468 111.938-63.265 152.735-40.797 40.797-95.039 63.265-152.735 63.265v48c70.517 0 136.813-27.461 186.677-77.324 49.862-49.863 77.323-116.159 77.323-186.676h-48z" /> +<glyph unicode="" d="M416 416h-320c-52.8 0-96-43.2-96-96v-192c0-52.8 43.2-96 96-96h320c52.8 0 96 43.2 96 96v192c0 52.8-43.2 96-96 96zM480 128c0-16.989-6.687-33.031-18.827-45.173-12.142-12.14-28.183-18.827-45.173-18.827h-320c-16.989 0-33.031 6.687-45.172 18.827-12.141 12.142-18.828 28.184-18.828 45.173v192c0 16.989 6.687 33.031 18.828 45.172s28.183 18.828 45.172 18.828h320c16.989 0 33.031-6.687 45.173-18.828 12.141-12.141 18.827-28.183 18.827-45.172v-192zM192 96l160 128-160 128z" /> +<glyph unicode="" d="M0 325.815l20.797-27.272c0 0 42.885 33.804 57.18 16.901 14.294-16.901 68.868-220.978 87.085-258.623 15.9-33.015 59.759-76.66 107.857-45.491 48.068 31.17 207.92 167.643 236.533 328.808 28.59 161.113-192.36 127.363-215.765-13.005 58.495 35.118 89.718-14.269 59.785-70.186-29.879-55.862-57.18-92.296-71.476-92.296-14.269 0-25.245 37.384-41.594 102.723-16.899 67.551-16.796 189.23-87.058 175.435-66.259-13.006-153.344-116.994-153.344-116.994z" /> +<glyph unicode="" d="M426.655 480h-341.31c-46.939 0-85.345-38.408-85.345-85.346v-341.31c0-46.969 38.406-85.344 85.345-85.344h341.31c46.939 0 85.345 38.375 85.345 85.345v341.309c0 46.938-38.406 85.346-85.345 85.346zM406.434 260.937c-16.979-95.648-111.854-176.648-140.39-195.155-28.544-18.503-54.577 7.411-64.019 26.997-10.808 22.354-43.205 143.47-51.684 153.51-8.482 10.019-33.938-10.040-33.938-10.040l-12.346 16.188c0 0 51.691 61.724 91.020 69.439 41.702 8.183 41.64-64.033 51.67-104.121 9.7-38.782 16.22-60.976 24.688-60.976 8.485 0 24.691 21.631 42.426 54.785 17.768 33.188-0.769 62.505-35.486 41.646 13.893 83.326 145.031 103.36 128.059 7.727z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM406.434 260.937c-16.979-95.648-111.854-176.648-140.39-195.155-28.544-18.503-54.577 7.411-64.019 26.997-10.808 22.354-43.205 143.47-51.684 153.51-8.482 10.019-33.938-10.040-33.938-10.040l-12.346 16.188c0 0 51.691 61.724 91.020 69.439 41.702 8.183 41.64-64.033 51.67-104.121 9.7-38.782 16.22-60.976 24.688-60.976 8.485 0 24.691 21.631 42.426 54.785 17.768 33.188-0.769 62.505-35.486 41.646 13.893 83.326 145.031 103.36 128.059 7.727z" /> +<glyph unicode="" d="M426 480h-340c-47.3 0-86-38.7-86-86v-340c0-47.3 38.7-86 86-86h340c47.3 0 86 38.7 86 86v340c0 47.3-38.7 86-86 86zM421.834 76.167c-56.666-18.667-167.333-55-188-60.167s-42-13.834-54 20.833c0 0-102 301.333-111.333 328s-18.424 42.743 2.666 51.167c48.688 19.447 99.333 44.25 108.667 16 8.351-25.273 97.333-304 97.333-304s104.666 36.834 133.333 44.834 38.501 13.334 46-26 22-52-34.666-70.667z" /> +<glyph unicode="" d="M0 208c0 61.856 50.144 112 112 112s112-50.144 112-112c0-61.856-50.144-112-112-112-61.856 0-112 50.144-112 112zM288 208c0 61.856 50.144 112 112 112s112-50.144 112-112c0-61.856-50.144-112-112-112-61.856 0-112 50.144-112 112z" /> +<glyph unicode="" d="M400 272c-35.29 0-64-28.71-64-64s28.71-64 64-64c35.29 0 64 28.71 64 64 0 35.29-28.71 64-64 64zM400 320v0c61.855 0 112-50.144 112-112 0-61.855-50.145-112-112-112-61.855 0-112 50.145-112 112 0 61.856 50.145 112 112 112zM0 208c0 61.856 50.144 112 112 112s112-50.144 112-112c0-61.856-50.144-112-112-112-61.856 0-112 50.144-112 112z" /> +<glyph unicode="" d="M426.688 480h-341.344c-46.938 0-85.344-38.406-85.344-85.341v-341.313c0-46.971 38.406-85.346 85.344-85.346h341.341c46.937 0 85.315 38.377 85.315 85.348v341.311c0 46.935-38.378 85.341-85.312 85.341zM144 144c-44.183 0-80 35.817-80 80s35.817 80 80 80 80-35.817 80-80c0-44.183-35.817-80-80-80zM368 144c-44.184 0-80 35.817-80 80s35.816 80 80 80 80-35.817 80-80c0-44.183-35.816-80-80-80z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-115.398-256-257.75s114.615-257.75 256-257.75 256 115.398 256 257.75-114.615 257.75-256 257.75zM144 144c-44.183 0-80 35.817-80 80s35.817 80 80 80 80-35.817 80-80c0-44.183-35.817-80-80-80zM368 144c-44.184 0-80 35.817-80 80s35.816 80 80 80 80-35.817 80-80c0-44.183-35.816-80-80-80z" /> +<glyph unicode="" d="M352 282.87l-182.228 182.228c26.945 9.638 55.97 14.902 86.228 14.902 33.952 0 66.352-6.625 96-18.628v-178.502zM384 128v317.743c76.517-44.264 128-126.989 128-221.743 0-33.952-6.625-66.352-18.628-96h-109.372zM160 96h317.743c-44.264-76.517-126.989-128-221.743-128-33.952 0-66.352 6.625-96 18.628v109.372zM213.13 368l-205.641-205.641c-4.882 19.745-7.489 40.387-7.489 61.641 0 96.691 53.613 180.851 132.726 224.404l80.404-80.404zM128 229.13v-226.873c-47.298 27.361-85.018 69.424-106.937 119.936l106.937 106.937z" /> +<glyph unicode="" d="M426.688 480h-341.344c-46.938 0-85.344-38.406-85.344-85.341v-341.313c0-46.971 38.406-85.346 85.344-85.346h341.34c46.938 0 85.316 38.377 85.316 85.348v341.311c0 46.935-38.378 85.341-85.312 85.341zM256 448c34.357 0 66.902-7.745 96-21.569v-143.561l-156.779 156.779c19.328 5.437 39.713 8.351 60.779 8.351zM32 224c0 87.944 50.688 164.037 124.437 200.693l56.693-56.693-178.487-178.487c-1.737 11.242-2.643 22.758-2.643 34.487zM128 40.169c-37.342 26.049-66.382 63.174-82.336 106.625l82.336 82.336v-188.961zM256 0c-34.357 0-66.902 7.745-96 21.569v74.431h279.831c-40.478-58.026-107.715-96-183.831-96zM458.431 128h-74.431v279.832c58.026-40.479 96-107.715 96-183.832 0-34.357-7.745-66.902-21.569-96z" /> +<glyph unicode="" d="M256.001-32c-141.16 0-256.001 114.841-256.001 256s114.841 256 256.001 256c141.161 0 255.999-114.841 255.999-256s-114.838-256-255.999-256zM471.899 188.957c-7.481 2.36-67.682 20.316-136.205 9.349 28.602-78.593 40.239-142.604 42.479-155.904 49.057 33.168 83.979 85.713 93.726 146.555zM341.416 22.381c-3.253 19.185-15.949 86.045-46.649 165.82-0.48-0.164-0.961-0.32-1.44-0.486-123.335-42.979-167.608-128.508-171.543-136.552 37.075-28.912 83.668-46.16 134.218-46.16 30.29 0 59.159 6.195 85.414 17.378zM93.549 77.461c4.954 8.48 64.965 107.842 177.738 144.297 2.852 0.92 5.724 1.785 8.618 2.6-5.49 12.422-11.47 24.857-17.728 37.108-109.199-32.68-215.162-31.315-224.73-31.118-0.066-2.221-0.111-4.445-0.111-6.683 0-56.16 21.29-107.437 56.213-146.204zM41.956 268.452c9.779-0.13 99.868-0.521 202.151 26.641-36.23 64.406-75.306 118.555-81.071 126.46-61.174-28.854-106.901-85.248-121.080-153.101zM204.759 436.25c6.044-8.092 45.759-62.174 81.59-128.007 77.754 29.142 110.67 73.385 114.604 78.987-38.615 34.259-89.391 55.1-144.951 55.1-17.645 0-34.8-2.116-51.243-6.080zM425.261 361.944c-4.608-6.237-41.252-53.209-122.101-86.217 5.089-10.416 9.967-21.009 14.508-31.672 1.608-3.78 3.177-7.542 4.709-11.285 72.759 9.149 145.052-5.514 152.263-7.039-0.484 51.612-18.925 99.005-49.379 136.213z" /> +<glyph unicode="" d="M269.376 222.038c-98.676-31.898-151.186-118.839-155.521-126.261-30.558 33.921-49.187 78.788-49.187 127.929 0 1.958 0.039 3.905 0.098 5.848 8.372-0.171 101.090-1.366 196.639 27.229 5.476-10.72 10.708-21.601 15.512-32.47-2.532-0.713-5.046-1.47-7.541-2.275zM382.833 366.827c-3.441-4.902-32.243-43.615-100.278-69.114-31.352 57.603-66.103 104.925-71.391 112.006 14.388 3.468 29.399 5.32 44.837 5.32 48.615 0 93.044-18.235 126.832-48.212zM245.594 286.206c-89.498-23.766-168.325-23.424-176.883-23.311 12.407 59.371 52.418 108.716 105.946 133.963 5.044-6.917 39.236-54.297 70.937-110.652zM288.66 192.25c0.42 0.146 0.84 0.282 1.261 0.426 26.862-69.803 37.971-128.306 40.818-145.093-22.973-9.784-48.233-15.205-74.738-15.205-44.232 0-85.001 15.092-117.441 40.39 3.443 7.039 42.182 81.877 150.1 119.482zM426 480h-340c-47.3 0-86-38.7-86-86v-340c0-47.3 38.7-86 86-86h340c47.3 0 86 38.7 86 86v340c0 47.3-38.7 86-86 86zM256.001 0c-123.515 0-224.001 100.485-224.001 224 0 123.514 100.486 224 224.001 224 123.516 0 223.999-100.486 223.999-224 0-123.515-100.483-224-223.999-224zM325.732 201.518c59.958 9.596 112.633-6.116 119.18-8.18-8.53-53.237-39.086-99.214-82.010-128.236-1.961 11.638-12.144 67.647-37.17 136.416zM297.266 269.262c70.742 28.882 102.804 69.982 106.837 75.44 26.646-32.558 42.783-74.026 43.206-119.186-6.309 1.334-69.565 14.164-133.229 6.158-1.341 3.276-2.713 6.567-4.121 9.875-3.972 9.33-8.241 18.599-12.693 27.713z" /> +<glyph unicode="" d="M382.833 366.827c-3.441-4.902-32.243-43.615-100.278-69.114-31.352 57.603-66.103 104.925-71.391 112.006 14.388 3.468 29.399 5.32 44.837 5.32 48.615 0 93.044-18.235 126.832-48.212zM269.376 222.038c-98.676-31.898-151.186-118.839-155.521-126.261-30.558 33.921-49.187 78.788-49.187 127.929 0 1.958 0.039 3.905 0.098 5.848 8.372-0.171 101.090-1.366 196.639 27.229 5.476-10.72 10.708-21.601 15.512-32.47-2.532-0.713-5.046-1.47-7.541-2.275zM256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256.001 0c-123.515 0-224.001 100.485-224.001 224 0 123.514 100.486 224 224.001 224 123.516 0 223.999-100.486 223.999-224 0-123.515-100.483-224-223.999-224zM309.959 241.549c-3.973 9.33-8.241 18.599-12.694 27.714 70.742 28.881 102.805 69.982 106.838 75.439 26.646-32.558 42.783-74.026 43.206-119.186-6.309 1.334-69.565 14.164-133.229 6.158-1.341 3.276-2.713 6.567-4.121 9.875zM245.594 286.206c-89.498-23.766-168.325-23.424-176.883-23.311 12.407 59.371 52.418 108.716 105.946 133.963 5.044-6.917 39.236-54.297 70.937-110.652zM288.66 192.25c0.42 0.146 0.84 0.282 1.261 0.426 26.862-69.803 37.971-128.306 40.818-145.093-22.973-9.784-48.233-15.205-74.738-15.205-44.232 0-85.001 15.092-117.441 40.39 3.443 7.039 42.182 81.877 150.1 119.482zM325.732 201.518c59.958 9.596 112.633-6.116 119.18-8.18-8.53-53.237-39.086-99.214-82.010-128.236-1.961 11.638-12.144 67.647-37.17 136.416z" /> +<glyph unicode="" d="M192 32h-192l224 448 224-448h-192v64h64v32h-64v64h-64zM192 32h64v-64h-64z" /> +<glyph unicode="" d="M224 192h64v-128h-64zM426 480h-340c-47.3 0-86-38.7-86-86v-340c0-47.3 38.7-86 86-86h340c47.3 0 86 38.7 86 86v340c0 47.3-38.7 86-86 86zM288 64v-64h-64v64h-128l160 352 160-352h-128z" /> +<glyph unicode="" d="M280.928 276.5c-19.521 1.141-42.041-0.024-68.125-4.475l60.167-108.444 239.030 65.633c-2.577 6.13-6.343 12.113-11.331 17.899-24.737 28.639-78.37 54.187-136.802 65.709l0.001 0.013c-57.322 13.437-119.401 12.872-182.98 3.274-2.292-0.344-4.572-0.711-6.84-1.092l-21.136 39.146c-20.571-2.746-39.904-7.025-57.803-12.737l20.13-42.099c-32.88-12.738-59.861-30.88-79.329-52.716-32.106-36.532-44.795-82.454-29.373-127.176 3.102-9.021 7.294-17.58 12.468-25.598l239.034 65.649-66.375 122.924c2.279 0.44 4.598 0.884 6.964 1.312 107.341 19.149 166.051-10.432 198.208-41.915l-81.779-19.824-34.129 54.517zM87.361 166.805c-7.379 33.676-1.506 71.263 45.202 96.297l36.569-76.474-81.771-19.823z" /> +<glyph unicode="" d="M426 480h-340c-47.3 0-86-38.7-86-86v-340c0-47.3 38.7-86 86-86h340c47.3 0 86 38.7 86 86v340c0 47.3-38.7 86-86 86zM480 96h-192v118c0 0 35.167-0.5 54-20v-34h77.205c-5.91 18.941-18.534 37.556-36.564 53.332-30.99 27.115-81.597 40.668-126.641 40.668v-158h-224v48c0 21.698 7.325 43.269 21.182 62.38 12.297 16.959 29.432 31.916 50.93 44.457 25.216 14.709 55.281 25.354 87.888 31.389v69.774h64v-64c73.5 0 110.806-13.198 151.889-37.163 21.498-12.541 38.633-27.498 50.93-44.457 13.857-19.111 21.181-40.682 21.181-62.38v-48zM99.795 160c5.91 18.941 18.535 37.556 36.564 53.332 15.77 13.798 34.81 24.594 55.641 31.878v-85.21h-92.205z" /> +<glyph unicode="" d="M352 336c0 26.51 21.49 48 48 48s48-21.49 48-48c0-26.51-21.49-48-48-48-26.51 0-48 21.49-48 48zM479.196 415.196c-43.739 43.738-114.653 43.738-158.393 0-17.789-17.789-28.342-40.073-31.661-63.196v0l-102.347-155.114c-13.753-0.705-27.388-4.208-39.983-10.508l-78.946 61.712c-18.275 14.287-44.671 11.051-58.956-7.224-14.286-18.275-11.051-44.671 7.224-58.956l77.967-60.946c-8.48-33.391 0.336-70.269 26.465-96.397 39.453-39.452 103.416-39.452 142.868 0 24.233 24.233 33.575 57.714 28.038 89.083l124.527 111.493c23.124 3.319 45.408 13.872 63.197 31.661 43.739 43.738 43.739 114.653 0 158.392zM192 28.651c-37.195 0-67.349 30.152-67.349 67.349 0 0.356 0.021 0.707 0.027 1.062l33.456-26.152c7.68-6.003 16.791-8.912 25.837-8.912 12.481 0 24.836 5.54 33.119 16.136 14.286 18.275 11.051 44.671-7.224 58.956l-31.75 24.818c4.481 0.939 9.124 1.44 13.884 1.44 37.196 0 67.349-30.152 67.349-67.349s-30.153-67.348-67.349-67.348zM400 256c-44.183 0-80 35.817-80 80s35.817 80 80 80 80-35.817 80-80-35.817-80-80-80z" /> +<glyph unicode="" d="M151.961 61.995c13.572 0 26.893 6.568 34.986 18.708 12.867 19.301 7.651 45.377-11.649 58.244l-33.037 22.024c5.654 1.54 11.597 2.378 17.739 2.378 37.196 0 67.348-30.152 67.348-67.349 0-37.197-30.153-67.349-67.349-67.349-36.202 0-65.722 28.566-67.274 64.387l35.977-23.984c7.161-4.774 15.253-7.059 23.259-7.059zM426.67 480c46.938 0 85.33-38.406 85.33-85.344v-341.314c0-46.968-38.392-85.342-85.33-85.342h-341.326c-46.938 0-85.344 38.375-85.344 85.341v101.514l60.667-40.444c-5.826-31.587 3.469-65.415 27.899-89.845 39.452-39.452 103.415-39.452 142.868 0 24.234 24.233 33.575 57.715 28.038 89.083l124.528 111.494c23.124 3.319 45.408 13.872 63.197 31.661 43.738 43.738 43.738 114.653 0 158.392-43.74 43.739-114.654 43.739-158.393 0-17.789-17.789-28.342-40.073-31.661-63.196v0l-102.347-155.115c-15.924-0.816-31.689-5.382-45.863-13.696l-108.933 72.622v138.845c0 46.938 38.405 85.344 85.343 85.344h341.327zM448 336c0 44.183-35.817 80-80 80s-80-35.817-80-80 35.817-80 80-80 80 35.817 80 80zM320 336c0 26.51 21.49 48 48 48s48-21.49 48-48-21.49-48-48-48-48 21.49-48 48z" /> +<glyph unicode="" d="M0 201.795c0-23.199 2.17-44.19 6.511-62.967 4.339-18.777 10.348-35.092 18.026-48.946 7.678-13.854 17.442-26.039 29.293-36.554 11.85-10.516 24.703-19.112 38.556-25.788 13.853-6.675 29.668-12.099 47.444-16.273 17.776-4.173 35.928-7.094 54.455-8.764 18.527-1.669 38.89-2.503 61.089-2.503 22.366 0 42.814 0.834 61.34 2.503 18.527 1.67 36.721 4.592 54.58 8.764 17.859 4.172 33.756 9.596 47.694 16.273 13.938 6.677 26.873 15.272 38.808 25.788 11.935 10.515 21.783 22.702 29.543 36.554 7.76 13.852 13.811 30.168 18.151 48.946 4.34 18.778 6.51 39.768 6.51 62.967 0 41.394-13.854 77.197-41.559 107.408 1.502 4.006 2.879 8.554 4.131 13.645 1.252 5.091 2.42 12.351 3.505 21.782 1.085 9.431 0.668 20.321-1.252 32.673-1.919 12.352-5.466 24.953-10.642 37.806l-3.755 0.751c-2.671 0.5-7.053 0.375-13.145-0.376-6.092-0.751-13.186-2.253-21.281-4.507-8.095-2.253-18.527-6.593-31.296-13.019-12.769-6.426-26.247-14.479-40.435-24.16-24.368 6.676-57.834 10.015-100.396 10.015-42.396 0-75.778-3.339-100.147-10.015-14.188 9.681-27.75 17.734-40.685 24.16-12.935 6.426-23.242 10.766-30.92 13.019-7.677 2.254-14.855 3.714-21.531 4.382-6.677 0.668-10.892 0.876-12.644 0.626-1.752-0.25-3.13-0.543-4.131-0.876-5.174-12.853-8.721-25.453-10.64-37.806-1.919-12.352-2.337-23.243-1.252-32.673 1.085-9.43 2.254-16.691 3.505-21.782 1.252-5.091 2.629-9.639 4.131-13.645-27.707-30.211-41.561-66.013-41.561-107.408zM62.842 138.953c0 24.035 10.933 46.068 32.798 66.097 6.509 6.010 14.104 10.557 22.783 13.646 8.679 3.088 18.485 4.84 29.418 5.258 10.933 0.417 21.406 0.334 31.421-0.251 10.014-0.584 22.366-1.377 37.054-2.378 14.688-1.002 27.374-1.502 38.056-1.502 10.683 0 23.368 0.5 38.056 1.502 14.689 1.001 27.039 1.794 37.055 2.378 10.015 0.585 20.487 0.668 31.421 0.251 10.933-0.418 20.738-2.17 29.419-5.258 8.678-3.088 16.272-7.635 22.782-13.646 21.865-19.697 32.799-41.728 32.799-66.097 0-14.356-1.795-27.081-5.384-38.182-3.589-11.1-8.179-20.405-13.771-27.915-5.592-7.51-13.352-13.895-23.284-19.153-9.931-5.258-19.611-9.305-29.042-12.144-9.431-2.837-21.533-5.049-36.304-6.635-14.773-1.586-27.958-2.546-39.559-2.879-11.6-0.334-26.33-0.501-44.189-0.501-17.859 0-32.589 0.167-44.189 0.501-11.6 0.333-24.787 1.293-39.558 2.879-14.771 1.586-26.872 3.798-36.303 6.635-9.43 2.839-19.111 6.887-29.042 12.144-9.931 5.257-17.693 11.641-23.284 19.153-5.591 7.511-10.182 16.815-13.77 27.915-3.589 11.101-5.383 23.828-5.383 38.182zM320 144c0 26.51 14.327 48 32 48s32-21.49 32-48c0-26.51-14.327-48-32-48-17.673 0-32 21.49-32 48zM128 144c0 26.51 14.327 48 32 48s32-21.49 32-48c0-26.51-14.327-48-32-48-17.673 0-32 21.49-32 48z" /> +<glyph unicode="" d="M256 64.054c-9.577 0-19.154 4.958-29.071 14.875-3.905 3.905-3.905 10.237 0 14.143 3.905 3.904 10.237 3.904 14.143 0 6.103-6.105 10.986-9.072 14.928-9.072 3.941 0 8.825 2.967 14.929 9.071 3.906 3.904 10.236 3.904 14.143 0 3.905-3.905 3.905-10.237 0-14.143-9.918-9.916-19.495-14.874-29.072-14.874zM0 217.254c0-24.946 2.133-47.561 6.4-67.841 4.267-20.28 10.267-37.87 18-52.766 7.733-14.896 17.511-27.952 29.333-39.17 11.822-11.218 24.666-20.46 38.533-27.729 13.867-7.268 29.733-13.148 47.6-17.633 17.866-4.487 36.044-7.628 54.533-9.423 18.489-1.795 38.845-2.692 61.067-2.692 22.222 0 42.621 0.895 61.199 2.69 18.578 1.795 36.801 4.936 54.666 9.423 17.867 4.487 33.779 10.365 47.734 17.633 13.955 7.269 26.889 16.513 38.799 27.729 11.912 11.218 21.735 24.274 29.467 39.17 7.735 14.897 13.78 32.487 18.135 52.766 4.355 20.28 6.533 42.894 6.533 67.84 0 44.69-13.868 83.186-41.6 115.491 1.6 4.308 2.977 9.243 4.133 14.807 1.154 5.564 2.266 13.416 3.332 23.556 1.069 10.141 0.668 21.852-1.199 35.132-1.867 13.282-5.377 26.832-10.533 40.651l-4 0.809c-2.666 0.538-7.021 0.359-13.066-0.54-6.043-0.897-13.111-2.511-21.199-4.845-8.088-2.332-18.533-6.954-31.334-13.864-12.799-6.909-26.31-15.659-40.533-26.248-24.178 7.359-57.51 15.058-100 15.058-42.488 0-75.911-7.698-100.265-15.057-14.223 10.59-27.778 19.294-40.667 26.114-12.89 6.821-23.201 11.487-30.934 13.999-7.734 2.512-14.889 4.128-21.467 4.845-6.578 0.718-10.801 0.943-12.667 0.673-1.866-0.269-3.244-0.583-4.133-0.942-5.157-13.82-8.712-27.37-10.668-40.652-1.955-13.28-2.4-24.946-1.333-34.996 1.067-10.051 2.222-17.949 3.467-23.691 1.245-5.743 2.667-10.679 4.267-14.807-27.733-32.125-41.6-70.621-41.6-115.49zM68.268 160.298c0 29.011 10.666 55.319 32 78.928 6.4 7.203 13.823 12.656 22.267 16.356 8.445 3.701 18.044 5.803 28.8 6.303 10.756 0.5 21.022 0.4 30.8-0.3 9.778-0.701 21.867-1.651 36.267-2.851 14.399-1.202 26.844-1.801 37.333-1.801 10.488 0 22.934 0.6 37.332 1.801 14.403 1.2 26.491 2.15 36.268 2.851 9.78 0.7 20.045 0.8 30.801 0.3 10.756-0.501 20.401-2.602 28.934-6.303 8.533-3.7 16-9.153 22.4-16.356 21.332-23.609 32-49.917 32-78.928 0-17.006-1.777-32.162-5.334-45.467-3.555-13.306-8.045-24.458-13.467-33.461-5.422-9.004-13.024-16.609-22.799-22.81-9.779-6.203-19.246-11.005-28.4-14.405-9.156-3.4-20.979-6.052-35.467-7.953-14.491-1.898-27.467-3.051-38.936-3.45-11.467-0.4-25.91-0.6-43.332-0.6-17.422 0-31.822 0.201-43.2 0.6-11.378 0.399-24.311 1.552-38.8 3.45-14.489 1.901-26.311 4.552-35.467 7.953-9.155 3.401-18.622 8.202-28.4 14.405-9.778 6.202-17.378 13.806-22.8 22.81-5.423 9.003-9.912 20.155-13.467 33.461-3.555 13.305-5.333 28.461-5.333 45.467zM128 175.998c0 26.51 14.327 48 32 48s32-21.49 32-48c0-26.51-14.327-48-32-48-17.673 0-32 21.49-32 48zM320 175.998c0 26.51 14.327 48 32 48s32-21.49 32-48c0-26.51-14.327-48-32-48-17.673 0-32 21.49-32 48z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM408.028 71.972c-19.759-19.758-42.756-35.266-68.354-46.093-6.503-2.75-13.107-5.164-19.8-7.246v38.367c0 20.167-6.917 35-20.75 44.5 8.667 0.833 16.625 2 23.875 3.5s14.917 3.667 23 6.5 15.333 6.208 21.75 10.125 12.583 9 18.5 15.25 10.875 13.333 14.875 21.25 7.167 17.417 9.5 28.5 3.5 23.292 3.5 36.625c0 25.833-8.417 47.833-25.25 66 7.667 20 6.833 41.75-2.5 65.25l-6.25 0.75c-4.333 0.5-12.125-1.333-23.375-5.5s-23.875-11-37.875-20.5c-19.833 5.5-40.417 8.25-61.75 8.25-21.5 0-42-2.75-61.5-8.25-8.833 6-17.208 10.958-25.125 14.875-7.917 3.917-14.25 6.583-19 8s-9.167 2.292-13.25 2.625-6.708 0.417-7.875 0.25-2-0.333-2.5-0.5c-9.333-23.667-10.167-45.417-2.5-65.25-16.833-18.167-25.25-40.167-25.25-66 0-13.333 1.167-25.542 3.5-36.625s5.5-20.583 9.5-28.5 8.958-15 14.875-21.25 12.083-11.333 18.5-15.25 13.667-7.292 21.75-10.125 15.75-5 23-6.5 15.208-2.667 23.875-3.5c-13.667-9.333-20.5-24.167-20.5-44.5v-39.115c-7.549 2.247-14.99 4.902-22.3 7.994-25.597 10.827-48.594 26.335-68.353 46.093-19.758 19.759-35.267 42.756-46.093 68.354-11.199 26.479-16.878 54.631-16.878 83.674s5.679 57.195 16.879 83.675c10.827 25.597 26.335 48.594 46.093 68.353s42.756 35.267 68.353 46.093c26.48 11.2 54.632 16.879 83.675 16.879s57.195-5.679 83.675-16.879c25.598-10.827 48.595-26.335 68.354-46.093 19.758-19.758 35.266-42.756 46.093-68.353 11.199-26.48 16.878-54.632 16.878-83.675s-5.679-57.195-16.879-83.675c-10.827-25.597-26.335-48.595-46.093-68.353z" /> +<glyph unicode="" d="M117.639 355.64c-25.396 0-47.242-8.403-65.542-25.208-19.043-17.926-28.57-40.33-28.57-67.218 0-17.926 5.188-34.731 15.647-50.416 9.337-14.563 19.090-23.903 31.889-28.012v-1.121c-12.799-5.224-18.483-18.295-18.483-39.209 0-16.062 5.686-28.011 18.483-35.854v-1.121c-35.327-11.573-51.496-33.047-51.496-64.415 0-27.267 11.874-47.244 35.033-59.939 18.295-10.086 41.789-15.127 70.173-15.127 69.085 0 103.703 28.941 103.703 86.832 0 36.223-26.661 58.441-80.064 66.658-12.323 1.863-21.643 6.348-27.991 13.445-4.854 4.854-7.271 9.709-7.271 14.563 0 13.816 7.479 21.848 22.41 24.088 22.779 3.357 41.364 13.912 55.743 31.648 14.375 17.74 21.565 38.559 21.565 62.458 0 7.469-2.259 15.498-5.244 24.086 9.709 2.244 16.525 4.297 21.646 6.166v57.696c-22.527-8.964-43.495-13.442-61.421-13.442-15.687 8.961-31.912 13.442-50.21 13.442zM123.801 76.115c31.372 0 47.052-9.521 47.052-28.57 0-20.168-14.377-30.246-43.132-30.246-32.862 0-49.293 9.711-49.293 29.127-0.001 19.795 15.122 29.689 45.373 29.689zM119.88 224c-23.527 0-35.293 12.882-35.293 38.654 0 27.631 11.766 41.453 35.293 41.453 11.201 0 19.979-4.298 26.326-12.884 5.229-7.845 7.845-17.18 7.845-28.011 0-26.139-11.393-39.212-34.171-39.212zM290.192 480c-10.828 0-20.070-4.107-27.727-12.324-7.657-8.218-11.485-18.108-11.485-29.688 0-11.205 3.829-20.91 11.485-29.129 7.654-8.217 16.896-12.32 27.727-12.32 10.455 0 19.514 4.104 27.17 12.32 7.656 8.219 11.48 17.924 11.48 29.129 0 11.58-3.824 21.472-11.48 29.688-7.659 8.217-16.715 12.324-27.17 12.324zM321.565 352.001h-63.303c0.748-7.168-0.32-18.021-0.32-35.57v-174.216c0-17.928 1.068-32.387 0.32-38.018h63.303c-0.75 8.188-2.697 22.334-2.697 41.379v171.973c-0.003 16.432 1.947 27.284 2.697 34.452zM461.168 157.9c-16.436 0-24.541 12.514-24.541 37.533v103.32h24.932c4.48 0 8.516 0.246 13.559-0.123 5.043-0.374 7.076-0.125 9.639-0.125v53.495h-48.129v23.808c0 8.961 1.408 17.151 2.527 22.271h-64.979c1.121-5.12 1.014-12.938 1.014-23.395v-22.684h-28.16v-53.494c7.682 1.12 14.545 1.678 19.398 1.678l8.762-0.559v-101.393c0-31.371 3.979-54.336 11.818-68.9 10.461-19.42 28.811-29.129 56.068-29.129 19.424 0 36.559 3.732 49.357 11.205v56.016c-10.237-6.35-19.691-9.524-31.265-9.524z" /> +<glyph unicode="" d="M131.736 100.316c0-13.526 11.447-20.291 34.334-20.291 20.032 0 30.044 7.021 30.044 21.067 0 13.269-10.923 19.898-32.772 19.898-21.073 0.002-31.606-6.888-31.606-20.674zM426.674 480h-341.33c-46.938 0-85.344-38.405-85.344-85.344v-341.313c0-46.968 38.406-85.343 85.344-85.343h341.33c46.934 0 85.326 38.375 85.326 85.344v341.312c0 46.939-38.391 85.344-85.326 85.344zM237.864 275.506c-3.642-1.302-8.844-2.729-15.606-4.293 2.080-5.983 3.123-11.576 3.123-16.777 0-16.646-5.009-31.149-15.022-43.506-10.015-12.354-22.956-19.703-38.823-22.043-10.402-1.563-15.604-7.156-15.604-16.779 0-3.381 1.689-6.765 5.072-10.145 4.422-4.943 10.924-8.066 19.509-9.367 37.195-5.721 55.793-21.197 55.793-46.427 0-40.321-24.062-60.481-72.181-60.481-19.771 0-36.028 3.513-48.772 10.535-16.129 8.844-24.188 22.76-24.188 41.75 0 21.852 12.096 36.808 36.282 44.869v0.78c-8.842 5.462-13.263 13.785-13.263 24.972 0 14.566 4.162 23.672 12.484 27.311v0.781c-8.323 2.862-15.737 9.366-22.24 19.512-7.282 10.926-10.925 22.63-10.925 35.115 0 18.729 6.635 34.335 19.896 46.82 12.748 11.707 27.964 17.558 45.653 17.558 12.747 0 24.579-3.119 35.505-9.361 12.485 0 26.921 3.12 43.313 9.361l-0.006-40.185zM301.089 140.503h-44.093c0.521 5.201 0.779 14.042 0.779 26.532v121.346c0 12.227-0.261 20.682-0.779 25.359h44.093c-0.521-4.942-0.781-13.135-0.781-24.582v-119.782c0-13.267 0.261-22.892 0.781-28.873zM298.159 352.759c-5.332-5.722-11.641-8.581-18.923-8.581-7.543 0-13.979 2.859-19.313 8.581-5.333 5.726-8.001 12.486-8.001 20.289 0 8.067 2.668 14.956 8.001 20.683 5.333 5.721 11.77 8.584 19.313 8.584 7.282 0 13.592-2.863 18.923-8.584 5.333-5.728 7.999-12.615 7.999-20.683 0-7.803-2.666-14.564-7.999-20.289zM420.845 145.576c-9.627-5.205-21.203-7.803-34.729-7.803-18.985 0-32.124 6.76-39.405 20.287-5.465 10.145-8.193 26.14-8.193 47.99v69.842h0.389v0.781l-5.853 0.391c-3.382 0-7.806-0.391-13.267-1.171v37.847h19.117v15.216c0 7.285-0.389 13.14-1.17 17.56h45.259c-0.775-4.94-1.168-10.533-1.168-16.776v-15.999h33.943v-37.846c-1.299 0-3.705 0.129-7.218 0.389-3.512 0.261-6.828 0.393-9.949 0.393h-16.777v-72.572c0-17.432 5.725-26.145 17.167-26.145 8.063 0 15.348 2.209 21.854 6.632v-39.016zM160.608 279.797c-16.388 0-24.582-9.627-24.582-28.873 0-17.951 8.194-26.924 24.582-26.924 15.868 0 23.801 9.104 23.801 27.313 0 7.545-1.82 14.047-5.461 19.511-4.423 5.981-10.537 8.973-18.34 8.973z" /> +<glyph unicode="" d="M64 224.004c0-74.013 44.161-137.984 108.215-168.289l-91.589 244.392c-10.654-23.254-16.626-48.991-16.626-76.103zM385.614 233.436c0 23.117-8.527 39.118-15.827 51.571-9.729 15.41-18.86 28.447-18.86 43.858 0 17.187 13.383 33.188 32.243 33.188 0.852 0 1.66-0.102 2.488-0.151-34.158 30.485-79.67 49.098-129.654 49.098-67.080 0-126.093-33.523-160.422-84.284 4.505-0.141 8.753-0.227 12.356-0.227 20.077 0 51.17 2.376 51.17 2.376 10.345 0.591 11.566-14.217 1.229-15.411 0 0-10.405-1.184-21.976-1.775l69.917-202.553 42.022 122.728-29.911 79.825c-10.344 0.592-20.139 1.775-20.139 1.775-10.351 0.596-9.136 16.001 1.219 15.411 0 0 31.7-2.376 50.567-2.376 20.073 0 51.175 2.376 51.175 2.376 10.351 0.591 11.57-14.217 1.223-15.411 0 0-10.417-1.186-21.974-1.775l69.39-201.009 19.156 62.316c8.29 25.875 14.608 44.45 14.608 60.45zM259.371 207.648l-57.613-163.029c17.208-4.929 35.397-7.619 54.244-7.619 22.358 0 43.802 3.759 63.759 10.6-0.509 0.801-0.987 1.652-1.375 2.577l-59.015 157.471zM424.481 313.714c0.826-5.955 1.294-12.343 1.294-19.229 0-18.965-3.646-40.298-14.601-66.975l-58.643-165.136c57.081 32.414 95.469 92.644 95.469 161.629 0 32.515-8.53 63.080-23.519 89.711zM256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 0c-123.712 0-224 100.288-224 224s100.288 224 224 224 224-100.288 224-224-100.288-224-224-224z" /> +<glyph unicode="" d="M259.371 207.648l59.015-157.471c0.389-0.925 0.866-1.775 1.375-2.577-19.956-6.841-41.402-10.6-63.759-10.6-18.847 0-37.036 2.69-54.244 7.619l57.613 163.029zM448 224.003c0-68.985-38.388-129.215-95.47-161.629l58.643 165.136c10.956 26.677 14.602 48.010 14.602 66.975 0 6.886-0.469 13.274-1.294 19.229 14.989-26.631 23.519-57.196 23.519-89.711zM64 224.004c0 27.112 5.972 52.849 16.626 76.103l91.589-244.392c-64.054 30.305-108.215 94.276-108.215 168.289zM95.582 326.716c34.329 50.761 93.342 84.284 160.422 84.284 49.984 0 95.496-18.613 129.654-49.098-0.828 0.049-1.635 0.151-2.488 0.151-18.86 0-32.243-16.001-32.243-33.188 0-15.411 9.131-28.448 18.86-43.858 7.3-12.453 15.827-28.454 15.827-51.571 0-16.001-6.318-34.575-14.608-60.45l-19.156-62.316-69.39 201.009c11.558 0.589 21.974 1.775 21.974 1.775 10.347 1.194 9.129 16.002-1.223 15.411 0 0-31.102-2.376-51.175-2.376-18.867 0-50.567 2.376-50.567 2.376-10.355 0.59-11.57-14.815-1.219-15.411 0 0 9.795-1.183 20.139-1.775l29.911-79.825-42.022-122.728-69.917 202.553c11.571 0.591 21.976 1.775 21.976 1.775 10.337 1.194 9.116 16.002-1.229 15.411 0 0-31.093-2.376-51.17-2.376-3.603 0-7.851 0.086-12.356 0.227zM426 480h-340c-47.3 0-86-38.7-86-86v-340c0-47.3 38.7-86 86-86h340c47.3 0 86 38.7 86 86v340c0 47.3-38.7 86-86 86zM480 224c0-123.712-100.288-224-224-224s-224 100.288-224 224 100.288 224 224 224 224-100.288 224-224z" /> +<glyph unicode="" d="M133.002 341.661c16.416 16.422 43.001 16.422 59.402 0.016l3.913-3.934 50.552 50.578-3.937 3.94c-28.812 28.85-69.257 38.939-106.21 30.261-5.297 32.591-33.544 57.462-67.587 57.478-37.825 0-68.477-30.721-68.485-68.579 0-32.668 22.795-60 53.331-66.915-11.569-38.725-2.121-82.417 28.423-112.992l113.913-113.95 50.498 50.607-113.905 113.943c-16.341 16.361-16.371 43.063 0.092 59.547zM511.356 411.421c0.008 37.881-30.659 68.579-68.492 68.579-34.617 0-63.239-25.722-67.841-59.119-38.537 11.332-81.892 1.748-112.32-28.704l-113.92-113.95 50.551-50.586 113.883 113.928c16.47 16.483 42.994 16.453 59.342 0.092 16.4-16.415 16.4-43.057-0.016-59.478l-3.897-3.918 50.505-50.624 3.929 3.964c30.229 30.283 39.839 73.378 28.806 111.819 33.575 4.417 59.47 33.182 59.47 67.997zM453.133 104.468c9.051 37.229-0.988 78.162-30.054 107.25l-113.745 113.996-50.551-50.561 113.76-114.006c16.47-16.498 16.432-43.048 0.092-59.424-16.401-16.407-43.002-16.407-59.418 0.015l-3.883 3.895-50.497-50.623 3.866-3.864c30.758-30.797 74.809-40.219 113.684-28.244 6.316-31.341 33.967-54.902 67.129-54.902 37.802 0 68.484 30.675 68.484 68.563 0 34.6-25.59 63.228-58.867 67.905zM306.172 215.658l-113.768-113.996c-16.355-16.384-43.017-16.414-59.472 0.062-16.409 16.452-16.416 43.049-0.022 59.485l3.904 3.887-50.543 50.562-3.867-3.856c-29.38-29.401-39.28-70.917-29.725-108.491-30.199-7.13-52.679-34.317-52.679-66.748-0.008-37.873 30.666-68.563 68.491-68.563 32.55 0.016 59.794 22.709 66.77 53.191 37.351-9.276 78.499 0.652 107.672 29.878l113.745 113.98-50.506 50.609z" /> +<glyph unicode="" d="M478.898 288h-28.703c-17.583 0-32.994 14.871-34.195 32v0c0.002 91.334-73.629 160-165.595 160h-83.912c-91.906 0-166.428-74-166.493-165.333v-181.399c0-91.327 74.587-165.268 166.492-165.268h179.21c91.974 0 166.298 73.941 166.298 165.268v117.191c0 18.251-14.72 37.541-33.102 37.541zM160 352h96c17.6 0 32-14.4 32-32s-14.4-32-32-32h-96c-17.6 0-32 14.4-32 32s14.4 32 32 32zM352 96h-192c-17.6 0-32 14.4-32 32s14.4 32 32 32h192c17.6 0 32-14.4 32-32s-14.4-32-32-32z" /> +<glyph unicode="" d="M426.674 480h-341.349c-47.123 0-85.325-38.209-85.325-85.341v-341.318c0-47.133 38.202-85.341 85.325-85.341h341.348c47.125 0 85.324 38.208 85.324 85.341l0.003 341.318c0 47.132-38.202 85.341-85.326 85.341zM448 155.951c0-68.495-55.743-123.951-124.722-123.951h-134.409c-68.928 0-124.869 55.456-124.869 123.951v136.049c0.048 68.5 55.94 124 124.869 124h62.934c68.976 0 124.199-51.5 124.197-120 0.901-12.847 12.461-24 25.646-24h21.526c13.787 0 24.828-14.467 24.828-28.156v-87.893zM352 160c0-17.6-14.4-32-32-32h-128c-17.6 0-32 14.4-32 32v0c0 17.6 14.4 32 32 32h128c17.6 0 32-14.4 32-32v0zM288 288c0-17.6-14.4-32-32-32h-64c-17.6 0-32 14.4-32 32v0c0 17.6 14.4 32 32 32h64c17.6 0 32-14.4 32-32v0z" /> +<glyph unicode="" d="M288.016 256l-0.001-117.092c0-29.709-0.385-46.828 2.765-55.25 3.125-8.377 10.959-17.073 19.495-22.101 11.342-6.794 24.271-10.188 38.854-10.188 25.927 0 41.239 3.424 66.871 20.27v-76.972c-21.85-10.276-40.933-16.297-58.662-20.461-17.75-4.121-36.93-6.203-57.532-6.203-23.414 0-37.228 2.943-55.205 8.828-17.979 5.934-33.33 14.403-46.010 25.27-12.725 10.961-21.511 22.604-26.424 34.916-4.913 12.318-7.358 30.207-7.358 53.622v179.55h-68.713v72.503c20.104 6.521 42.582 15.894 56.89 28.076 14.377 12.225 25.883 26.853 34.553 43.972 8.696 17.073 14.674 38.856 17.936 65.258h82.542l-0.001-127.998h127.984v-96h-127.984z" /> +<glyph unicode="" d="M426.69 480h-341.346c-46.939 0-85.343-38.407-85.343-85.343v-341.313c0-46.969 38.404-85.344 85.343-85.344h341.346c46.935 0 85.31 38.375 85.31 85.344v341.314c-0.004 46.935-38.379 85.342-85.31 85.342zM365.858 67.656c-15.076-7.094-28.764-12.094-41-14.969-12.248-2.845-25.48-4.279-39.701-4.279-16.156 0-25.688 2.029-38.094 6.094-12.404 4.094-23 9.936-31.75 17.436-8.779 7.564-14.843 15.599-18.233 24.097-3.392 8.502-5.078 20.846-5.078 37.002v123.901h-47.998v50.033c13.872 4.5 29.968 10.967 39.842 19.375 9.92 8.436 17.859 18.529 23.842 30.342 6.002 11.783 10.125 26.813 12.376 45.033h50.25v-81.721h81.686v-63.063h-81.689v-90.594c0-20.5-0.264-32.313 1.908-38.125 2.156-5.78 7.563-11.78 13.451-15.25 7.828-4.688 16.752-7.030 26.813-7.030 17.893 0 35.689 5.813 53.375 17.438v-55.72z" /> +<glyph unicode="" d="M424 160l-7.429 208.010c-0.314 8.795 6.629 15.99 15.429 15.99h64c8.8 0 14.734-7.088 13.188-15.751l-37.188-208.249zM480 92c0-15.4-12.6-28-28-28h-8c-15.4 0-28 12.6-28 28v8c0 15.4 12.6 28 28 28h8c15.4 0 28-12.6 28-28v-8zM192 384c-106.039 0-192-71.634-192-160 0-88.365 85.961-160 192-160 106.039 0 192 71.635 192 160 0 88.366-85.961 160-192 160zM320 256h-37.131l-58.869-58.87v-37.13h48v-32h-128v32h48v37.13l-90.87 90.87h-21.031v32h95.803v-32h-21.032l53.13-53.13 16 16v37.13h96v-32z" /> +<glyph unicode="" d="M283.828 111.542c-40.972-19.059-79.079-18.858-104.67-17.010-30.526 2.205-55.079 10.562-65.871 17.866-6.65 4.503-15.692 2.761-20.195-3.891-4.502-6.651-2.76-15.693 3.891-20.195 17.349-11.743 48.034-20.477 80.081-22.79 5.433-0.392 11.399-0.639 17.823-0.639 27.891 0 63.313 2.658 101.21 20.285 7.282 3.389 10.439 12.037 7.052 19.32-3.388 7.283-12.038 10.436-19.321 7.054zM445.474 133.092c1.393 126.344 14.381 365.103-227.485 345.806-238.8-19.221-175.482-271.484-179.041-355.975-3.154-44.693-17.989-99.324-38.948-154.923h64.55c6.633 23.561 11.512 46.86 13.616 69.075 3.891-2.714 8.054-5.337 12.497-7.85 7.229-4.259 13.442-9.922 20.020-15.917 15.372-14.009 32.795-29.887 66.856-31.876 2.286-0.131 4.587-0.197 6.838-0.197 34.448 0 58.007 15.077 76.939 27.191 9.070 5.806 16.909 10.82 24.282 13.226 20.955 6.56 39.266 17.148 52.952 30.626 2.138 2.104 4.121 4.269 5.981 6.474 7.623-27.939 18.059-59.379 29.644-90.752h137.825c-33.087 51.112-67.218 101.187-66.526 165.092zM62.055 201.824c0 0.008 0 0.015-0.001 0.023-2.373 41.231 17.355 75.916 44.063 77.468 26.706 1.553 50.28-30.614 52.652-71.846 0-0.007 0.002-0.015 0.002-0.022 0.128-2.223 0.184-4.423 0.185-6.603-8.462-2.128-16.096-5.218-22.936-8.815-0.026 0.306-0.046 0.608-0.076 0.915 0 0.004 0 0.009 0 0.013-2.285 23.405-14.786 41.080-27.926 39.479-13.14-1.602-21.94-21.875-19.656-45.279 0-0.005 0.002-0.009 0.002-0.013 0.996-10.204 3.934-19.318 8.021-26.222-1.017-0.802-3.892-2.906-7.203-5.328-2.485-1.817-5.51-4.029-9.157-6.715-9.941 13.047-16.753 31.79-17.97 52.945zM332.63 99.911c-0.95-21.793-29.454-42.296-55.791-50.522l-0.148-0.048c-10.95-3.551-20.714-9.8-31.052-16.415-17.366-11.112-35.323-22.604-61.261-22.604-1.702 0-3.447 0.052-5.163 0.148-23.758 1.389-34.871 11.516-48.94 24.338-7.421 6.763-15.095 13.757-24.988 19.562l-0.212 0.122c-21.353 12.052-34.606 27.041-35.454 40.097-0.421 6.49 2.469 12.109 8.591 16.7 13.318 9.986 22.239 16.511 28.142 20.829 6.555 4.794 8.534 6.24 10 7.632 1.048 0.993 2.182 2.094 3.402 3.281 12.223 11.887 32.68 31.781 64.075 31.781 19.202 0 40.449-7.4 63.085-21.951 10.662-6.939 19.941-10.143 31.69-14.2 8.078-2.789 17.234-5.951 29.496-11.202l0.198-0.082c11.44-4.702 24.948-13.282 24.33-27.466zM326.323 151.097c-2.2 1.107-4.487 2.16-6.872 3.143-11.053 4.728-19.916 7.937-27.267 10.499 4.058 7.947 6.58 17.86 6.812 28.621 0 0.005 0 0.011 0 0.015 0.563 26.187-12.644 47.448-29.498 47.488-16.855 0.039-30.975-21.157-31.538-47.343 0-0.005 0-0.009 0-0.014-0.019-0.857-0.021-1.708-0.010-2.555-10.381 4.776-20.59 8.245-30.583 10.38-0.046 0.984-0.102 1.966-0.122 2.96 0 0.008 0 0.018 0 0.025-0.969 47.706 28.301 87.195 65.377 88.201 37.075 1.007 67.914-36.85 68.886-84.555 0-0.009 0-0.019 0-0.026 0.437-21.573-5.33-41.433-15.185-56.839z" /> +<glyph unicode="" d="M395.749 207.954c-0.647 64.841 52.879 95.938 55.271 97.483-30.076 44.010-76.925 50.039-93.621 50.736-39.871 4.037-77.798-23.474-98.033-23.474-20.184 0-51.409 22.877-84.476 22.276-43.458-0.646-83.529-25.269-105.906-64.19-45.152-78.349-11.563-194.42 32.445-257.963 21.504-31.102 47.146-66.038 80.813-64.79 32.421 1.294 44.681 20.979 83.878 20.979 39.197 0 50.214-20.979 84.525-20.335 34.887 0.648 56.991 31.699 78.346 62.898 24.695 36.084 34.863 71.019 35.462 72.813-0.774 0.353-68.030 26.118-68.704 103.567zM331.281 398.239c17.869 21.679 29.93 51.756 26.64 81.761-25.739-1.048-56.939-17.145-75.405-38.775-16.571-19.188-31.074-49.813-27.187-79.218 28.733-2.242 58.064 14.602 75.952 36.232z" /> +<glyph unicode="" d="M256.5 96c-66.156 0-130.837 9.686-193.050 28.849l10.124 30.371c58.952-18.079 120.238-27.22 182.926-27.22 8.172 0 16.319 0.164 24.441 0.474 2.113 38.78 7.059 63.526 7.059 63.526s-32 0-96 0c0 87.505 29.909 165.027 62.465 223.5h-254.465v-383h283.088c-2.336 22.842-3.152 44.43-3.077 63.92-7.816-0.274-15.653-0.42-23.511-0.42zM96 352h32v-64h-32v64zM512 415.5h-213.565c-0.974-1.598-1.947-3.207-2.92-4.843-19.208-32.286-34.468-65.379-45.358-98.36-9.103-27.566-15.151-55.116-18.086-82.297h102.429l-9.229-45.417c-0.157-0.808-4.085-21.422-6.1-53.471 40.932 4.063 81.111 12.103 120.257 24.107l10.124-30.371c-42.783-13.178-86.732-21.874-131.526-26.021-0.018-2.188-0.028-4.395-0.021-6.64 0.062-20.315 1.173-40.285 3.301-59.688h190.694v383.001zM416 288h-32v64h32v-64zM293.632-32h39.084c-2.73 10.907-5.094 22.096-7.069 33.543-1.747 10.126-3.191 20.46-4.343 30.957h-38.216c2.116-20.689 5.475-42.401 10.544-64.5zM344.224 480h-48.198c-12.875-17.435-27.466-39.185-41.56-64.5h43.969c16.837 27.656 33.582 49.701 45.789 64.5z" /> +<glyph unicode="" d="M432 320c-17.6 0-32-14.4-32-32v-128c0-17.6 14.4-32 32-32s32 14.4 32 32v128c0 17.6-14.4 32-32 32zM48 320c-17.6 0-32-14.4-32-32v-128c0-17.6 14.4-32 32-32s32 14.4 32 32v128c0 17.6-14.401 32-32 32zM96 112c0-26.51 21.49-48 48-48h16v-64c0-17.6 14.4-32 32-32s32 14.4 32 32v64h32v-64c0-17.6 14.401-32 32-32s32 14.4 32 32v64h16c26.51 0 48 21.49 48 48v176h-288v-176zM299.299 435.253l20.252 38.903c1.016 1.951 0.25 4.379-1.701 5.395s-4.379 0.25-5.395-1.701l-20.559-39.493c-16.099 6.224-33.597 9.643-51.896 9.643-18.298 0-35.796-3.419-51.898-9.643l-20.558 39.492c-1.016 1.951-3.443 2.717-5.395 1.701s-2.717-3.443-1.701-5.395l20.25-38.904c-45.315-20.509-78.12-63.792-83.81-115.252h286.22c-5.688 51.462-38.493 94.744-83.809 115.254zM176 344.8c-12.813 0-23.2 10.387-23.2 23.2s10.387 23.2 23.2 23.2 23.2-10.387 23.2-23.2c-0.001-12.813-10.387-23.2-23.2-23.2zM304 344.8c-12.813 0-23.201 10.387-23.201 23.2s10.389 23.2 23.201 23.2 23.199-10.387 23.199-23.2c0-12.813-10.386-23.2-23.199-23.2z" /> +<glyph unicode="" d="M206.115 224.043c-23.854 12.259-47.043 18.479-68.94 18.479-2.978 0-5.976-0.090-8.974-0.354-27.94-2.312-53.461-9.684-69.875-15.414-4.354-1.599-8.817-3.288-13.415-5.153l-44.911-155.697c30.851 11.416 58.146 16.969 83.135 16.969 40.423 0 69.764-15.104 93.996-30.652 11.481 38.959 39.022 133.045 47.241 161.162-5.975 3.642-12.038 7.285-18.257 10.66zM264.174 184.465l-45.223-157.074c13.416-7.686 58.549-32.025 93.106-32.025 27.896 0 59.126 7.148 95.417 21.896l43.178 150.988c-29.316-9.461-57.438-14.26-83.732-14.26-47.975 0-81.557 15.549-102.746 30.475zM146.411 295.605c38.559-0.399 67.076-15.104 90.708-30.251l46.376 158.672c-9.773 5.598-35.403 19.547-53.929 24.3-12.193 2.842-25.010 4.308-38.602 4.308-25.898-0.488-54.194-6.973-86.444-19.9l-44.22-155.298c32.404 12.218 60.322 18.17 86.043 18.17 0.023-0.001 0.068-0.001 0.068-0.001zM512 380.938c-29.407-11.416-58.104-17.233-85.514-17.233-45.843 0-79.646 15.901-101.547 31.183l-45.975-159.118c30.873-19.854 64.145-29.939 99.061-29.939 28.474 0 57.97 6.84 87.731 20.344l-0.091 1.111 1.867 0.443 44.468 153.209z" /> +<glyph unicode="" d="M0.175 224l-0.175 156.037 192 26.072v-182.109zM224 410.759l255.936 37.241v-224h-255.936zM479.999 192l-0.063-224-255.936 36.008v187.992zM192 8.082l-191.844 26.297-0.010 157.621h191.854z" /> +<glyph unicode="" d="M445.98 222.898c-9.043 0-17.674-1.76-25.532-4.928-5.253 57.179-55.145 102.030-116 102.030-14.893 0-29.341-2.815-42.159-7.582-4.98-1.851-6.289-3.76-6.289-7.458v-201.357c0-3.883 3.12-7.117 7.062-7.498 0.168-0.017 181.768-0.105 182.945-0.105 36.452 0 65.993 28.408 65.993 63.447s-29.567 63.451-66.020 63.451zM200 96h16l8 112.11-8 111.89h-16l-8-111.89zM152 96h-16l-8 81.375 8 78.625h16l8-80zM72 96h16l8 64-8 64h-16l-8-64zM8 128h16l8 32-8 32h-16l-8-32z" /> +<glyph unicode="" d="M426.686 480h-341.342c-46.937 0-85.343-38.403-85.343-85.34v-234.658l7.999 31.998h16l8-32-8-32h-16l-8 31.998v-106.652c0.001-46.969 38.407-85.346 85.344-85.346h341.342c46.939 0 85.314 38.377 85.314 85.346v106.101c0-35.039-29.541-63.447-65.993-63.447-1.177 0-182.777 0.088-182.945 0.105-3.941 0.381-7.062 3.615-7.062 7.498v201.357c0 3.697 1.309 5.606 6.289 7.458 12.818 4.767 27.267 7.582 42.159 7.582 60.854 0 110.746-44.851 115.999-102.029 7.858 3.168 16.489 4.928 25.532 4.928 36.453 0 66.021-28.412 66.021-63.451v235.211c0 46.938-38.379 85.341-85.314 85.341zM88 96h-16l-8 64 8 64h16l8-64-8-64zM152 96h-16l-8 81.375 8 78.625h16l8-80-8-80zM216 96h-16l-8 112.11 8 111.89h16l8-111.89-8-112.11z" /> +<glyph unicode="" d="M487.655 191.031c1.406 10.4 2.215 20.973 2.215 31.736 0 129.155-105.271 233.872-235.103 233.872-12.904 0-25.555-1.060-37.866-3.080-22.072 14.384-48.342 22.767-76.612 22.767-77.523 0-140.289-62.808-140.289-140.306 0-28.198 8.299-54.394 22.59-76.389-1.925-12.017-2.909-24.323-2.909-36.859 0-129.176 105.217-233.882 235.085-233.882 14.657 0 28.927 1.427 42.796 3.933 21.55-13.369 46.934-21.148 74.146-21.148 77.502-0.001 140.292 62.823 140.292 140.313-0.003 29.293-8.96 56.528-24.345 79.043zM276.74 50.404c-74.705-3.892-109.664 12.637-141.689 42.691-35.765 33.567-21.398 71.854 7.74 73.801 29.122 1.944 46.607-33.013 62.15-42.736 15.524-9.688 74.594-31.76 105.794 3.908 33.976 38.828-22.594 58.92-64.059 65.002-59.203 8.766-133.95 40.792-128.135 103.907 5.816 63.074 53.582 95.414 103.85 99.976 64.077 5.817 105.791-9.707 138.785-37.86 38.15-32.529 17.508-68.894-6.799-71.82-24.212-2.909-51.404 53.504-104.791 54.352-55.027 0.864-92.217-57.261-24.286-73.784 67.966-16.505 140.75-23.286 166.961-85.417 26.229-62.137-40.754-128.125-115.521-132.020z" /> +<glyph unicode="" d="M128 160c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM320 160c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32zM321.556 91.611c8.241 6.493 20.188 5.077 26.682-3.166 6.494-8.243 5.076-20.189-3.167-26.683-22.948-18.079-57.911-29.762-89.071-29.762-31.161 0-66.124 11.683-89.072 29.761-8.243 6.495-9.66 18.441-3.166 26.684 6.495 8.241 18.441 9.659 26.683 3.166 13.211-10.409 39.361-21.611 65.555-21.611 26.194 0 52.344 11.202 65.556 21.611zM512 224c0 35.346-28.654 64-64 64-24.058 0-44.996-13.285-55.926-32.91-32.896 17.997-72.976 29.623-116.64 32.304l38.191 85.763 73.097-21.1c6.576-18.671 24.359-32.057 45.278-32.057 26.51 0 48 21.49 48 48s-21.49 48-48 48c-18.28 0-34.171-10.221-42.277-25.257l-81.453 23.512c-9.112 2.629-18.769-1.861-22.626-10.526l-51.885-116.513c-42.569-2.998-81.631-14.511-113.818-32.118-10.932 19.625-31.883 32.902-55.941 32.902-35.346 0-64-28.654-64-64 0-26.156 15.701-48.627 38.186-58.551-4.035-12.014-6.186-24.552-6.186-37.449 0-88.365 100.288-160 224-160 123.711 0 224 71.635 224 160 0 12.896-2.15 25.431-6.184 37.443 22.485 9.925 38.184 32.401 38.184 58.557zM432 386c9.941 0 18-8.059 18-18s-8.059-18-18-18-18 8.059-18 18 8.059 18 18 18zM32 224c0 17.645 14.355 32 32 32 12.754 0 23.786-7.502 28.923-18.323-16.724-12.683-30.583-27.313-40.833-43.369-11.762 4.735-20.090 16.256-20.090 29.692zM256 6c-102.725 0-186 54.621-186 122s83.275 122 186 122c102.725 0 186-54.621 186-122s-83.275-122-186-122zM459.91 194.308c-10.25 16.056-24.109 30.686-40.833 43.369 5.138 10.821 16.169 18.323 28.923 18.323 17.645 0 32-14.355 32-32 0-13.436-8.328-24.957-20.090-29.692z" /> +<glyph unicode="" d="M426 480h-340c-47.3 0-86-38.7-86-86v-340c0-47.3 38.7-86 86-86h340c47.3 0 86 38.7 86 86v340c0 47.3-38.7 86-86 86zM192 64h-64v224h64v-224zM160 320c-17.673 0-32 14.327-32 32s14.327 32 32 32 32-14.327 32-32-14.327-32-32-32zM416 64h-64v128c0 17.673-14.327 32-32 32s-32-14.327-32-32v-128h-64v224h64v-39.736c13.199 18.132 33.376 39.736 56 39.736 39.765 0 72-35.817 72-80v-144z" /> +<glyph unicode="" d="M409.79 73.186c-53.333 0.209-81.749 26.291-101.496 72.251l-5.649 12.541-48.685 111c-16.146 39.293-56.211 65.836-101.417 65.836-61.167 0-110.792-49.626-110.792-110.836 0-61.209 49.624-110.834 110.792-110.834 42.669 0 79.771 24.125 98.291 59.5l19.688-45.416c-27.956-34.085-70.438-55.792-117.977-55.792-84.255 0-152.545 68.251-152.545 152.543 0 84.252 68.29 152.586 152.542 152.586 63.583 0 114.918-33.959 141-94.126 1.978-4.668 27.579-64.543 49.913-115.5 13.834-31.541 25.63-52.459 63.878-53.752 37.584-1.291 63.378 21.584 63.378 50.504 0 28.25-19.668 35.041-52.875 46.082-59.691 19.667-90.503 39.417-90.503 86.751 0 46.168 31.416 76.959 82.457 76.959 33.248 0 57.253-14.793 73.88-44.293l-32.628-16.666c-12.295 17.207-25.854 24-43.086 24-23.956 0-41.063-16.668-41.063-38.833 0-31.461 28.147-36.211 67.503-49.127 52.979-17.25 77.604-36.96 77.604-86.168 0.001-51.668-44.336-89.294-102.21-89.21z" /> +<glyph unicode="" d="M426 480h-340c-47.3 0-86-38.7-86-86v-340c0-47.3 38.7-86 86-86h340c47.3 0 86 38.7 86 86v340c0 47.3-38.7 86-86 86zM373.258 99.556c-88.779 0-119.569 40.028-135.986 89.802l-16.425 51.318c-12.319 37.463-26.687 66.712-71.842 66.712-31.31 0-63.123-22.579-63.123-85.699 0-49.264 25.144-80.056 60.557-80.056 40.021 0 66.71 29.765 66.71 29.765l16.425-44.644c0 0-27.718-27.197-85.699-27.197-71.846 0-111.875 42.076-111.875 120.082 0 81.081 40.029 128.805 115.464 128.805 68.253 0 102.64-24.632 124.188-91.346l16.936-51.313c12.318-37.465 33.867-64.662 85.698-64.662 34.896 0 53.367 7.699 53.367 26.684 0 14.885-8.72 25.66-34.892 31.82l-34.9 8.207c-42.587 10.262-59.522 32.329-59.522 67.226 0 55.936 45.16 73.384 91.343 73.384 52.345 0 84.161-18.988 88.266-65.172l-51.317-6.16c-2.054 22.066-15.396 31.305-40.027 31.305-22.582 0-36.436-10.265-36.436-27.713 0-15.395 6.671-24.633 29.247-29.765l32.842-7.182c44.135-10.266 67.746-31.82 67.746-73.386-0.002-51.317-43.108-70.815-106.745-70.815z" /> +<glyph unicode="" d="M426.688 480h-341.345c-46.938 0-85.343-38.408-85.343-85.346v-341.312c0-46.965 38.405-85.342 85.343-85.342h341.345c46.937 0 85.312 38.376 85.312 85.342v341.312c0 46.938-38.375 85.346-85.312 85.346zM480 53.342c0-14.167-5.57-27.541-15.685-37.658-10.111-10.114-23.474-15.684-37.627-15.684h-170.688v224h-224v170.654c0 14.154 5.575 27.525 15.698 37.648 10.122 10.123 23.492 15.698 37.645 15.698h170.657v-224h224v-170.658z" /> +<glyph unicode="" d="M426 480h-340c-47.3 0-86-38.7-86-86v-340c0-47.3 38.7-86 86-86h340c47.3 0 86 38.7 86 86v340c0 47.3-38.7 86-86 86zM256 320c-17.645 0-32-14.355-32-32v-128c0-52.936-43.065-96-96-96s-96 43.064-96 96v64h64v-64c0-17.645 14.355-32 32-32s32 14.355 32 32v128c0 52.935 43.065 96 96 96s96-43.065 96-89v-31l-41-12-23 12v31c0 10.645-14.355 25-32 25zM480 160c0-52.936-43.065-96-96-96s-96 43.064-96 103v62l23-12 41 12v-62c0-24.645 14.355-39 32-39s32 14.355 32 32v64h64v-64z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 352c-17.645 0-32-14.355-32-32v-128c0-52.935-43.065-96-96-96s-96 43.065-96 96v64h64v-64c0-17.645 14.355-32 32-32s32 14.355 32 32v128c0 52.935 43.065 96 96 96s96-43.065 96-89v-31l-41-12-23 12v31c0 10.645-14.355 25-32 25zM384 96c-52.935 0-96 43.065-96 103v62l23-12 41 12v-62c0-24.645 14.355-39 32-39s32 14.355 32 32v64h64v-64c0-52.935-43.065-96-96-96z" /> +<glyph unicode="" d="M512 160v-192h-512v192h64v-128h384v128zM96 128h320v-64h-320zM103.576 197.267l13.849 62.482 312.416-69.248-13.849-62.482zM139.829 325.721l27.046 58.003 290.016-135.232-27.046-58.003zM495.861 299.262l-38.961-50.775-253.873 194.804 28.168 36.709h29.122z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.613-256 256-256c141.385 0 256 114.615 256 256s-114.615 256-256 256zM280.822 137.941c-23.26 1.807-33.021 13.328-51.252 24.404-10.030-52.588-22.282-103.008-58.57-129.343-11.202 79.484 16.447 139.182 29.285 202.557-21.892 36.853 2.635 111.017 48.81 92.737 56.813-22.474-49.2-137.004 21.966-151.308 74.31-14.934 104.644 128.929 58.571 175.712-66.579 67.553-193.799 1.54-178.155-95.178 3.807-23.646 28.236-30.819 9.762-63.451-42.61 9.446-55.325 43.051-53.688 87.856 2.634 73.337 65.892 124.682 129.343 131.783 80.242 8.982 155.553-29.454 165.953-104.938 11.706-85.195-36.224-177.465-122.025-170.831z" /> +<glyph unicode="" d="M426.675 480h-341.351c-47.125 0-85.324-38.21-85.324-85.343v-341.315c0-47.133 38.199-85.342 85.324-85.342h341.351c47.125 0 85.325 38.209 85.325 85.342v341.315c0 47.133-38.2 85.343-85.325 85.343zM280.822 137.941c-23.26 1.807-33.021 13.328-51.252 24.404-10.030-52.589-22.281-103.009-58.569-129.344-11.202 79.484 16.447 139.182 29.285 202.557-21.893 36.853 2.635 111.017 48.81 92.737 56.813-22.474-49.2-137.004 21.966-151.308 74.31-14.934 104.644 128.929 58.571 175.712-66.579 67.553-193.799 1.54-178.155-95.178 3.807-23.646 28.236-30.819 9.762-63.451-42.61 9.446-55.325 43.051-53.688 87.856 2.634 73.337 65.892 124.682 129.343 131.783 80.242 8.982 155.553-29.454 165.953-104.938 11.705-85.194-36.225-177.464-122.026-170.83z" /> +<glyph unicode="" d="M426.671 480h-341.328c-46.937 0-85.343-38.405-85.343-85.345v-341.311c0-46.969 38.406-85.344 85.343-85.344h341.328c46.938 0 85.329 38.375 85.329 85.345v341.31c0 46.94-38.391 85.345-85.329 85.345zM155.889 146.606h-55.632c-3.351 0-5.854 1.504-7.271 3.792-1.467 2.379-1.542 5.464 0 8.534l59.11 104.313c0.063 0.114 0.063 0.19 0 0.316l-37.615 65.116c-1.556 3.098-1.783 6.157-0.316 8.534 1.417 2.301 4.235 3.477 7.586 3.477h55.632c8.535 0 12.72-5.499 15.489-10.431 0 0 38.020-66.33 38.249-66.696-2.252-3.97-60.059-106.21-60.059-106.21-2.844-5.131-6.852-10.745-15.173-10.745zM418.956 404.731l-123.176-217.79c-0.075-0.115-0.075-0.255 0-0.367l78.431-143.295c1.556-3.084 1.593-6.221 0.113-8.597-1.415-2.288-4.033-3.552-7.383-3.552h-55.57c-8.522 0-12.783 5.663-15.54 10.596 0 0-78.848 144.646-79.050 145.023 3.944 6.98 123.797 219.523 123.797 219.523 2.984 5.362 6.587 10.596 14.894 10.596h56.203c3.351 0 5.981-1.265 7.396-3.553 1.466-2.376 1.428-5.511-0.115-8.584z" /> +<glyph unicode="" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM172.741 159.797h-46.267c-2.788 0-4.87 1.247-6.049 3.146-1.219 1.976-1.282 4.533 0 7.080l49.162 86.535c0.052 0.095 0.052 0.158 0 0.263l-31.284 54.019c-1.294 2.569-1.483 5.106-0.263 7.079 1.179 1.909 3.522 2.885 6.31 2.885h46.267c7.1 0 10.579-4.562 12.884-8.654 0 0 31.62-55.025 31.809-55.328-1.873-3.295-49.95-88.11-49.95-88.11-2.366-4.258-5.699-8.915-12.619-8.915zM391.525 373.931l-102.441-180.672c-0.062-0.097-0.062-0.214 0-0.306l65.229-118.875c1.295-2.558 1.326-5.16 0.096-7.132-1.178-1.897-3.354-2.946-6.141-2.946h-46.217c-7.088 0-10.633 4.699-12.924 8.79 0 0-65.576 119.996-65.744 120.307 3.28 5.791 102.958 182.113 102.958 182.113 2.48 4.448 5.477 8.79 12.387 8.79h46.742c2.789 0 4.977-1.049 6.152-2.947 1.22-1.974 1.187-4.573-0.097-7.122z" /> +<glyph unicode="" d="M183.781 480c-121.679 0-183.781-70.081-183.781-200.928v0-274.517l119.195 119.314v139.448c0 54.208 14.365 88.703 62.559 96.447v0c16.836 3.292 51.875 2.139 74.153 2.139v0-82.798c0-0.755 0.104-2.103 0.297-2.793v0c0.935-3.352 3.965-5.808 7.558-5.815v0c2.031-0.004 3.934 1.052 5.895 2.985v0l206.561 206.487-292.437 0.031zM392.805 324.127v-139.445c0-54.207-14.368-88.707-62.558-96.447v0c-16.836-3.291-51.878-2.139-74.156-2.139v0 82.797c0 0.75-0.103 2.102-0.297 2.791v0c-0.932 3.356-3.961 5.811-7.556 5.815v0c-2.032 0.004-3.933-1.056-5.895-2.983v0l-206.562-206.483 292.437-0.033c121.677 0 183.782 70.084 183.782 200.926v0 274.514l-119.195-119.313z" /> +<glyph unicode="" d="M426.671 480h-341.328c-46.937 0-85.343-38.405-85.343-85.345v-341.311c0-46.969 38.406-85.344 85.343-85.344h341.328c46.938 0 85.329 38.375 85.329 85.345v341.31c0 46.94-38.391 85.345-85.329 85.345zM469.967 10.029c-11.626-11.626-27.002-18.029-43.296-18.029h-341.328c-16.294 0-31.674 6.403-43.304 18.031-11.633 11.63-18.039 27.012-18.039 43.313v341.311c0 16.292 6.407 31.671 18.041 43.305 11.633 11.633 27.012 18.040 43.302 18.040h341.328c3.549 0 7.050-0.322 10.483-0.918l-105.649-145.030-49.022 49.025c-6.903 6.904-16.085 10.706-25.853 10.706-9.766 0-18.948-3.801-25.858-10.706l-22.257-22.258c-1.249 1.702-2.545 3.382-3.939 5.012-30.324 35.439-83.635 39.604-119.074 9.271-35.443-30.319-39.593-83.625-9.268-119.070 6.955-8.134 15.131-14.599 24.015-19.397 0.18-9.12 3.729-18.187 10.669-25.132l119.852-119.84c6.907-6.91 16.091-10.717 25.86-10.717 9.771 0 18.953 3.808 25.853 10.715l119.849 119.841c6.91 6.908 10.717 16.092 10.717 25.86s-3.807 18.953-10.715 25.858l-13.789 13.79 99.455 87.471v-287.137c0-16.303-6.404-31.686-18.033-43.315zM220.198 314.562l27.541 27.542c2.375 2.373 5.532 3.68 8.891 3.68 3.357 0 6.512-1.306 8.882-3.676l51.688-51.691-56.18-77.121c-5.547-6.188-10.435-2.932-12.363-0.633-0.662 0.779-13.843 18.037-30.887 40.391 8.462 19.369 9.378 41.407 2.428 61.508zM250.020 143.982c0 0 4.353-4.040 9.158-0.137l110.959 93.631 15.228-15.229c2.375-2.374 3.684-5.529 3.684-8.886s-1.309-6.512-3.686-8.888l-119.856-119.846c-2.37-2.373-5.522-3.681-8.877-3.681-3.356 0-6.512 1.309-8.888 3.686l-118.63 118.619c13.809-1.857 28.036-0.313 41.323 4.74l79.585-64.009z" /> +<glyph unicode="" d="M511.845 480h-56.539l-123.801-169.948-49.022 49.025c-6.903 6.904-16.085 10.706-25.853 10.706-9.766 0-18.948-3.801-25.858-10.706l-22.257-22.258c-1.249 1.702-2.545 3.382-3.939 5.012-30.324 35.439-83.635 39.604-119.074 9.271-35.443-30.319-39.593-83.625-9.268-119.070 6.955-8.134 15.131-14.599 24.015-19.397 0.18-9.12 3.729-18.187 10.669-25.132l119.852-119.84c6.907-6.91 16.091-10.717 25.86-10.717 9.771 0 18.953 3.808 25.853 10.715l119.849 119.841c6.91 6.908 10.717 16.092 10.717 25.86s-3.807 18.953-10.715 25.858l-13.789 13.79 123.301 104.045v122.945zM247.739 342.104c2.375 2.373 5.532 3.68 8.891 3.68 3.357 0 6.512-1.306 8.882-3.676l51.688-51.691-56.18-77.121c-5.547-6.188-10.435-2.932-12.363-0.633-0.662 0.779-13.843 18.037-30.887 40.391 8.462 19.37 9.378 41.408 2.428 61.509l27.541 27.541zM385.364 222.248c2.375-2.374 3.684-5.529 3.684-8.886s-1.309-6.512-3.686-8.888l-119.855-119.847c-2.37-2.373-5.522-3.681-8.877-3.681-3.356 0-6.512 1.309-8.888 3.686l-118.63 118.619c13.809-1.857 28.036-0.313 41.323 4.74l79.585-64.009c0 0 4.353-4.040 9.158-0.137l110.959 93.631 15.227-15.228z" /> +<glyph unicode="" d="M440.317 414.613c12.849-6.288 24.047-15.243 32.251-26.241 17.268-23.15 22.118-54.686 14.418-93.733-7.78-39.513-25.208-72.867-50.583-97.022-4.641-4.851-9.611-9.373-14.902-13.54-27.178-21.401-61.499-32.714-99.254-32.714h-120.030l-32.282-151.363h-66.212l5.043 23.15h23.064l32.282 151.363h94.135c90.125 0 165.469 55.539 185.629 149.968 22.861 106.917-53.799 155.519-119.705 155.519h-224.639l-99.532-456.85h76.016l-12.016-55.15h131.83l32.282 151.363h94.135c90.125 0 165.469 55.539 185.629 149.968 16.858 78.84-20.402 125.966-67.559 145.282zM211.172 386.959h64.566c32.296 0 53.801-27.769 44.393-62.478-8.068-34.72-41.693-62.488-75.32-62.488h-61.879l28.24 124.966z" /> +<glyph unicode="" d="M440.317 414.613c12.849-6.288 24.047-15.243 32.251-26.241 17.268-23.15 22.118-54.686 14.418-93.733-7.78-39.513-25.208-72.867-50.583-97.022-4.641-4.851-9.611-9.373-14.902-13.54-27.178-21.401-61.499-32.714-99.254-32.714h-120.030l-32.282-151.363h-66.212l5.043 23.15h23.064l32.282 151.363h94.135c90.125 0 165.469 55.539 185.629 149.968 22.861 106.917-53.799 155.519-119.705 155.519h-224.639l-99.532-456.85h76.016l-12.016-55.15h131.83l32.282 151.363h94.135c90.125 0 165.469 55.539 185.629 149.968 16.858 78.84-20.402 125.966-67.559 145.282zM320.131 324.481c-6.862-29.53-32.214-54.020-60.328-60.684l15.369 68.011h46.493c-0.364-2.403-0.861-4.845-1.534-7.327zM211.172 386.959h64.566c18.38 0 33.254-9.002 40.935-23.15h-67.077l-23.008-101.815h-43.656l28.24 124.965z" /> +<glyph unicode="" d="M324.171 448c14.166 0 28.459-2.902 41.333-8.392 13.542-5.774 24.662-13.962 33.052-24.336 16.799-20.771 21.519-49.066 14.025-84.109-8.153-38.189-27.199-69.98-55.080-91.935-27.178-21.401-61.499-32.714-99.254-32.714h-120.030l-32.282-151.364h-66.212l85.588 392.85h198.86zM142.893 229.993h101.918c23.718 0 47.747 9.085 67.659 25.582 19.41 16.081 33.137 37.761 38.698 61.1 6.951 26.262 2.315 52.576-12.757 72.277-14.588 19.070-37.432 30.007-62.673 30.007h-90.141l-42.704-188.966zM324.171 480h-224.639l-99.532-456.85h76.016l-12.016-55.15h131.83l32.282 151.363h94.135c90.125 0 165.469 55.539 185.629 149.968 16.858 78.84-20.402 125.966-67.559 145.282 12.849-6.288 24.047-15.243 32.251-26.241 17.268-23.15 22.118-54.686 14.418-93.733-7.78-39.513-25.208-72.867-50.583-97.022-4.641-4.851-9.611-9.373-14.902-13.54-27.178-21.401-61.499-32.714-99.254-32.714h-120.030l-32.282-151.363h-66.212l5.043 23.15h23.064l32.282 151.363h94.135c90.125 0 165.469 55.539 185.629 149.968 22.861 106.917-53.799 155.519-119.705 155.519v0zM182.932 261.993l28.241 124.966h64.566c32.296 0 53.801-27.769 44.393-62.478-8.068-34.72-41.693-62.488-75.32-62.488h-61.88z" /> +<glyph unicode="" d="M304.438 153.266c-8.641-8.713-1.334-24.564-1.334-24.564l65.045-108.609c0 0 10.68-14.32 19.932-14.32 9.295 0 18.477 7.635 18.477 7.635l51.422 73.504c0 0 5.18 9.273 5.299 17.396 0.186 11.553-17.227 14.717-17.227 14.717l-121.744 39.096c-0.001-0.002-11.929 3.164-19.87-4.855zM298.266 208.008c6.23-10.564 23.414-7.486 23.414-7.486l121.469 35.503c0 0 16.553 6.733 18.916 15.709 2.32 8.977-2.73 19.811-2.73 19.811l-58.049 68.376c0 0-5.031 8.646-15.469 9.516-11.508 0.979-18.59-12.949-18.59-12.949l-68.635-108.005c0-0.002-6.067-10.758-0.326-20.475zM240.877 250.116c14.304 3.522 16.574 24.302 16.574 24.302l-0.972 172.935c0 0-2.157 21.333-11.743 27.116-15.035 9.121-19.491 4.359-23.798 3.722l-100.848-37.472c0 0-9.877-3.268-15.021-11.509-7.345-11.676 7.464-28.772 7.464-28.772l104.822-142.878c0 0 10.345-10.698 23.522-7.444zM215.972 180.131c0.361 13.338-16.015 21.35-16.015 21.35l-108.398 54.762c0 0-16.063 6.623-23.861 2.008-5.975-3.53-11.268-9.92-11.786-15.567l-7.060-86.906c0 0-1.058-15.057 2.845-21.91 5.527-9.721 23.714-2.951 23.714-2.951l126.548 27.971c4.916 3.305 13.537 3.602 14.013 21.243zM247.44 133.229c-10.863 5.578-23.862-5.975-23.862-5.975l-84.734-93.283c0 0-10.572-14.264-7.884-23.025 2.533-8.209 6.727-12.289 12.659-15.164l85.096-26.863c0 0 10.317-2.143 18.129 0.121 11.090 3.215 9.047 20.576 9.047 20.576l1.924 126.301c-0.001-0.001-0.434 12.167-10.375 17.312z" /> +<glyph unicode="" d="M267.313 468.686c-6.222 6.222-18.513 11.314-27.313 11.314h-192c-8.8 0-16-7.2-16-16v-480c0-8.8 7.2-16 16-16h384c8.8 0 16 7.2 16 16v288c0 8.8-5.091 21.091-11.313 27.313l-169.374 169.373zM416 0h-352v448h175.579c1.458-0.24 4.204-1.377 5.405-2.239l168.778-168.777c0.861-1.201 1.998-3.947 2.238-5.405v-271.579zM432 480h-96c-8.8 0-10.909-5.091-4.687-11.313l105.373-105.373c6.223-6.223 11.314-4.114 11.314 4.686v96c0 8.8-7.2 16-16 16z" /> +<glyph unicode="" d="M421.006 185.26c-6.824 6.723-21.957 10.283-44.986 10.586-15.589 0.172-34.351-1.201-54.085-3.964-8.837 5.099-17.946 10.647-25.094 17.329-19.231 17.958-35.284 42.886-45.288 70.297 0.652 2.56 1.207 4.81 1.724 7.106 0 0 10.833 61.53 7.965 82.333-0.395 2.853-0.637 3.681-1.404 5.898l-0.941 2.417c-2.948 6.796-8.724 13.997-17.783 13.604l-5.458 0.172c-10.1 0-18.332-5.166-20.493-12.887-6.569-24.217 0.209-60.446 12.491-107.369l-3.144-7.643c-8.794-21.438-19.815-43.030-29.539-62.079l-1.264-2.476c-10.23-20.019-19.512-37.013-27.927-51.411l-8.688-4.594c-0.632-0.334-15.522-8.209-19.014-10.322-29.628-17.691-49.261-37.77-52.518-53.708-1.036-5.085-0.265-11.593 5.007-14.607l8.403-4.229c3.645-1.826 7.489-2.751 11.427-2.751 21.102 0 45.6 26.286 79.348 85.183 38.965 12.684 83.327 23.228 122.207 29.045 29.629-16.684 66.071-28.273 89.071-28.273 4.084 0 7.606 0.389 10.466 1.148 4.411 1.168 8.129 3.683 10.396 7.096 4.463 6.716 5.367 15.966 4.156 25.438-0.361 2.812-2.606 6.288-5.035 8.661zM105.823 72.976c3.848 10.521 19.080 31.322 41.602 49.778 1.416 1.148 4.904 4.416 8.097 7.451-23.551-37.562-39.323-52.533-49.699-57.229zM239.217 380.157c6.783 0 10.642-17.097 10.962-33.127 0.32-16.030-3.429-27.28-8.079-35.604-3.851 12.324-5.713 31.75-5.713 44.452 0 0-0.283 24.279 2.83 24.279zM199.426 161.253c4.725 8.458 9.641 17.378 14.665 26.839 12.246 23.158 19.979 41.278 25.739 56.173 11.455-20.842 25.722-38.56 42.493-52.756 2.092-1.771 4.309-3.551 6.637-5.325-34.105-6.748-63.582-14.955-89.534-24.931zM414.452 163.174c-2.077-1.299-8.027-2.050-11.854-2.050-12.353 0-27.636 5.647-49.063 14.833 8.234 0.609 15.781 0.919 22.55 0.919 12.391 0 16.060 0.054 28.175-3.036s12.269-9.367 10.192-10.666zM451.716 380.285l-71.432 71.431c-15.556 15.556-46.284 28.284-68.284 28.284h-240c-22 0-40-18-40-40v-432c0-22 18-40 40-40h368c22 0 40 18 40 40v304c0 22-12.728 52.729-28.284 68.285zM429.089 357.657c1.565-1.565 3.125-3.487 4.64-5.657h-81.729v81.728c2.17-1.515 4.092-3.075 5.657-4.64l71.432-71.431zM448 8c0-4.336-3.664-8-8-8h-368c-4.336 0-8 3.664-8 8v432c0 4.336 3.664 8 8 8h240c2.416 0 5.127-0.305 8-0.852v-127.148h127.148c0.547-2.873 0.852-5.583 0.852-8v-304z" /> +<glyph unicode="" d="M345.11 244.159c-30.334 14.326-68.986 17.21-97.417-3.024 34.57 3.302 72.479-2.419 97.553-28.562 24 27.54 62.057 32.703 96.479 29.866-28.744 19.072-66.61 16.512-96.615 1.72zM332.824 177.125c-34.189 0.789-67.217-11.586-95.55-30.052-53.588 22.794-121.368 18.562-167.001-19.491 13.165 0.467 26.003 3.723 39.028 5.396 47.591 4.744 98.294-7.071 134.256-39.912 14.886 21.771 35.822 39.121 59.826 49.961 31.537 15.26 67.080 16.842 101.41 17.26-20.844 14.324-47.308 16.977-71.969 16.838zM451.716 380.285l-71.432 71.431c-15.556 15.556-46.284 28.284-68.284 28.284h-240c-22 0-40-18-40-40v-432c0-22 18-40 40-40h368c22 0 40 18 40 40v304c0 22-12.728 52.729-28.284 68.285zM429.089 357.657c1.565-1.565 3.125-3.487 4.64-5.657h-81.729v81.728c2.17-1.515 4.092-3.075 5.657-4.64l71.432-71.431zM448 8c0-4.336-3.664-8-8-8h-368c-4.336 0-8 3.664-8 8v432c0 4.336 3.664 8 8 8h240c2.416 0 5.127-0.305 8-0.852v-127.148h127.148c0.547-2.873 0.852-5.583 0.852-8v-304z" /> +<glyph unicode="" d="M319.889 242.054h22.106l-25.506-113.089-33.163 159.005h-53.275l-38.557-159.005-28.908 159.005h-55.697l56.546-255.941h54.419l38.147 151.354 34.128-151.354h50.168l64.815 255.941h-85.223zM451.716 380.285l-71.432 71.431c-15.556 15.556-46.284 28.284-68.284 28.284h-240c-22 0-40-18-40-40v-432c0-22 18-40 40-40h368c22 0 40 18 40 40v304c0 22-12.728 52.729-28.284 68.285zM429.089 357.657c1.565-1.565 3.125-3.487 4.64-5.657h-81.729v81.728c2.17-1.515 4.092-3.075 5.657-4.64l71.432-71.431zM448 8c0-4.336-3.664-8-8-8h-368c-4.336 0-8 3.664-8 8v432c0 4.336 3.664 8 8 8h240c2.416 0 5.127-0.305 8-0.852v-127.148h127.148c0.547-2.873 0.852-5.583 0.852-8v-304z" /> +<glyph unicode="" d="M371.514 288h-67.647l-47.866-70.516-47.87 70.516h-67.644l81.081-121.232-91.487-134.768h131.12v45.788h-30.278l25.078 37.497 55.698-83.285h70.221l-91.488 134.768zM451.716 380.285l-71.432 71.431c-15.556 15.556-46.284 28.284-68.284 28.284h-240c-22 0-40-18-40-40v-432c0-22 18-40 40-40h368c22 0 40 18 40 40v304c0 22-12.728 52.729-28.284 68.285zM429.089 357.657c1.565-1.565 3.125-3.487 4.64-5.657h-81.729v81.728c2.17-1.515 4.092-3.075 5.657-4.64l71.432-71.431zM448 8c0-4.336-3.664-8-8-8h-368c-4.336 0-8 3.664-8 8v432c0 4.336 3.664 8 8 8h240c2.416 0 5.127-0.305 8-0.852v-127.148h127.148c0.547-2.873 0.852-5.583 0.852-8v-304z" /> +<glyph unicode="" d="M208 416h48v-32h-48zM160 384h48v-32h-48zM208 352h48v-32h-48zM160 320h48v-32h-48zM208 288h48v-32h-48zM160 256h48v-32h-48zM208 224v-32h-48v-112c0-8.837 7.163-16 16-16h64c8.837 0 16 7.163 16 16v144h-48zM240 96h-64v32h64v-32zM451.716 380.285l-71.432 71.431c-15.556 15.556-46.284 28.284-68.284 28.284h-240c-22 0-40-18-40-40v-432c0-22 18-40 40-40h368c22 0 40 18 40 40v304c0 22-12.728 52.729-28.284 68.285zM429.089 357.657c1.565-1.565 3.125-3.487 4.64-5.657h-81.729v81.728c2.17-1.515 4.092-3.075 5.657-4.64l71.432-71.431zM448 8c0-4.336-3.664-8-8-8h-368c-4.336 0-8 3.664-8 8v432c0 4.336 3.664 8 8 8h240c2.416 0 5.127-0.305 8-0.852v-127.148h127.148c0.547-2.873 0.852-5.583 0.852-8v-304z" /> +<glyph unicode="" d="M96 224h96v-32h-96v32zM96 160h96v-32h-96v32zM96 96h96v-32h-96v32zM451.716 380.285l-71.432 71.431c-15.556 15.556-46.284 28.284-68.284 28.284h-240c-22 0-40-18-40-40v-432c0-22 18-40 40-40h368c22 0 40 18 40 40v304c0 22-12.728 52.729-28.284 68.285zM429.089 357.657c1.565-1.565 3.125-3.487 4.64-5.657h-81.729v81.728c2.17-1.515 4.092-3.075 5.657-4.64l71.432-71.431zM448 8c0-4.336-3.664-8-8-8h-368c-4.336 0-8 3.664-8 8v432c0 4.336 3.664 8 8 8h240c2.416 0 5.127-0.305 8-0.852v-127.148h127.148c0.547-2.873 0.852-5.583 0.852-8v-304zM288 128h94.396c-7.413-36.516-39.693-64-78.396-64-44.183 0-80 35.817-80 80 0 38.703 27.485 70.983 64 78.396v-94.396zM336 256c44.183 0 80-35.817 80-80 0-5.479-0.554-10.83-1.604-16h-94.396v94.396c5.17 1.050 10.521 1.604 16 1.604z" /> +<glyph unicode="" d="M224 192l-32 32-96-96 96-96 32 32-64 64zM288 64l32-32 96 96-96 96-32-32 64-64zM451.716 380.285l-71.432 71.431c-15.556 15.556-46.284 28.284-68.284 28.284h-240c-22 0-40-18-40-40v-432c0-22 18-40 40-40h368c22 0 40 18 40 40v304c0 22-12.728 52.729-28.284 68.285zM429.089 357.657c1.565-1.565 3.125-3.487 4.64-5.657h-81.729v81.728c2.17-1.515 4.092-3.075 5.657-4.64l71.432-71.431zM448 8c0-4.336-3.664-8-8-8h-368c-4.336 0-8 3.664-8 8v432c0 4.336 3.664 8 8 8h240c2.416 0 5.127-0.305 8-0.852v-127.148h127.148c0.547-2.873 0.852-5.583 0.852-8v-304z" /> +<glyph unicode="" d="M192 174.277v57.113c0 7.564 3.348 14.718 9.427 20.143 6.080 5.424 14.096 8.413 22.573 8.413v28.555c-35.2 0-64-25.7-64-57.111v-42.833c0-7.886-7.164-14.279-16-14.279h-16v-28.555h16c8.837 0 16-6.395 16-14.279v-42.838c0-31.407 28.8-57.107 64-57.107v28.556c-8.477 0-16.494 2.988-22.573 8.413-6.079 5.426-9.427 12.577-9.427 20.139v57.117c0 7.885-7.164 14.277-16 14.277 8.837-0.001 16 6.394 16 14.276zM320 145.723v-57.117c0-7.562-3.348-14.713-9.427-20.139-6.079-5.425-14.095-8.413-22.573-8.413v-28.556c35.201 0 64 25.7 64 57.107v42.838c0 7.886 7.164 14.279 16 14.279h16v28.555h-16c-8.836 0-16 6.395-16 14.279v42.834c0 31.412-28.799 57.111-64 57.111v-28.555c8.479 0 16.494-2.989 22.573-8.415 6.080-5.424 9.427-12.578 9.427-20.142v-57.114c0-7.883 7.164-14.276 16-14.276-8.836 0.001-16-6.394-16-14.276zM451.716 380.285l-71.432 71.431c-15.556 15.556-46.284 28.284-68.284 28.284h-240c-22 0-40-18-40-40v-432c0-22 18-40 40-40h368c22 0 40 18 40 40v304c0 22-12.728 52.729-28.284 68.285zM429.089 357.657c1.565-1.565 3.125-3.487 4.64-5.657h-81.729v81.728c2.17-1.515 4.092-3.075 5.657-4.64l71.432-71.431zM448 8c0-4.336-3.664-8-8-8h-368c-4.336 0-8 3.664-8 8v432c0 4.336 3.664 8 8 8h240c2.416 0 5.127-0.305 8-0.852v-127.148h127.148c0.547-2.873 0.852-5.583 0.852-8v-304z" /> +<glyph unicode="" d="M30.269 480l41.072-460.815 184.378-51.185 184.862 51.262 41.15 460.738h-451.462zM392.315 329.286h-216.27l5.151-57.875h205.984l-15.521-173.505-115.922-32.127-115.786 32.127-7.915 88.756h56.747l4.024-45.116 62.931-16.958 0.139 0.039 62.967 16.996 6.535 73.275h-195.87l-15.247 170.9h283.107l-5.054-56.512z" /> +<glyph unicode="" d="M30.269 480l41.072-460.815 184.378-51.185 184.862 51.262 41.15 460.738h-451.462zM405.381 48.588l-148.613-41.188v-0.233l-0.388 0.117-0.391-0.117v0.233l-148.611 41.188-35.121 393.743h368.248l-35.124-393.743zM325.377 214.898l-6.535-73.276-63.105-17.035-62.931 16.958-4.025 45.117h-56.745l7.915-88.756 116.038-32.088 115.671 32.088 15.52 173.506h-205.983l-5.151 57.874h216.267l5.056 56.513h-283.109l15.249-170.901z" /> +<glyph unicode="" d="M76.194 455.739l-17.18-85.963h349.874l-10.942-55.527h-350.094l-16.946-85.949h349.842l-19.509-98.032-141.006-46.711-122.2 46.711 8.364 42.521h-85.949l-20.448-103.176 202.113-77.352 233.003 77.352 76.884 386.126z" /> +<glyph unicode="" d="M129.139 256.729l-73.266 126.901c46.909 58.732 119.117 96.37 200.127 96.37 93.716 0 175.655-50.368 220.266-125.5h-208.885c-3.752 0.325-7.546 0.5-11.381 0.5-60.937 0-112.289-41.822-126.861-98.271zM347.653 317.5h146.73c11.37-28.965 17.617-60.502 17.617-93.5 0-140.413-113.050-254.402-253.093-255.963l104.697 181.339c14.74 21.189 23.396 46.913 23.396 74.624 0 36.585-15.082 69.71-39.347 93.5zM163 224c0 51.28 41.72 93 93 93s93-41.72 93-93c0-51.28-41.72-93-93-93-51.28 0-93 41.72-93 93zM291.091 97.779l-73.289-126.939c-123.266 18.442-217.802 124.758-217.802 253.16 0 45.609 11.942 88.423 32.848 125.512l104.515-181.027c20.934-44.556 66.238-75.485 118.637-75.485 12.15 0 23.918 1.67 35.091 4.779z" /> +<glyph unicode="" d="M511.263 312.93l-5.93-38.040c0 0-8.477 70.428-18.866 96.757-15.923 40.344-23.007 40.020-23.054 39.961 10.665-27.102 8.731-41.662 8.731-41.662s-18.896 51.499-68.856 67.884c-55.343 18.141-85.285 13.182-88.744 12.243-0.525 0.004-1.032 0.005-1.515 0.005 0.409-0.031 0.806-0.073 1.213-0.106-0.017-0.010-0.045-0.021-0.041-0.026 0.225-0.274 61.153-10.651 71.958-25.498 0 0-25.88 0-51.636-7.421-1.164-0.333 94.762-11.982 114.373-107.837 0 0-10.515 21.938-23.52 25.664 8.553-26.018 6.357-75.388-1.788-99.925-1.048-3.156-2.12 13.641-18.164 20.875 5.14-36.823-0.308-95.228-25.854-111.316-1.991-1.252 16.015 57.655 3.621 34.881-71.354-109.401-155.702-50.486-193.624-24.555 19.433-4.231 56.327 0.659 72.657 12.806 0.021 0.015 0.039 0.028 0.059 0.043 17.734 12.126 28.236 20.982 37.667 18.886 9.437-2.107 15.719 7.363 8.39 15.765-7.338 8.419-25.157 19.989-49.262 13.683-17-4.452-38.067-23.261-70.224-4.216-24.682 14.625-27.006 26.773-27.225 35.188 0.609 2.983 1.377 5.768 2.288 8.312 2.841 7.935 11.456 10.329 16.247 12.219 8.128-1.396 15.131-3.931 22.484-7.703 0.095 2.447 0.126 5.695-0.009 9.38 0.705 1.401 0.269 5.626-0.861 10.79-0.651 5.154-1.71 10.487-3.376 15.346 0.006 0.001 0.010 0.005 0.015 0.007 0.028 0.009 0.054 0.020 0.078 0.035 0.039 0.022 0.073 0.056 0.104 0.095 0.006 0.010 0.015 0.017 0.022 0.026 0.041 0.062 0.077 0.136 0.099 0.233 0.51 2.309 6.011 6.762 12.859 11.55 6.136 4.29 13.351 8.848 19.034 12.376 5.030 3.124 8.86 5.441 9.673 6.049 0.309 0.233 0.679 0.506 1.082 0.818 0.075 0.058 0.15 0.116 0.227 0.177 0.047 0.037 0.095 0.074 0.143 0.113 2.705 2.154 6.742 6.224 7.589 14.789 0.002 0.021 0.005 0.040 0.006 0.061 0.025 0.252 0.046 0.507 0.065 0.767 0.014 0.181 0.025 0.363 0.036 0.548 0.007 0.142 0.016 0.283 0.022 0.428 0.015 0.337 0.025 0.682 0.030 1.032 0 0.020 0.001 0.038 0.002 0.058 0.011 0.829-0.003 1.693-0.052 2.601-0.027 0.507-0.063 0.965-0.149 1.381-0.004 0.022-0.009 0.046-0.014 0.068-0.009 0.041-0.018 0.082-0.029 0.122-0.018 0.073-0.038 0.146-0.061 0.215-0.003 0.009-0.005 0.016-0.008 0.023-0.026 0.080-0.056 0.157-0.087 0.232-0.002 0.003-0.002 0.005-0.003 0.008-0.877 2.054-4.16 2.829-17.721 3.059-0.013 0.001-0.025 0.001-0.038 0.001v0c-5.533 0.094-12.769 0.097-22.251 0.059-16.625-0.067-25.814 16.252-28.747 22.566 4.020 22.23 15.638 38.071 34.725 48.813 0.361 0.203 0.29 0.371-0.137 0.489 3.732 2.257-45.123 0.062-67.593-28.518-19.944 4.957-37.327 4.623-52.308 1.107-2.877 0.081-6.462 0.44-10.717 1.326-9.962 9.028-24.224 25.701-24.988 45.604 0 0-0.046-0.036-0.126-0.102-0.010 0.191-0.028 0.38-0.036 0.571 0 0-30.358-23.332-25.814-86.941-0.011-1.018-0.032-1.993-0.060-2.937-8.216-11.144-12.293-20.51-12.596-22.578-7.28-14.822-14.667-37.127-20.678-70.99 0 0 4.204 13.333 12.642 28.433-6.206-19.011-11.082-48.578-8.218-92.928 0 0 0.757 9.833 3.437 23.997 2.093-27.505 11.259-61.462 34.429-101.394 44.474-76.66 112.835-115.37 188.396-121.308 13.418-1.106 27.025-1.132 40.712-0.093 1.258 0.089 2.516 0.182 3.775 0.287 15.482 1.087 31.067 3.426 46.619 7.183 212.586 51.399 189.471 308.099 189.471 308.099z" /> +<glyph unicode="" d="M367.101 165.585h118.025c0.91 8.185 1.274 16.549 1.274 25.098 0 40.112-10.767 77.734-29.562 110.133 19.44 51.654 18.746 95.494-7.278 121.695-24.748 24.64-91.145 20.64-166.206-12.599-5.552 0.42-11.159 0.636-16.819 0.636-103.024 0-189.463-70.897-213.354-166.425 32.319 41.377 66.319 71.377 111.739 93.224-4.13-3.87-28.227-27.826-32.28-31.882-119.774-119.739-157.545-276.153-116.903-316.802 30.893-30.887 86.879-25.671 151.188 5.824 29.903-15.229 63.75-23.815 99.609-23.815 96.567 0 178.402 62.158 208.045 148.724h-118.934c-16.367-30.191-48.374-50.74-85.109-50.74-36.734 0-68.742 20.549-85.108 50.74-7.275 13.637-11.457 29.277-11.457 45.828v0.361h193.13zM174.151 223.598c2.728 48.555 43.1 87.292 92.383 87.292s89.656-38.736 92.383-87.292h-184.766zM448.483 398.096c16.763-16.94 16.344-48.107 2.006-87.011-24.568 37.454-60.259 66.968-102.396 83.82 45.053 19.319 81.703 21.878 100.39 3.191zM46.741-3.628c-21.391 21.398-14.942 66.309 12.615 120.416 17.154-48.135 50.578-88.545 93.668-114.577-47.715-21.659-86.768-25.337-106.283-5.839z" /> +<glyph unicode="" d="M255.023 480c-139.862 0-240.374-101.448-240.374-253.612 0-135.409 97.751-258.388 240.392-258.388 144.039 0 242.31 122.943 242.31 258.388 0 153.38-103.723 253.612-242.328 253.612zM344.179 230.729c-0.034-84.676-4.549-205.241-89.138-205.241v-0.017c-83.392 0-86.716 120.633-86.716 205.154 0 99.19 9.28 194.284 86.716 194.284 77.437 0 89.138-96.292 89.138-194.18z" /> +<glyph unicode="" d="M256 448c-12.032 0-23.854-0.896-35.412-2.606-0.15 0.391-0.312 0.774-0.491 1.148 6.413 5.001 9.775 11.915 8.317 18.776-1.867 8.782-11.197 14.682-23.217 14.682-2.59 0-5.229-0.281-7.84-0.836-15.084-3.207-25.073-14.311-22.741-25.281 1.417-6.669 7.146-11.669 15.082-13.692-0.016-0.486-0.008-0.975 0.021-1.467-100.311-28.765-173.719-121.169-173.719-230.724 0-132.549 107.452-240 240-240 132.549 0 240 107.451 240 240 0 132.548-107.451 240-240 240zM182.441 455.546c-1.353 6.363 6.24 13.595 16.579 15.792 2.066 0.439 4.145 0.662 6.177 0.662 8.018 0 14.347-3.432 15.392-8.345 0.798-3.755-1.535-7.805-5.693-10.952-3.517 2.483-8.008 3.563-12.55 2.598-4.522-0.961-8.174-3.754-10.379-7.428-5.092 1.225-8.754 4.042-9.526 7.673zM384.693 79.307c-21.984-21.984-48.605-37.639-77.655-46.077l-21.198 34.384-5.373-39.979c-8.045-1.076-16.213-1.635-24.467-1.635-48.614 0-94.318 18.932-128.693 53.307-21.984 21.983-37.639 48.605-46.077 77.654l34.384 21.199-39.98 5.373c-1.075 8.045-1.634 16.213-1.634 24.467 0 48.614 18.931 94.318 53.307 128.693 21.984 21.984 48.606 37.639 77.655 46.078l21.198-34.385 5.374 39.98c8.044 1.075 16.212 1.634 24.466 1.634 48.614 0 94.318-18.931 128.693-53.307 21.984-21.984 37.639-48.606 46.077-77.655l-34.385-21.199 39.98-5.373c1.076-8.044 1.635-16.212 1.635-24.466 0-48.614-18.932-94.318-53.307-128.693zM380.451 332.451l-98.489-74.852c-7.322 3.829-15.438 6.031-23.708 6.363l-25.54 53.59-1.534-59.332c-6.642-3.268-12.552-7.832-17.438-13.475l-31.544 11.182 23.046-24.269c-3.167-6.759-4.933-14.015-5.217-21.412l-53.579-25.533 59.369-1.534c0.19-0.384 0.387-0.763 0.585-1.141l-74.852-98.49 98.489 74.852c7.322-3.828 15.437-6.030 23.708-6.362l25.54-53.591 1.533 59.332c6.643 3.269 12.553 7.832 17.439 13.476l31.545-11.184-23.047 24.27c3.168 6.76 4.934 14.015 5.218 21.412l53.578 25.533-59.368 1.535c-0.189 0.383-0.387 0.762-0.585 1.14l74.851 98.49zM256.051 257.733v0zM246.021 254.951c3.363 0.715 6.722 1.059 10.028 1.059 2.072 0 4.125-0.135 6.147-0.398l0.046-0.016-0.005 0.011c4.366-0.572 8.588-1.75 12.566-3.448l-35.773-27.188-27.19-35.776c-1.188 2.797-2.135 5.742-2.79 8.826-5.513 25.93 11.040 51.418 36.971 56.93zM281.060 167.058v0 0c-4.528-2.772-9.591-4.842-15.080-6.009-3.363-0.715-6.722-1.059-10.027-1.059-2.075 0-4.129 0.136-6.154 0.399l-0.034 0.005c-4.367 0.571-8.587 1.75-12.566 3.447l35.772 27.188 27.19 35.777c1.188-2.797 2.135-5.743 2.79-8.827 4.345-20.441-5.028-40.6-21.891-50.921z" /> +<glyph unicode="" d="M129.772 224.001c0 32.708 26.515 59.223 59.223 59.223s59.223-26.515 59.223-59.223c0-32.708-26.515-59.223-59.223-59.223-32.708 0-59.223 26.515-59.223 59.223zM256.002 480c-141.387 0-256.002-114.616-256.002-256s114.613-256 256.002-256c141.382 0 255.998 114.615 255.998 256 0 141.384-114.615 256-255.998 256zM189.698 0.359c-76.978 44.787-128.734 128.162-128.734 223.641 0 95.479 51.756 178.854 128.731 223.641 77.005-44.781 128.795-128.144 128.795-223.641 0-95.494-51.79-178.859-128.792-223.641z" /> +</font></defs></svg>
\ No newline at end of file diff --git a/web/cobrands/angus/third_party/fonts/angusgov.ttf b/web/cobrands/angus/third_party/fonts/angusgov.ttf Binary files differnew file mode 100755 index 000000000..739b2e597 --- /dev/null +++ b/web/cobrands/angus/third_party/fonts/angusgov.ttf diff --git a/web/cobrands/angus/third_party/fonts/angusgov.woff b/web/cobrands/angus/third_party/fonts/angusgov.woff Binary files differnew file mode 100755 index 000000000..5d58bcff2 --- /dev/null +++ b/web/cobrands/angus/third_party/fonts/angusgov.woff diff --git a/web/cobrands/barnet/_colours.scss b/web/cobrands/barnet/_colours.scss deleted file mode 100644 index c92249eed..000000000 --- a/web/cobrands/barnet/_colours.scss +++ /dev/null @@ -1,20 +0,0 @@ -/* COLOURS */ - -$menu-image: 'menu-black'; - -$primary: #E9E9EA; -$primary_b: #000000; -$primary_text: #3E3D44; - -/* Unused here */ -$base_bg: #fff; -$base_fg: #1a1a1a; -$map_nav_bg: #222; -$nav_fg: #fff; -$nav_fg_hover: #444; - -$col_click_map: #E1E3E4; -$col_click_map_dark: darken(#E1E3E4, 10%); - -$col_fixed_label: #00BD08; -$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/barnet/barnet.scss b/web/cobrands/barnet/barnet.scss deleted file mode 100644 index a6feb018f..000000000 --- a/web/cobrands/barnet/barnet.scss +++ /dev/null @@ -1,115 +0,0 @@ -/* Parts of barnet's main CSS needed for its header/footer and adjusted (see - * bottom) to not be affected by main FixMyStreet CSS. Not very sustainable; - * perhaps we should wrap all council CSS within a SCSS #council ID? Hmm. - */ - -@import "compass"; - -#column_nav li { list-style: none ;} - -#content ol.big-numbers li { - padding: 0 0 0 2.5em; -} - -#barnet-wrapper { - width: 100%; - display: table; - caption-side: bottom; -} - -#barnet-powered-by { - clear: both; -} - -body {font-size: 75%; font-family: Arial, Helvetica, sans-serif; color: #3e3d44; padding: 0; margin: 0; line-height: 1.5; background: #e9e9ea;} -body > html {font-size: 12px;} - -#barnet-wrapper {padding: 0; margin: 20px auto; width: 960px; background: #fff;} -#ie_wrapper {display: block; padding: 20px 25px 25px;} -#page {float: left; width: 100%;} - -#mast {clear: both;} - -#mast .pseudoH1 {margin: 0 0 0 -3px; padding: 0; background: url(img/barnet-logo.gif) no-repeat top left; width: 240px; height: 38px; float: left;} -#mast .pseudoH1 a, #mast .pseudoH1 a:link, #mast .pseudoH1 a:visited, #mast .pseudoH1 a:hover, #mast .pseudoH1 a:active {display: block; width: 240px; height: 38px; padding: 0; background: url(img/barnet-logo.gif) no-repeat top left;} -#mast .pseudoH1 span {position: absolute; margin-top: -13000px; top: -13000px;} - -#mast .mast_links {float: right; display: inline; margin: 0; padding: 10px 0 0; list-style: none; overflow: hidden;} - -#mast #search {clear: both; float: right; margin: 8px 0 0; background: #e1e3e4; border-top: 6px solid #bddadc; border-bottom: 2px solid #c8cacb; width: 100%; padding: 3px 0 2px; height: 21px;} - -/* ############################################################## */ - -#content {margin: 0; width: 910px; overflow: hidden; min-height: 350px;} -#content.withWidth {margin: 0 0 0 232px; width: 446px; overflow: hidden; float: left; display: inline;} -#content.fullWidth {width: 678px;} -#content.home {margin-top: 18px;} - -.mappage { - #content.withWidth {margin: 0 0 0 0px; width: auto; overflow: hidden; float: left; display: inline;} - #content.fullWidth {width: 900px;} -} - -/* IE6 ignore the second #foo.bar rule so we have to fudge it another way */ -.ie6 { - .mappage { - #content { - margin: 0 0 0 0px; - overflow: hidden; - float: left; - display: inline; - width: 900px; - } - } -} - -#breadcrumb {font-size: .9em; color: #5c6267; padding: 6px 0; margin: 0 0 0 232px;} -#breadcrumb.full {margin: 0;} -#breadcrumb ul {margin: 0; padding: 0; list-style: none;} -#breadcrumb ul li {margin: 0; padding: 0 4px 0 0; display: inline;} -#breadcrumb ul li a:link, #breadcrumb ul li a:visited, #breadcrumb ul li a:hover, #breadcrumb ul li a:active {color: #5c6267; background: url(img/bcArrow.gif) no-repeat right center; padding: 0 10px 0 0; font-weight: normal;} -#breadcrumb ul li span {font-weight: normal; color: #5c6267;} - -/* ############################################################## */ - -#column_nav {width: 214px; float: left; display: inline; padding: 0; margin: -35px 0 0 -910px; border-right: 3px solid #fff;} - -.ie6 #column_nav { - float: none; - position: absolute; - top: 85px; - margin: 0 0 0 0px; -} - -body.mappage #column_nav { display: none; } - -#content h1 {margin: 0 0 20px; font-size: 1.8em; border-bottom: 6px solid #bed9dd; font-family: Georgia, Times, 'Times New Roman', serif; color: #5d6167;} -#content h1 span {padding: 6px 7px 3px; border: 1px solid #eff1f2; border-bottom: 0 none; display: block;} -#content h1#reports_heading span { display: none; } - -#column_nav .navigation {background: #fff; margin: 0 0 4px;} -#column_nav h2 {font-size: 1.2em; padding: 0; height: 29px; margin: 0; border-radius: 0 0 3px 3px; background: url(img/nav-bg-active.gif) left bottom repeat-x; border-top: 6px solid #bddadc;} -#column_nav #nav1 h2 {border-radius: 0 0 0 3px;} -#column_nav h2 a {color: #fff; padding: 3px 10px 0 26px; display: block; background: url(img/nav-arrow.gif) 8px 7px no-repeat;} -#column_nav .active h2 a {background: url(img/nav-arrow-active.gif) 8px 8px no-repeat;} -#column_nav ul {margin: 0 0 0 4px; padding: 8px 7px 4px; border-width: 0 1px 1px; border-color: #e1e1e1; border-style: solid; border-radius: 3px; list-style: none; background: #fff; background: -moz-linear-gradient(top, #ffffff 0%, #f7f9f8 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f7f9f8)); background: -webkit-linear-gradient(top, #ffffff 0%,#f7f9f8 100%); background: -o-linear-gradient(top, #ffffff 0%,#f7f9f8 100%); background: -ms-linear-gradient(top, #ffffff 0%,#f7f9f8 100%); background: linear-gradient(top, #ffffff 0%,#f7f9f8 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f7f9f8',GradientType=0);} -#column_nav ul li {margin: 0; padding: 2px 4px; border-bottom: 1px solid #bfc0c1; color: #333; font-size: .9em;} -#column_nav ul li.lastItem {border-bottom: none;} -#column_nav ul li a:link, #column_nav ul li a:visited, #column_nav ul li a:hover, #column_nav ul li a:active {display: block; color: #333; font-weight: normal;} -#column_nav ul li a:hover, #column_nav ul li a:active {text-decoration: none; color: #0090a2;} - -/* ############################################################## */ - -#footer {clear: both; margin: 10px 0 0; padding: 15px 0 0; text-align: left;} -#footer p {border-top: 1px solid #dadadb; border-bottom: 1px solid #dadadb; margin: 0 0 5px; color: #5d6167; float: left; display: inline; height: 24px; padding: 8px 0 2px; width: 551px;} -#footer p a {color: #5d6167; font-weight: normal; padding: 0 2px;} -#footer p.assocLinks {float: right; display: inline; padding: 5px 0; width: 359px;} -#footer p.assocLinks a {float: left; display: inline; margin: 0 0 0 8px; padding: 0; background-position: center top; background-repeat: no-repeat; width: 24px; height: 24px;} -#footer p.assocLinks a:active, #footer p.assocLinks a:hover, #footer p.assocLinks a:focus {background-position: center bottom;} -#footer a#goto_browsealoud {background-image: url(img/browsealoud.gif); width: 95px; height: 25px; margin-top: 1px;} -#footer a#goto_directgov {background-image: url(img/directgov.gif); width: 90px; margin: 0 0 0 22px;} -#footer a#share_facebook {background-image: url(img/social1-facebook.gif); margin: 0 0 0 24px;} -#footer a#share_twitter {background-image: url(img/social2-twitter.gif);} -#footer a#share_youtube {background-image: url(img/social3-youtube.gif);} -#footer a#share_flickr {background-image: url(img/social4-flickr.gif);} -#bottomBar {background: url(img/barnet-footer-logo.gif) 771px 12px no-repeat #21aaaa; display: block; width: 100%; height: 56px; border-top: 6px solid #bddadc;} diff --git a/web/cobrands/barnet/base.scss b/web/cobrands/barnet/base.scss deleted file mode 100644 index 73d5708c7..000000000 --- a/web/cobrands/barnet/base.scss +++ /dev/null @@ -1,37 +0,0 @@ -@import "../sass/h5bp"; -@import "./_colours"; -@import "../sass/mixins"; -@import "compass"; - -@import "../sass/base"; - -#mast, -#breadcrumb, -#page-title, -#column_nav, -#footer, -#bottomBar -{ display: none } - -#site-header{ - @include background(none); - background-color: white; -} -#site-logo { - width: 240px; - background: url('/cobrands/barnet/img/barnet-logo.gif') 0 0 no-repeat; - top: 0.6em; - left: 0.5em; -} - -#front-main #postcodeForm div input#sub, -.green-btn, -button.green-btn, -input.green-btn, -.red-btn, -button.red-btn, -input.red-btn{ - @include button-reset; - background: #5D6167; - color: white; -} diff --git a/web/cobrands/barnet/css/layout.css b/web/cobrands/barnet/css/layout.css deleted file mode 100644 index cad46b039..000000000 --- a/web/cobrands/barnet/css/layout.css +++ /dev/null @@ -1,143 +0,0 @@ -/* FixMyStreet additions */
-/* Smaller map */
-#mysociety #map_box {
- width: 380px;
- margin-bottom: 8px;
-}
-#mysociety #map, #mysociety #drag {
- width: 378px;
- height: 378px;
-}
-
-#mysociety p#fixed, #mysociety p#unknown {
- margin-right: 400px;
- width: auto;
-}
-
-#mysociety textarea {
- border: 1px solid #999999;
-}
-
-/* fix (for the reports page) */
-#content #mysociety h1 span {
- display: inline;
- border: none;
- padding: 0;
-}
-
-#mysociety #postcodeForm {
- background-color: #E9E9EA;
-}
-#mysociety #postcodeForm label {
- width: 100%;
-}
-/*=========FROM CUSTOM=========*/
-.cl {clear: both;}
-
-br.cl, div.cl {
- height: 0;
- font-size: 0.1px;
- line-height: .0;
- }
-
-.rm {position: absolute; left: -999em;}
-
-a.rm:active, a.rm:focus {
- top: 15px;
- left: 230px;
- outline:none;
- padding: 7px 10px;
- font-weight:bold;
- border: 1px solid #fff;
- font-size: 1.2em;
- background-color: #fff;
- color: #008184;
- }
-
-#iewrap {min-width: 775px; max-width: 1382px;}
-
-/*=== Content Page Layout ===*/
-#wrap {
- float: right;
- width: 100%;
- margin: 5px 0 0 -270px;
- padding: 0;
- }
-
-#content{
- margin: 0 35px 0 275px;
- padding: 0 5px 0 5px;
- position: relative;
- }
-
-#left-column {
- float:left;
- width: 270px;
- line-height: 1.3em;
- margin: 5px 0 0 0;
- padding: 0;
- }
-
-/*=== Content Page Elements===*/
-
-#iewrap #print-logo {display:none}
-
-h1 {margin:0}
-/*
-h3, h4, h5, p, ol, ul, table, dl, address, form {margin-right: 5px; margin-left:5px}
-h1, h2 {padding-left: 5px}
-*/
-
-
-/*=== Quotes =====*/
-#content blockquote {margin:10px; min-height: 90px; padding-bottom: 10px}
-
-/*=== Tables =====*/
-
-table.data {width:95%;}
-table.data th {text-align:left; font-size:1.24em}
-caption {text-align:left; font-weight:bold; font-style:italic}
-
-table.data td, table.data th {padding:6px 6px 6px 10px}
-table.data {border-spacing:1px;}
-
-/*==== General styles for alignment of elements within the content area ==*/
-
-.image-left, img.alignleft {position: relative;float: left;}
-.image-inline, img.inline {display:block;}
-.image-right, img.alignright {float:right;clear: right;}
-
-.alignleft {float: left; margin: 5px 10px 10px 0;}
-.alignright {float: right; margin: 5px 0 10px 10px;}
-.centered {display: block; margin: 10px auto; padding: 10px 0; text-align:center;}
-
-.two-col1 {float: left; width: 48%;}
-.two-col2 {float: right; width: 48%;}
-
-/*======== form styles ========*/
-
-.form-info {font-style: italic; font-weight: bold; padding: 5px 0 0 0}
-
-form {margin-top:0}
-
-fieldset {
- margin: 0;
- padding: 0;
- border:none;
- }
-
-legend {
- padding: 0;
- margin: 0;
- font-size:1.308em;
- font-weight:bold
- }
-
-
-
-/*======= wide rows ======= */
-#content textarea {padding: 5px;}
-
-
-
-
diff --git a/web/cobrands/barnet/img/barnet-footer-logo.gif b/web/cobrands/barnet/img/barnet-footer-logo.gif Binary files differdeleted file mode 100644 index afba1cca2..000000000 --- a/web/cobrands/barnet/img/barnet-footer-logo.gif +++ /dev/null diff --git a/web/cobrands/barnet/img/barnet-logo.gif b/web/cobrands/barnet/img/barnet-logo.gif Binary files differdeleted file mode 100644 index 86e0f4ee8..000000000 --- a/web/cobrands/barnet/img/barnet-logo.gif +++ /dev/null diff --git a/web/cobrands/barnet/img/barnet-skipnav.png b/web/cobrands/barnet/img/barnet-skipnav.png Binary files differdeleted file mode 100644 index 21efe0f67..000000000 --- a/web/cobrands/barnet/img/barnet-skipnav.png +++ /dev/null diff --git a/web/cobrands/barnet/img/bcArrow.gif b/web/cobrands/barnet/img/bcArrow.gif Binary files differdeleted file mode 100644 index 4e7c1848e..000000000 --- a/web/cobrands/barnet/img/bcArrow.gif +++ /dev/null diff --git a/web/cobrands/barnet/img/blank.gif b/web/cobrands/barnet/img/blank.gif Binary files differdeleted file mode 100644 index 4bcc753a1..000000000 --- a/web/cobrands/barnet/img/blank.gif +++ /dev/null diff --git a/web/cobrands/barnet/img/browsealoud.gif b/web/cobrands/barnet/img/browsealoud.gif Binary files differdeleted file mode 100644 index 4fbb3eded..000000000 --- a/web/cobrands/barnet/img/browsealoud.gif +++ /dev/null diff --git a/web/cobrands/barnet/img/directgov.gif b/web/cobrands/barnet/img/directgov.gif Binary files differdeleted file mode 100644 index 1c9dd22e2..000000000 --- a/web/cobrands/barnet/img/directgov.gif +++ /dev/null diff --git a/web/cobrands/barnet/img/favicon.ico b/web/cobrands/barnet/img/favicon.ico Binary files differdeleted file mode 100644 index 03553e500..000000000 --- a/web/cobrands/barnet/img/favicon.ico +++ /dev/null diff --git a/web/cobrands/barnet/img/fms-logo.png b/web/cobrands/barnet/img/fms-logo.png Binary files differdeleted file mode 100644 index 23bea6b0f..000000000 --- a/web/cobrands/barnet/img/fms-logo.png +++ /dev/null diff --git a/web/cobrands/barnet/img/nav-arrow-active.gif b/web/cobrands/barnet/img/nav-arrow-active.gif Binary files differdeleted file mode 100644 index 89ff9d0b3..000000000 --- a/web/cobrands/barnet/img/nav-arrow-active.gif +++ /dev/null diff --git a/web/cobrands/barnet/img/nav-bg-active.gif b/web/cobrands/barnet/img/nav-bg-active.gif Binary files differdeleted file mode 100644 index 0d2ec9873..000000000 --- a/web/cobrands/barnet/img/nav-bg-active.gif +++ /dev/null diff --git a/web/cobrands/barnet/img/social1-facebook.gif b/web/cobrands/barnet/img/social1-facebook.gif Binary files differdeleted file mode 100644 index 41b404df0..000000000 --- a/web/cobrands/barnet/img/social1-facebook.gif +++ /dev/null diff --git a/web/cobrands/barnet/img/social2-twitter.gif b/web/cobrands/barnet/img/social2-twitter.gif Binary files differdeleted file mode 100644 index 17f368536..000000000 --- a/web/cobrands/barnet/img/social2-twitter.gif +++ /dev/null diff --git a/web/cobrands/barnet/img/social3-youtube.gif b/web/cobrands/barnet/img/social3-youtube.gif Binary files differdeleted file mode 100644 index eeb6ba356..000000000 --- a/web/cobrands/barnet/img/social3-youtube.gif +++ /dev/null diff --git a/web/cobrands/barnet/img/social4-flickr.gif b/web/cobrands/barnet/img/social4-flickr.gif Binary files differdeleted file mode 100644 index 300e75da0..000000000 --- a/web/cobrands/barnet/img/social4-flickr.gif +++ /dev/null diff --git a/web/cobrands/barnet/layout.scss b/web/cobrands/barnet/layout.scss deleted file mode 100644 index d9f7bf4e6..000000000 --- a/web/cobrands/barnet/layout.scss +++ /dev/null @@ -1,248 +0,0 @@ -@import "_colours"; -@import "../sass/layout"; - -#mast, -#breadcrumb, -#page-title, -#column_nav, -#footer, -#bottomBar { - display: block; -} - -// So that map appears underneath the header -.wrapper { - position: relative; -} -.ie6, .ie7 { - .wrapper { - padding-top: 1em; - } -} - -#front-main { - @include border-radius(1em 1em 0 0); - margin-bottom: 1em; - padding-top: 0; - width: 678px; - // layout sets this because base has it slightly lighter - #front-main-container { - padding: 1em; - } -} - -#front_intro { - float: left; - margin-right: 3em; -} - -#front_recent { - margin-left: 3em; -} - -body.fullwidthpage { - .content { - width: 52em; - } -} -.ie6 { - body.fullwidthpage { - #front-main { - margin-top: -4em; - } - #front-howto, - #front-recently { - width: 26em; - } - .container { - padding: 0; - } - .content { - margin-left: 0px; - width: 55em; - } - div.img { - margin-top: -3.3em; - } - } -} - -.content { - @include box-shadow(none); -} - -body.twothirdswidthpage { - .content { - width: 640px; - margin-top: 0; - .sticky-sidebar { - display: none; - aside { - top: 25em; - } - } - } -} - -.nav-wrapper { - display: none; -} - -.mappage { - #breadcrumb { - margin-left: 0px; - } -} - -.frontpage .content { - margin: 0; -} -.iel8 { - .frontpage .content { - border: none; - } -} - -#content .container h1 { - border-bottom: none; - font-size: 2em; - margin-bottom: 0.5em; -} - -.shadow-wrap { - position: static; - padding-top: 0; - margin-bottom: 1em; - ul#key-tools { - border-top: none; - border-bottom: 1px solid $primary; - li { - a.chevron { - background-position: right -3230px; - } - a.feed { - background-position: right -3080px; - } - a.abuse { - background-position: right -2940px; - } - } - } - ul#key-tools.singleton { - li a { - padding-right: 4em; - } - } -} - -#content h1.big-green-banner { - font-size: 1.4em; - margin-left: -2em; - background: #e1e3e4 url(/cobrands/fixmystreet/images/sprite.png) right -2192px no-repeat -} - -body.frontpage { - #user-meta { - p { - top: 1em; - color: $primary_text; - a { - background: none; - } - } - } -} -#user-meta { - float: right; - p { - @include box-shadow(none); - color: $primary_text; - position: relative; - background: none; - a { - color: $primary_text; - background: none; - } - a:hover { - background: $primary; - } - } -} -.ie6 { - #user-meta { - float: none; - p { - position: absolute; - margin-top: 35px; - margin-right: 20px; - right: 0px; - left: auto; - } - - } - .mappage { - #user-meta { - p { - margin-right: -100px; - } - } - } -} - -/* barnet styles */ - -.clear { - clear: both; -} - -#site-header, -#site-logo { - display: none !important; -} - - -#report-a-problem-sidebar { - left: 29em; - top: 4em; - width: 17em; - .sidebar-tips, - .sidebar-notes { - font-size: 0.9em; - } -} -.ie6 { - #report-a-problem-sidebar { - margin-top: -4em; - left: 29em; - .sidebar-notes { - padding-bottom: 0.5em; - } - p { - margin-bottom: 0.4em; - } - } -} - - -.general-notes { - font-size: 1em; -} - -#front-howto #front_stats div big, -ol.big-numbers > li::before { - color: #C0E8E8; -} - -.banner { - p { - top: -2em; - } - p#fixed { - padding-top: 4em; - } -} - - -#map_box { - border: 1px solid #999; -} diff --git a/web/cobrands/barnet/position_map.js b/web/cobrands/barnet/position_map.js deleted file mode 100644 index b2b7bf05a..000000000 --- a/web/cobrands/barnet/position_map.js +++ /dev/null @@ -1,25 +0,0 @@ -function position_map_box() { - var map_pos = 'absolute', map_height = $('.wrapper').height(); - // on the all reports page the height of the wrapper leads to a very - // large map so we set a maximum size - if ( map_height > 600 ) { - map_height = 600; - } - $('#map_box').prependTo('.wrapper').css({ - zIndex: 0, position: map_pos, - top: 1, left: $('.wrapper').left, - right: 0, bottom: $('.wrapper').bottom + 1, - width: '896px', height: map_height, - margin: 0 - }); -} - -function map_fix() { - var height = $('.wrapper').height() - 3; - if ( height > 600 ) { - height = 600; - } - $('#map_box').height(height); -} - -var slide_wards_down = 1; diff --git a/web/cobrands/bellavistaenaccion/_colours.scss b/web/cobrands/bellavistaenaccion/_colours.scss deleted file mode 100644 index cfe698046..000000000 --- a/web/cobrands/bellavistaenaccion/_colours.scss +++ /dev/null @@ -1,21 +0,0 @@ -/* COLOURS */ - -$orange: #ff9900; -$bluey: #ff8888; - -$primary: #ffffee; -$primary_b: #000000; -$primary_text: #222222; - -$base_bg: $bluey; -$base_fg: #000; - -$map_nav_bg: $bluey; -$nav_fg: #000; -$nav_fg_hover: $primary; - -$col_click_map: $bluey; -$col_click_map_dark: darken($bluey, 10%); - -$col_fixed_label: #00BD08; -$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/bellavistaenaccion/base.scss b/web/cobrands/bellavistaenaccion/base.scss deleted file mode 100644 index 9fccf92db..000000000 --- a/web/cobrands/bellavistaenaccion/base.scss +++ /dev/null @@ -1,7 +0,0 @@ -@import "../sass/h5bp"; -@import "./_colours"; -@import "../sass/mixins"; -@import "compass"; - -@import "../sass/base"; - diff --git a/web/cobrands/bellavistaenaccion/config.rb b/web/cobrands/bellavistaenaccion/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/bellavistaenaccion/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# 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/bellavistaenaccion/layout.scss b/web/cobrands/bellavistaenaccion/layout.scss deleted file mode 100644 index 69e455aa5..000000000 --- a/web/cobrands/bellavistaenaccion/layout.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "_colours"; -@import "../sass/layout"; diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss index 0297f08c3..ed3ba193f 100644 --- a/web/cobrands/bromley/layout.scss +++ b/web/cobrands/bromley/layout.scss @@ -96,8 +96,8 @@ h1.main { } // We have slightly different content in our lists of issues to what -// reports_list.scss expects, so we need to add back some padding it removes. -// This stops the pin icon being underneath the text. +// reports_list.scss expects, so we need to tweak the padding back to normal. +// This stops the spacing being too large. .item-list__item--with-pin a { padding: 0; padding-left: 3em; diff --git a/web/cobrands/default/_colours.scss b/web/cobrands/default/_colours.scss index 5ac6cf8e7..5bd3d958f 100644 --- a/web/cobrands/default/_colours.scss +++ b/web/cobrands/default/_colours.scss @@ -19,6 +19,9 @@ $map_nav_bg: $bluey; $nav_fg: #000; $nav_fg_hover: $primary; +// Colour used for front page 'how to report a problem' steps +$col_big_numbers: #ccc; + $col_click_map: $bluey; $col_click_map_dark: darken($bluey, 10%); diff --git a/web/cobrands/emptyhomes/SEHPlogo-bwS.png b/web/cobrands/emptyhomes/SEHPlogo-bwS.png Binary files differdeleted file mode 100644 index 496d43115..000000000 --- a/web/cobrands/emptyhomes/SEHPlogo-bwS.png +++ /dev/null diff --git a/web/cobrands/emptyhomes/Sheltercymru47.gif b/web/cobrands/emptyhomes/Sheltercymru47.gif Binary files differdeleted file mode 100644 index b7eb2c4ff..000000000 --- a/web/cobrands/emptyhomes/Sheltercymru47.gif +++ /dev/null diff --git a/web/cobrands/emptyhomes/Sheltercymru47s.png b/web/cobrands/emptyhomes/Sheltercymru47s.png Binary files differdeleted file mode 100644 index 5547be1e0..000000000 --- a/web/cobrands/emptyhomes/Sheltercymru47s.png +++ /dev/null diff --git a/web/cobrands/emptyhomes/app.png b/web/cobrands/emptyhomes/app.png Binary files differdeleted file mode 100644 index 8f422b08d..000000000 --- a/web/cobrands/emptyhomes/app.png +++ /dev/null diff --git a/web/cobrands/emptyhomes/c4logo.png b/web/cobrands/emptyhomes/c4logo.png Binary files differdeleted file mode 100644 index 783385e30..000000000 --- a/web/cobrands/emptyhomes/c4logo.png +++ /dev/null diff --git a/web/cobrands/emptyhomes/css/css.css b/web/cobrands/emptyhomes/css/css.css deleted file mode 100644 index 829986f59..000000000 --- a/web/cobrands/emptyhomes/css/css.css +++ /dev/null @@ -1,318 +0,0 @@ -/* Smaller map */ -/* -#map_box { - width: 380px; -} -#map, #drag { - width: 378px; - height: 378px; -} - -p#fixed, p#unknown { - margin-right: 400px; - width: auto; -} -*/ - -/* Generics */ - -body { - font-family: Geneva, Helvetica, Arial, sans-serif; - margin: 0; - padding: 0; - /* color: #a9aeb0; */ -} - -h1 { - margin: 0; - font-size: 165%; - padding: 3px; - color: #FFFFFF; - background-color: #9999CC; - background-color: #30517A; - -} -h2 { - font-size: 140%; - background-color: #B1BECF; - color: #30517A; - padding: 3px; -} - -h3 { - color: #30517A; -} - -a:link { - color: #30517A; -} -a:visited { - color: #354664; -} -a:hover, a:active { - background-color: #B1BECF; -} - -#mysociety blockquote { - border-left: solid 4px #013B63; -} - -#mysociety .a { - color: #000000; - background-color: #DCDCED; /* #427499; */ - background-color: #B1BECF; -} - -/* Site layout */ - -#header { - margin: 0; - padding: 5px 0; - float: left; -} - -#header img { - margin-left: 0.5em; -} - -#header #eha-logo { - float: left; - margin-right: 1em; -} - -#header div { - float: left; - margin-top: 0.5em; -} - -#mysociety { - width: 100%; /* Must specify a width or IE goes crazy wrong! */ - position: relative; - margin: 0 auto; - max-width: 60em; -} - -/* Can't put the margin in #mysociety because of above IE craziness */ -#wrapper { - clear: both; - margin: 0 2em 2em; - padding-top: 2em; -} - -#navigation { - float: right; - padding: 0; - margin: 0; - list-style-type: none; - font-size: 83%; -} -#navigation ul { - padding: 0; - margin: 0; -} -#navigation li { - display: inline; - padding: 0; - margin: 0; -} - -#navigation a { - display: -moz-inline-box; - display: inline-block; - padding: 0.5em 0.5em; -} -#navigation a:link, #navigation a:visited { - color: #30517A; -} -#navigation a:hover, #navigation a:active { - background-color: #DCDCED; - background-color: #9999CC; - background-color: #B1BECF; - - color: #ffffff; - color: #30517A; -} - -#nav_new a { - background-image: url("/i/new.png"); - background-repeat: no-repeat; - background-position: 100% 0; -} - -#meta { - clear: right; - float: right; - list-style-type: none; - margin: 0.25em 0.5em 0 1em; - padding: 0; - font-size: 83%; -} -#meta li { - display: inline; - margin: 0; - padding: 0 0 0 0.25em; - border-left: solid 1px #B1BECF; -} -#meta li:first-child { - border-left: none; -} - -#logo { - border: none; - position: absolute; - top: 4em; - right: 10px; -} - -#emptyhomes-footer { - clear: both; - font-size: 83%; - border-top: solid 2em #ffffff; - background-color: #B1BECF; - color: #000; - margin: 2em 0 1em 0; - padding: 20px; - overflow: auto; -} - -.ie6 #emptyhomes-footer { - zoom: 1; -} - -#emptyhomes-footer div { - float: left; - margin-right: 2em; -} - -#emptyhomes-footer a { - color: #000; -} - -#mysociety #postcodeForm { - background-color: #fe6500; - color: #000000; - font-size: 130%; -} - -#mysociety #postcodeForm a, #mysociety #postcodeForm a:hover { - color: #000000; - background-color: inherit; -} - -#mysociety #front_stats { - display: block; -} -#mysociety #front_stats div { - vertical-align: middle; - background-color: #fe6500; - color: #000000; - padding: 0.5em; - width: auto; - display: block; - margin-bottom: 0.5em; -} -#mysociety #front_stats div a { - color: #000000; - background-color: inherit; -} -#mysociety #front_stats div big { - display: inline; -} - -#mysociety #front_stats div#eha-app-link { - padding-top: 16px; - padding-left: 120px; - color: #fe6500; - background-color: #fff; - background-image: url("/cobrands/emptyhomes/app.png"); - background-repeat: no-repeat; -} -#mysociety #front_stats div#eha-app-link a { - color: #fe6500; - background-color: #000; -} - -#mysociety #problem_form { - clear: both; -} - -#mysociety #alert_links_area { - margin-top: 1px; -} - -#mysociety #eha_advert { - clear: both; - width: 55%; - margin: 0 auto; - padding: 0.5em; - text-align: center; - background-color: #ffeecc; - border: solid 1px #ff9900; -} - -#mysociety #front_intro { - margin-bottom: 1em; -} - -.video { - float: right; - margin-left: 35px; -} - -.channel4 { - font-size: 125%; -} -.channel4 > li:first-child + li { - margin-bottom: 1em; -} - -/* Front page how to report big */ - -#eha_steps { - background-image: url("/cobrands/emptyhomes/street-r.jpeg"); - background-repeat: no-repeat; - padding: 0.5em 2% 0.5em 8%; -} -#eha_steps h2 { - color: #000; - background-color: #fe6500; - margin-top: 0; - margin-bottom: 0.4em; -} -#eha_steps ol { - list-style-position: inside; - padding: 0 0 0 40%; - margin: 0; -} -#eha_steps li { - color: #fff; - background-color: #000; - padding: 0.25em; - margin-bottom: 0.5em; -} - -.bl { - color: #fff; - background-color: #000; -} - -/* Noddy half grid */ - -.grid-50 { - float: right; - width: 48%; - margin-right: 2%; -} -.grid-50:first-child { - margin-right: 0; -} -.grid-50 > h2:first-child { - margin-top: 0; -} -@media all and (max-width: 50em) { - #mysociety .grid-50 { - float: none; - width: auto; - } -} - diff --git a/web/cobrands/emptyhomes/eha-logo.jpeg b/web/cobrands/emptyhomes/eha-logo.jpeg Binary files differdeleted file mode 100644 index 250be8502..000000000 --- a/web/cobrands/emptyhomes/eha-logo.jpeg +++ /dev/null diff --git a/web/cobrands/emptyhomes/eha-logo.png b/web/cobrands/emptyhomes/eha-logo.png Binary files differdeleted file mode 100644 index 5cc912521..000000000 --- a/web/cobrands/emptyhomes/eha-logo.png +++ /dev/null diff --git a/web/cobrands/emptyhomes/eha.jpg b/web/cobrands/emptyhomes/eha.jpg Binary files differdeleted file mode 100644 index 56e767b86..000000000 --- a/web/cobrands/emptyhomes/eha.jpg +++ /dev/null diff --git a/web/cobrands/emptyhomes/eha.png b/web/cobrands/emptyhomes/eha.png Binary files differdeleted file mode 100644 index 8c17db486..000000000 --- a/web/cobrands/emptyhomes/eha.png +++ /dev/null diff --git a/web/cobrands/emptyhomes/street-r.jpeg b/web/cobrands/emptyhomes/street-r.jpeg Binary files differdeleted file mode 100644 index 722738de8..000000000 --- a/web/cobrands/emptyhomes/street-r.jpeg +++ /dev/null diff --git a/web/cobrands/emptyhomes/tiger-aspect.png b/web/cobrands/emptyhomes/tiger-aspect.png Binary files differdeleted file mode 100644 index 53e8d5311..000000000 --- a/web/cobrands/emptyhomes/tiger-aspect.png +++ /dev/null diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss index e8cbdab5e..442874360 100644 --- a/web/cobrands/fixamingata/layout.scss +++ b/web/cobrands/fixamingata/layout.scss @@ -61,7 +61,8 @@ noindex:-o-prefocus, #site-header { font-family: sans-serif; } -h3, h4 { +h3, h4, +.item-list__heading { font-weight: bold; } diff --git a/web/cobrands/fixmybarangay/_colours.scss b/web/cobrands/fixmybarangay/_colours.scss deleted file mode 100644 index d5544ff07..000000000 --- a/web/cobrands/fixmybarangay/_colours.scss +++ /dev/null @@ -1,21 +0,0 @@ -/* COLOURS */ - -$primary: #fff; //E6DBD6 -$primary_b: #000000; -$primary_text: #222222; - -$base_bg: #C7B299 url(images/pat3.png); -$base_fg: $primary_text; - -$map_nav_bg: url('images/fmb-header.png') 30% 0% repeat-x; -$nav_fg: #fff; -$nav_fg_hover: rgba(0,0,0,0.8); - -$col_click_map: #00BD08; -$col_click_map_dark: #4B8304; -$col_fixed_label: #00BD08; -$col_fixed_label_dark: #4B8304; - -$fmb_base_blue: #046AAA; -$fmb_dark_blue: #084E7A; -$fmb_tab_yellow: #FFD000; diff --git a/web/cobrands/fixmybarangay/base.scss b/web/cobrands/fixmybarangay/base.scss deleted file mode 100644 index 2f3fddaf3..000000000 --- a/web/cobrands/fixmybarangay/base.scss +++ /dev/null @@ -1,69 +0,0 @@ -@import "../sass/h5bp"; -@import "./_colours"; -@import "../sass/mixins"; -@import "compass"; - -$image-sprite: 'images/sprite.png'; - -@import "../sass/base"; - -#site-logo{ - width: 225px !important; - background: url($image-sprite) -3px -3px no-repeat; -} - -#barangay_buttons { - padding: 1em; -} - -.yellow-btn, -a.yellow-btn, -button.yellow-btn, -input.yellow-btn{ - @include button-reset(#FFD000, #cc9000, #aa7000, #300, #FFD000, #cc9000, #aa7000, #300); - &:visited, &:hover { - color:#300; - } -} - -.nav-menu--main a.report-a-problem-btn:hover { - background: #fff; -} - -.ie6 #site-logo { - background-image: url('images/ie_logo.png'); -} - -// #site-header creates grey bar in mobile -// .nav-wrapper-2 is used on desktop -#site-header{ - border-top: 0.25em solid $fmb_tab_yellow; - @include background(linear-gradient($fmb_dark_blue, $fmb_base_blue 10%, $fmb_base_blue 90%, $fmb_dark_blue)); -} - -ul#promo-list { - margin: 0.5em; - li { - list-style:none; - } -} -.promo-big, .promo-bigger { - font-size: 130%; - font-weight: bold; - padding: 0 0.2em; -} -.promo-bigger { - font-size: 150%; -} -.promo-example { - font-size: 90%; - font-style: italic; - border: 1px solid #aaa; - background-color:#f0ebe8; // pale tone of background image - padding: 0.666em; - margin: 1em 1em 1em 0; - div { - font-style: normal; - font-family: monospace; - } -} diff --git a/web/cobrands/fixmybarangay/config.rb b/web/cobrands/fixmybarangay/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/fixmybarangay/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# 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/fixmybarangay/images/fmb-header.png b/web/cobrands/fixmybarangay/images/fmb-header.png Binary files differdeleted file mode 100644 index c3c45e009..000000000 --- a/web/cobrands/fixmybarangay/images/fmb-header.png +++ /dev/null diff --git a/web/cobrands/fixmybarangay/images/fmb-spinner-16x16.gif b/web/cobrands/fixmybarangay/images/fmb-spinner-16x16.gif Binary files differdeleted file mode 100644 index da5ea679a..000000000 --- a/web/cobrands/fixmybarangay/images/fmb-spinner-16x16.gif +++ /dev/null diff --git a/web/cobrands/fixmybarangay/images/ie_front_logo.gif b/web/cobrands/fixmybarangay/images/ie_front_logo.gif Binary files differdeleted file mode 100644 index 2eeda87ef..000000000 --- a/web/cobrands/fixmybarangay/images/ie_front_logo.gif +++ /dev/null diff --git a/web/cobrands/fixmybarangay/images/ie_logo.png b/web/cobrands/fixmybarangay/images/ie_logo.png Binary files differdeleted file mode 100644 index 454297104..000000000 --- a/web/cobrands/fixmybarangay/images/ie_logo.png +++ /dev/null diff --git a/web/cobrands/fixmybarangay/images/mobile-22x40.png b/web/cobrands/fixmybarangay/images/mobile-22x40.png Binary files differdeleted file mode 100644 index 6a85ab097..000000000 --- a/web/cobrands/fixmybarangay/images/mobile-22x40.png +++ /dev/null diff --git a/web/cobrands/fixmybarangay/images/pat3.png b/web/cobrands/fixmybarangay/images/pat3.png Binary files differdeleted file mode 100644 index a0f755de9..000000000 --- a/web/cobrands/fixmybarangay/images/pat3.png +++ /dev/null diff --git a/web/cobrands/fixmybarangay/images/sprite.png b/web/cobrands/fixmybarangay/images/sprite.png Binary files differdeleted file mode 100644 index cbde4ac7f..000000000 --- a/web/cobrands/fixmybarangay/images/sprite.png +++ /dev/null diff --git a/web/cobrands/fixmybarangay/layout.scss b/web/cobrands/fixmybarangay/layout.scss deleted file mode 100644 index defe1afd0..000000000 --- a/web/cobrands/fixmybarangay/layout.scss +++ /dev/null @@ -1,123 +0,0 @@ -@import "_colours"; - -$image-sprite: 'images/sprite.png'; - -@import "../sass/layout"; - -@mixin box_round($radius) { - -webkit-border-radius: $radius; /* Safari 3-4, iOS 1-3.2, Android ≤1.6 */ - border-radius: $radius; /* Opera 10.5, IE9+, Safari 5, Chrome, Firefox 4+, iOS 4, Android 2.1+ */ - - /* useful if you don't want a bg color from leaking outside the border: */ - -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box; -} - -body { - .wrapper{ - background: url('images/fmb-header.png') 30% 0% repeat-x; - } - #site-logo { - left:8px; - } -} - - -body.frontpage { - #site-logo { - width: 370px !important; - height: 70px; - background: url('images/sprite.png') -3px -106px no-repeat; - top: 2em; - left: 1em; - } - - .wrapper { - background: url('images/fmb-header.png') 30% 0% repeat-x; - } -} - -.ie6 body.frontpage #site-logo { - background-image: url(images/ie_front_logo.gif); -} - -body.mappage .nav-wrapper div.nav-wrapper-2 { - border-bottom: 2px solid #333; -} - -#mysoc-logo { - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIkAAAAyCAMAAABf9whNAAAA0lBMVEUAAABAQEBAQEBAQEBNTU1NTU1AQEBNTU1AQEBAQEBAQEBAQEBAQEBAQEBAQEBNTU1NTU1AQEBNTU1AQEBNTU1AQEBAQEBNTU2Mxj9NTU33kx5NTU1NTU1NTU3tHCRmLZEpq+JNTU2TJ4/tHCSTJ4/87iEpq+L3kx5NTU387iH87iHtHCSTJ4/3kx51K5CTJ49mLZGMxj/tHCSx0zVmLZH6wSBmLZFmLZFDdb/zYCFbuZGMxj/3kx5AQEBNTU0pq+LtHCSMxj/3kx787iFmLZGTJ49ns3BGAAAAPXRSTlMAQL+AQIAQECBwMGBQj98gn5/Pr+/vzzC/r79wYI9wv69QcK+vcICfv68QQBAwj0AwMBBggIBQr3BwgEBgSmaQCwAAAflJREFUeF7t1Ndy2zAQhtGfAAX2IpFUseSSOLGd3nt27bT3f6UsQHusRFcKmVxkcGa4wvCG34AQ8V/wPM/zPM8zSaOaxGBHtFpF+IfikqwYO0LmELfiHH/XlLokSBrsiurtPdGkMJJFWFWTSQUZC0RhWMFNRQWuvTw9RS/VOolNEBgAudYpkE5pHqRpEACIZQ4x4RkztxMWd6KWa2DDvFDUBeg9urr6cPAZMIqEDogCmDmJKdwtlbjXOCc1sIRnhyxj0vIMNbeQMUNun5DBOTo6/3oASMhUF6krka3IM1lkikqdGaICMVE2sKSNICkR1sxYyMag5TWQd7bFPH4G8eT8zcOUKIGwJUYuSE7hzoldlZAwM7Dkwg4GQjtmXMtvBZHNiZJ7P+5C3P/2oH9SXyKXo1yJq0sbmmLMkg23h7xCryR1W5L8WqKsmz1BSbqjfNSSiMUGMEB/Bp8ePwdeLF/ZAn1TEssFR1MJIZmyGLUENXNrI8pCK6IMx99fn50tvyyBcuvEKuqKXDcuocgAQ/I7conMGgA5BfD23fvLy4/LT0Ba/v4vphRxR9dnlmIMU4ULO0IgsgPr/rya3H7F4JycoCf3sq0vW5ICiLXO3YtsMC4JqbG3uCFKMSb3nYuwNyLKMK6Q6wj7a7oMY4vwJwwG8TzP8zzP834CEcRJKkEhVogAAAAASUVORK5CYII="); -} -#front-main { - background: rgba(255,255,255,0.1); - margin-top: 70px; - - #postcodeForm { - margin-left: 0; - margin-right: 0; - } - - a { - text-decoration:none; - } - - p { - padding-bottom:4px; - } -} - -.nav-menu--mysoc { - padding: 1px 0.5em; -} -.nav-menu--main { - padding: 3px 0; -} - -body.mappage .nav-menu--main a, -body.mappage .nav-menu--main span, -.nav-menu--main a, -.nav-menu--main span -{ - color: #fff; - padding: 0.7em; - background-color: rgba(0,0,0,0); - background-image: none; - @include box_round(0.35em); - margin-left: 3px; - - &.report-a-problem-btn { - color: #fff; - padding: 0.7em; - background-color: rgba(0,0,0,0); - background-image: none; - margin: 0; - } - - &.fmb-bgy-btn { - color: #fcc921; - } - - &:hover { - background-color: rgba(0,0,0,0.75); - background-image: none; - } -} - - -#user-meta { - max-width: 96%; -} - - - -#front-howto { - #front_stats { - border-top: 0.25em solid #000; - div { - big { - color: #000; - } - } - } -} - -@import "message_manager"; diff --git a/web/cobrands/fixmybarangay/message_manager.scss b/web/cobrands/fixmybarangay/message_manager.scss deleted file mode 100644 index 9af6c80ee..000000000 --- a/web/cobrands/fixmybarangay/message_manager.scss +++ /dev/null @@ -1,266 +0,0 @@ -@import "_colours"; - -$mm_status_message_color: #a66; -$mm_border_color: #eee; - -$color_reply_bg: #cccccc; -$color_bg_reply_0: #E8E8E8; -$color_bg_reply_1: #DEDEDE; -$color_bg_reply_2: #D6D6D6; -$color_bg_reply_3: #D1D1D1; -$color_bg_reply_4: #C9C9C9; -$color_bg_reply_5: #BFBFBF; -$color_bg_reply_6: #B8B8B8; -$color_bg_mm_list: #F6F6F6; - -$color_bg_btn_hide: #ff0000; -$color_bg_btn_reply: #008000; -$color_bg_btn_info: #0000ff; -$color_bg_btn_detach: #FFA500; - -$weak_text_color: #666; - -p.mm-submitted-by-sms { - color: $weak_text_color; - font-style: italic; - font-size: 0.8125em; - img { - border: none; - margin-right: 0.5em; - width: 22px; - height: 40px; - vertical-align:middle; - display: inline; - } -} - -#message_manager { - margin-top: 0; - li#mm-admin-buttons { - margin: -0.5em 0 0 0; - text-align: right; - font-size:80%; - padding:4px 0; - a { - padding: 0.25em 0.5em; - border:1px solid $mm_border_color; - margin: 0 0.5em; - display: inline-block; - } - background-color: #fff; - &:hover { - background-color: #fff; - } - #mm-link-to-toggle-archive { - border-color: green; - } - } - #message-control { - background-color: #fff; - &:hover { - background-color: #fff; - } - #mm-username-container { - display: none; // hidden during dev - padding: 8px; - text-align: right; - color: $mm_status_message_color; - font-style: italic; - span { - color: #000; - font-style: normal; - } - } - #mm-status-message-container { - position: relative; - min-height: 1.4em; - margin: 0 0 8px 0.5em; - padding: 8px 4px 8px 24px; - color: $mm_status_message_color; - font-style: italic; - p { - margin:0; - padding:0; - } - #mm-spinner { - position: absolute; - left: 4px; - top: 10px; - display: none; - } - } - #mm-login-container { - display: none; // only shown on/after a 403 - border: 1px solid $mm_border_color; - padding: 0 1em; - margin: 1em; - input { - margin-bottom: 1em; - } - } - } - - #mm-message-list { - ul { - list-style-type: none; - padding: 0; - margin: 0; - li, ul.mm-reply-thread li { - position: relative; - clear: both; - margin: 4px 0 0 0; - padding: 0; - background-color: $color_bg_mm_list; - p { - background-color: inherit; - margin: 0.25em 0 0 0; - padding: 0.5em 1em; - &:hover { background-color: #efe;} - .msg-info-box { - font-style: italic; - font-size: 90%; - color: #666; - border-top: 1px dashed #666; - padding:4px 0 0 0; - margin: 4px 0 0 0; - display: none; - } - } - ul.mm-reply-thread { - li { - margin:0; - } - .mm-reply { - background-color: #ccc; - &:hover {background-color: #eef;} - } - .mm-reply-0 { margin-left: 0em; background-color: $color_bg_reply_0;} - .mm-reply-1 { margin-left: 1em; background-color: $color_bg_reply_1;} - .mm-reply-2 { margin-left: 2em; background-color: $color_bg_reply_2;} - .mm-reply-3 { margin-left: 3em; background-color: $color_bg_reply_3;} - .mm-reply-4 { margin-left: 4em; background-color: $color_bg_reply_4;} - .mm-reply-5 { margin-left: 5em; background-color: $color_bg_reply_5;} - .mm-reply-6 { margin-left: 6em; background-color: $color_bg_reply_6;} - } - &:hover { background-color: #efe;} - &.msg-is-locked { background-color: #fdd;} - &.msg-is-busy { background-color: #ffd;} - &.msg-is-owned { background-color: #dfd;} - &.msg-is-active { - background-color: $col_click_map; color:#fff; - p:hover { background-color: $col_click_map; color:#fff; } // fix for mouseover on p - p.mm-reply:hover {background-color: #eef; color:#000;} // fix for mouseover on p - } - span.msg-tag { - width: 3em; - float:left; - } - .mm-radio-filler, - input[type=radio] { - display: block; - float: left; - } - label, span.msg-text { - display: block; - font-weight: normal; - margin: 0.1em 0 0.1em 4.5em; - } - .mm-radio-filler { - margin:0; - padding:0; - } - .mm-msg-action { - display: none; - padding: 0.2em 0.4em; - color: white; - text-align: center; - position: absolute; - top: 4px; - &:hover { background-color: black;} - } - .mm-hide { - right:0px; - background-color: $color_bg_btn_hide; - cursor: pointer; - } - .mm-info { - right:1.5em; - background-color: $color_bg_btn_info; - cursor: pointer; - } - .mm-rep { - right:2.6em; - background-color: $color_bg_btn_reply; - cursor: pointer; - } - .mm-detach { - right:5.65em; - background-color: $color_bg_btn_detach; - cursor: pointer; - } - } - &.mm-archive { - display: none; // archive only shown on interaction - li label { - cursor: default; - } - } - } - } - p.mm-empty { - margin: 1em; - } -} -#show_messages, #copy_to_update, #reply-submit { - margin: 1em; -} -#copy_to_update { - display: none; // show on demand, not before -} -#show_messages { - width: 11em; // hack to stop adjacent button hopping when button message changes -} - -#detach-form-container, -#reply-form-container, -#hide-form-container { - p { - color: #000; - max-width: 25em; - margin: 1em; - } - #hide-form, - #reply-form{ - margin-top: 2em; - textarea { - min-height: 3em; - margin-bottom: 0.5em; - } - } - #mm-boilerplate-replies-box, #mm-boilerplate-hide-reasons-box { - overflow: hidden; - display: none; - } - select { - width: 100%; - max-width: 25em; - } -} -#mm-help { - .demo_hide_btn, .demo_reply_btn, .demo_info_btn, .demo_detach_btn { - color: #fff; - font-weight: bold; - padding: 0.2em 0.4em; - } - .demo_hide_btn { background-color: $color_bg_btn_hide; } - .demo_reply_btn { background-color: $color_bg_btn_reply; } - .demo_info_btn { background-color: $color_bg_btn_info; } - .demo_detach_btn{ background-color: $color_bg_btn_detach; } - h3 { - border-top: 1px solid $color_reply_bg; - padding-top: 0.8em; - } - p { - margin: 1em; - } -} diff --git a/web/cobrands/fixmybarangay/message_manager_client.js b/web/cobrands/fixmybarangay/message_manager_client.js deleted file mode 100644 index 06ea7a909..000000000 --- a/web/cobrands/fixmybarangay/message_manager_client.js +++ /dev/null @@ -1,850 +0,0 @@ -/* - * creates a message_manage object that uses the Message Manager API: - * include this file, then initialise the object when the page is loaded with - * message_manager.config(settings) - * - * i.e., you *must* do something like: - * - * $(document).ready(function() { - * message_manager.config({url_root:'http://yourdomain.com/messages'}) - * } - * - * You'll need to set the url_root, but you can leave everything else to default - * provided your HTML ids and classes are the same as ours (which they might be: - * see the Message Manager's dummy client (at /client) to see the HTML we use). - * - * The (optional) single parameter for .config() is a hash of name-value pairs: - * - * url_root accepts the root URL to the message manager. - * - * want_unique_locks normally MM clients should relinquish all other locks - * when claiming a new one so want_unique_locks defaults - * to true; but you can set it explicitly here. - * - * mm_name name of Message Manager (used in error messages shown - * to user, e.g., "please log in to Message Manager") - * - * msg_prefix all message <li> items have this as their ID prefix - * - * want_nice_msgs don't use language like "lock granted" - * - * tooltips hash of tooltips: override the items you want, keys are: - * tt_hide, tt_info, tt_reply, tt_radio - * - * want_radio_btns normally MM clients show a radio button, but for archive - * messages this might be unneccessary: default is true, but - * pass in false to suppress this. - * - * *_selector these are the jQuery selects that will be used to find - * the respective elements: - * - * message_list_selector: list of messages - * status_selector: status message display - * login_selector: login form - * - * - * Summary of all methods: - * message_manager.config([options]) - * message_manager.setup_click_listener([options]) - * message_manager.get_available_messages([options]) - * message_manager.request_lock(msg_id, [options]) (default use: client code doesn't need to call this explicitly) - * message_manager.assign_fms_id(msg_id, fms_id, [options]) - * message_manager.hide(msg_id, reason_text, [options]) - * message_manager.reply(msg_id, reply_text, [options]) - * message_manager.show_info(msg_id) - * message_manager.sign_out() - * - * Note: options are {name:value, ...} hashes and often include "callback" which is a function that is executed on success - * but see the docs (request_lock executes callback if the call is successful even if the lock was denied, for example). - * Some methods take 'callback' as the only option, but you still need to pass it as a named option. -*/ - -var message_manager = (function() { - - // default/config values: to be overridden using "config({name:value, ...})" - - var _url_root = 'http://www.example.com/message_manager/'; - var _want_unique_locks = true; - var _msg_prefix = "msg-"; - var _username; - var _mm_name = "Message Manager"; - var _use_fancybox = true; // note: currently *must* have fancybox! - var _want_nice_msgs = false; - var _want_radio_btns = true; - - var _tooltips = { - tt_hide : "Hide message", - tt_info : "Get info", - tt_reply : "Send SMS reply", - tt_radio : "Select message before clicking on map to create report", - tt_detach: "Detach this message because it is not a reply" - }; - - // cached jQuery elements, populated by the (mandatory) call to config() - var $message_list_element; - var $status_element; - var $login_element; - var $htauth_username; - var $htauth_password; - var $hide_reasons; - var $boilerplate_replies; - - var msg_no_config_err = "Config error: no Message Manager URL has been specified"; - - // set _want_nice_msgs to avoid using the term "lock" - var msg_trying_for_lock = ["Trying for lock...", "Checking message..." ]; - var msg_checking_lock = ["Checking lock...", "Checking message..." ]; - var msg_claiming_lock = ["Claiming lock...", "Checking message..." ]; - var msg_lock_granted_ok = ["Lock granted OK", "Checking message... OK"]; - var msg_lock_denied = ["", "Someone is working with that message right now!"]; - - function get_msg(msg) { - return msg[_want_nice_msgs? 1 : 0]; - } - - var config = function(settings) { - var selectors = { - message_list_selector: '#mm-message-list', - status_selector: '#mm-status-message-container', - login_selector: '#mm-login-container', - username_selector: '#mm-received-username', - htauth_username_selector: '#mm-htauth-username', - htauth_password_selector: '#mm-htauth-password', - boilerplate_hide_reasons: '#mm-boilerplate-hide-reasons-box', - boilerplate_replies: '#mm-boilerplate-replies-box' - }; - if (settings) { - if (typeof settings.url_root === 'string') { - _url_root = settings.url_root; - if (_url_root.length > 0 && _url_root.charAt(_url_root.length-1) !== "/") { - _url_root+="/"; - } - } - if (typeof settings.want_unique_locks !== 'undefined') { - _want_unique_locks = settings.want_unique_locks; - } - if (typeof settings.msg_prefix === 'string') { - _msg_prefix = settings.msg_prefix; - } - for (var sel in selectors) { - if (typeof settings[sel] === 'string') { - selectors[sel] = settings[sel]; - } - } - if (typeof settings.mm_name === 'string') { - _mm_name = settings.mm_name; - } - if (typeof settings.want_nice_msgs !== 'undefined') { - _want_nice_msgs = settings.want_nice_msgs; - } - if (typeof settings.want_radio_btns !== 'undefined') { - _want_radio_btns = settings.want_radio_btns; - } - if (settings.tooltips) { - for (var key in settings.tooltips) { - if (settings.tooltips.hasOwnProperty(key)) { - _tooltips[key]=settings.tooltips[key]; - } - } - } - } - $message_list_element = $(selectors.message_list_selector); - $status_element = $(selectors.status_selector); - $login_element = $(selectors.login_selector); - $htauth_username = $(selectors.htauth_username_selector); - $htauth_password = $(selectors.htauth_password_selector); - $hide_reasons = $(selectors.boilerplate_hide_reasons); - $boilerplate_replies = $(selectors.boilerplate_replies); - if (typeof settings.url_root === 'string' && _url_root.length===0) { - say_status(msg_no_config_err); - } - }; - - var make_base_auth = function(user, password) { - var tok = user + ':' + password; - var hash = encodeBase64(tok); // window.btoa(tok) doesn't work on all browers - return "Basic " + hash; - }; - - function encodeBase64(input) { - var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=', - INVALID_CHARACTER_ERR = (function () { - // fabricate a suitable error object - try { - document.createElement('$'); - } catch (error) { - return error; - } - }()), - block, charCode, idx, map, output; - // encoder (with wee change by mhl Mark to satisfy jslint) - // [https://gist.github.com/999166] by [https://github.com/nignag] - for (idx = 0, map = chars, output = ''; - input.charAt(idx | 0) || ((map = '=') && (idx % 1)); - output += map.charAt(63 & block >> 8 - idx % 1 * 8)) { - charCode = input.charCodeAt(idx += 3/4); - if (charCode > 0xFF) { - throw INVALID_CHARACTER_ERR; - } - block = block << 8 | charCode; - } - return output; - } - - var get_current_auth_credentials = function() { - var base_auth = ""; - var htauth_un = ""; - var htauth_pw = ""; - if ($htauth_username.size()) { - htauth_un = $htauth_username.val(); - htauth_pw = $htauth_password.val(); - } - if (htauth_un.length === 0 && Modernizr.sessionstorage && sessionStorage.getItem('mm_auth')) { - base_auth = sessionStorage.getItem('mm_auth'); - } else { - base_auth = make_base_auth(htauth_un, htauth_pw); - if (Modernizr.sessionstorage) { - sessionStorage.mm_auth = base_auth; - } - } - return base_auth; - }; - - var sign_out = function() { // clear_current_auth_credentials - if (Modernizr.sessionstorage) { - sessionStorage.removeItem('mm_auth'); - } - if ($htauth_password) { - $htauth_password.val(''); - } - }; - - var show_login_form = function(suggest_username) { - $('.mm-msg', $message_list_element).remove(); // remove (old) messages - if ($htauth_username.size() && ! $htauth_username.val()) { - $htauth_username.val(suggest_username); - } - $login_element.stop(true,true).slideDown(); - }; - - var say_status = function (msg, show_spinner, allow_html) { - if ($status_element) { - if (show_spinner) { - // slow fade in so that spinner only appears if there's a long delay - $status_element.find('#mm-spinner').stop(true,true).fadeIn(1200); - } else { - $status_element.find('#mm-spinner').stop(true,true).hide(); - } - $status_element.stop(true,true).show(); - if (allow_html) { - $status_element.find('p').html(msg); - } else { - $status_element.find('p').text(msg); - } - } - }; - - var extract_replies = function(replies, depth, is_archive) { - var $ul = ""; - if (replies && replies.length > 0) { - $ul = $('<ul class="mm-reply-thread"/>'); - for (var i=0; i<replies.length; i++) { - $ul.append(get_message_li(replies[i], depth, is_archive)); - } - } - return $ul; - }; - - var get_message_li = function(message_root, depth, is_archive) { - var msg = message_root.Message; // or use label value - var lockkeeper = message_root.Lockkeeper.username; - var escaped_text = $('<div/>').text(msg.message).html(); - var $p = $('<p/>'); - var $hide_button = $('<a class="mm-msg-action mm-hide" id="mm-hide-' + msg.id + '" href="#hide-form-container" title="' + _tooltips.tt_hide + '">X</a>'); - var $info_button = $('<span class="mm-msg-action mm-info" id="mm-info-' + msg.id + '" title="' + _tooltips.tt_info + '">i</span>'); - var $reply_button = $('<a class="mm-msg-action mm-rep" id="mm-rep-' + msg.id + '" href="#reply-form-container" title="' + _tooltips.tt_reply + '">reply</a>'); - var $detach_button = $('<a class="mm-msg-action mm-detach" id="mm-rep-' + msg.id + '" href="#detach-form-container" title="' + _tooltips.tt_detach + '">detach</a>'); - var is_radio_btn = _want_radio_btns && depth === 0 && ! is_archive; - if (_use_fancybox) { - $reply_button.fancybox(); - $hide_button.fancybox(); - $detach_button.fancybox(); - } - if (depth === 0) { - var tag = (!msg.tag || msg.tag === 'null')? ' ' : msg.tag; - tag = $('<span class="msg-tag"/>').html(tag); - var radio = null; - if (is_radio_btn) { - radio = $('<input type="radio"/>').attr({ - 'id': 'mm_text_' + msg.id, - 'name': 'mm_text', - 'value': escaped_text, - 'title': is_radio_btn? _tooltips.tt_radio : "" - }).wrap('<p/>').parent().html(); - } else { - radio = $("<p>–</p>").addClass('mm-radio-filler'); - } - var label = $('<label />').attr({ - 'class': 'msg-text', - 'for': 'mm_text_' + msg.id, - 'title': is_radio_btn? _tooltips.tt_radio : "" - }).text(escaped_text).wrap('<p/>').parent().html(); - $p.append(tag).append(radio).append(label); - } else { - $p.text(escaped_text).addClass('mm-reply mm-reply-' + depth); - } - var $litem = $('<li id="' + _msg_prefix + msg.id + '" class="mm-msg">').append($p).append($hide_button).append($info_button); - if (depth > 0 && depth % 2 === 0) { // only even-numbered depths are incoming replies that can be detached - $litem.append($detach_button); - } - if (msg.is_outbound != 1) { - $litem.append($reply_button); - } - if (lockkeeper) { - $litem.addClass(lockkeeper == _username? 'msg-is-owned' : 'msg-is-locked'); - } - var info_text = ""; - if (msg.is_outbound == 1) { - info_text = 'sent on ' + msg.created + ' by ' + msg.sender_token; - } else { - info_text = 'received on ' + msg.created + ' from ' + '<abbr title="'+ msg.sender_token + '">user</abbr>'; - } - $p.append('<div class="msg-info-box" id="msg-info-box-' + msg.id + '">' + info_text + '</div>'); - if (message_root.children) { - $litem.append(extract_replies(message_root.children, depth+1, is_archive)); - } - return $litem; - }; - - var show_available_messages = function(data, anim_duration) { - var messages = data.messages; - _username = data.username; - var $output = $message_list_element; - if (anim_duration > 0) { - $output.stop(true,true).fadeOut(anim_duration, function(){ - render_available_messages(data, anim_duration); - }); - } else { - render_available_messages(data, anim_duration); - } - }; - - // render allows animation (if required) to hide messages before repainting and then revealing them - var render_available_messages = function(data, anim_duration) { - var $output = $message_list_element; - $output.empty(); - var archive = data.messages_for_this_report; - var $archive = ""; - var i, litem; - if (archive instanceof Array) { - var $arch_ul = $('<ul class="mm-root mm-archive"/>'); - for(i=0; i< archive.length; i++) { - litem = get_message_li(archive[i], 0, true); - $arch_ul.append(litem); - } - $output.append($arch_ul); - } - var messages = data.messages; - _username = data.username; - if (messages instanceof Array) { - var $ul = $('<ul class="mm-root mm-current"/>'); - if (messages.length === 0) { - $output.append('<p class="mm-empty">No messages available.</p>'); - } else { - for(i=0; i< messages.length; i++) { - litem = get_message_li(messages[i], 0, false); - $ul.append(litem); - } - } - $output.append($ul); - } else { - $output.html('<p>No messages (server did not send a list).</p>'); - } - if (anim_duration > 0) { - $output.slideDown(anim_duration); - } - }; - - // accept an element (e.g., message_list) and add the click event to the *radio button* within it - // A bit specific to expect li's perhaps. - // options are passed through to the lock - var setup_click_listener = function(options) { - $message_list_element.on('click', 'input[type=radio]', function(event) { - var $li = $(this).closest('li'); - var id = $li.attr('id').replace(_msg_prefix, ''); - if ($li.hasClass('msg-is-locked')) { - say_status(get_msg(msg_trying_for_lock), true); - } else if ($li.hasClass('msg-is-owned')) { - say_status(get_msg(msg_checking_lock), true); - } else { - say_status(get_msg(msg_claiming_lock), true); - } - request_lock(id, options); - }); - // clicking the reply button loads the id into the (modal/fancybox) reply form - $message_list_element.on('click', '.mm-rep', function(event) { - $('#reply_to_msg_id').val($(this).closest('li').attr('id').replace(_msg_prefix, '')); - }); - // clicking the hide button loads the id into the (modal/fancybox) hide form - $message_list_element.on('click', '.mm-hide', function(event) { - $('#hide_msg_id').val($(this).closest('li').attr('id').replace(_msg_prefix, '')); - // $('#hide-form-message-text').val(TODO); - }); - // clicking the detach button loads the id into the (modal/fancybox) detach form - $message_list_element.on('click', '.mm-detach', function(event) { - $('#detach_msg_id').val($(this).closest('li').attr('id').replace(_msg_prefix, '')); - }); - }; - - // gets messages or else requests login - // options: suggest_username, if provided, is preloaded into the login form if provided - // anim_duration: duration of fade/reveal (0, by defaut, does no animation) - // fms_id: if provided, display an archive of messages for this username - var get_available_messages = function(options) { - var base_auth = get_current_auth_credentials(); - var suggest_username = ""; - var anim_duration = 0; - var callback = null; - var fms_id = null; - if (options) { - if (typeof(options.callback) === 'function') { - callback = options.callback; - } - if (typeof options.suggest_username === 'string') { - suggest_username = options.suggest_username; - } - if (typeof options.anim_duration === 'string' || typeof options.anim_duration === 'number') { - anim_duration = parseInt(options.anim_duration, 10); - if (isNaN(anim_duration)) { - anim_duration = 0; - } - } - if (typeof options.fms_id === 'string' || typeof options.fms_id === 'number') { - fms_id = parseInt(options.fms_id, 10); - if (isNaN(fms_id)) { - fms_id = 0; - } - } - } - if (base_auth === "") { - show_login_form(suggest_username); - return; - } - $login_element.stop(true,true).hide(); - if (_url_root.length === 0) { - say_status(msg_no_config_err); - } else { - var ajax_url = _url_root +"messages/available.json"; - if (fms_id) { - ajax_url += "?fms_id=" + fms_id; - } - say_status("Fetching messages...", true); - $.ajax({ - dataType: "json", - type: "get", - url: ajax_url, - beforeSend: function (xhr){ - xhr.setRequestHeader('Authorization', get_current_auth_credentials()); - xhr.withCredentials = true; - }, - success: function(data, textStatus) { - show_available_messages(data, anim_duration); - say_status("Fetching messages... done, OK", false); // loaded OK - if (typeof(callback) === "function") { - callback.call($(this), data); // execute callback - } - }, - error: function(jqXHR, textStatus, errorThrown) { - var st = jqXHR.status; - var msg_is_html = false; - if (st == 401 || st == 403) { - var msg = (st == 401 ? "Invalid username or password for" : "Access denied: please log in to") + " " + _mm_name; - say_status(msg); - show_login_form(suggest_username); - } else { - var err_msg = "Unable to load messages: "; - if (st === 0 && textStatus === 'error') { // x-domain hard to detect, sometimes intermittent? - if (_url_root.indexOf('https')===0 && ! location.protocol != 'https:') { - var surl = location.href.replace(/^http:/, 'https:'); - err_msg += 'this is an insecure URL.<br/><a href="' + surl + '">Try from HTTPS instead?</a>'; - msg_is_html = true; - } else { - err_msg += "maybe try refreshing page?"; - } - } else { - err_msg += textStatus + " (" + st + ")"; - } - say_status(err_msg, false, msg_is_html); - } - } - }); - } - }; - - var request_lock = function(msg_id, options) { - var $li = $('#' + _msg_prefix + msg_id); - var lock_unique = _want_unique_locks; - var callback = null; - if (options) { - if (typeof(options.callback) === 'function') { - callback = options.callback; - } - if (typeof(options.lock_unique) !== undefined && options.lock_unique !== undefined) { - lock_unique = options.lock_unique; - } - } - $li.addClass('msg-is-busy'); - $.ajax({ - dataType:"json", - type:"post", - url: _url_root +"messages/" + - (lock_unique? "lock_unique" : "lock") + - "/" + msg_id + ".json", - beforeSend: function (xhr){ - xhr.setRequestHeader('Authorization', get_current_auth_credentials()); - xhr.withCredentials = true; - }, - success:function(data, textStatus) { - if (data.success) { - if (lock_unique) { - $('.msg-is-owned', $message_list_element).removeClass('msg-is-owned'); - } - $li.removeClass('msg-is-busy msg-is-locked').addClass('msg-is-owned'); - say_status(get_msg(msg_lock_granted_ok)); // to data['data']['Lockkeeper']['username']? - } else { - $li.removeClass('msg-is-busy').addClass('msg-is-locked'); - say_status(get_msg(msg_lock_denied) || ("lock failed: " + data.error)); - } - if (typeof(callback) === "function") { // note callbacks must check data['success'] - callback.call($(this), data); // returned data['data'] is 'Message', 'Source', 'Lockkeeper' for success - } - }, - error: function(jqXHR, textStatus, errorThrown) { - $li.removeClass('msg-is-busy'); - say_status("error: " + textStatus + ": " + errorThrown); - } - }); - }; - - var assign_fms_id = function(msg_id, fms_id, options) { - var check_li_exists = false; - var is_async = true; - var callback = null; - if (options) { - if (typeof(options.callback) === 'function') { - callback = options.callback; - } - if (typeof(options.check_li_exists) !== undefined && options.check_li_exists !== undefined) { - check_li_exists = true; // MM dummy - } - if (typeof(options.is_async) !== undefined && options.is_async !== undefined) { - is_async = options.is_async; - } - } - var $li = $('#' + _msg_prefix + msg_id); - if (check_li_exists) { - if ($li.size() === 0) { - say_status("Couldn't find message with ID " + msg_id); - return; - } - } - if (isNaN(parseInt(fms_id,10))) { - say_status("missing FMS id"); - return; - } - $li.addClass('msg-is-busy'); - $.ajax({ - async:is_async, - dataType:"json", - type:"post", - data: {fms_id: fms_id}, - url: _url_root +"messages/assign_fms_id/" + msg_id + ".json", - beforeSend: function (xhr){ - xhr.setRequestHeader('Authorization', get_current_auth_credentials()); - xhr.withCredentials = true; - }, - success:function(data, textStatus) { - if (data.success) { - $li.removeClass('msg-is-busy msg-is-locked').addClass('msg-is-owned').fadeOut('slow'); // no longer available - say_status("OK: report ID was assigned to message."); - if (typeof(callback) === "function") { - callback.call($(this), data.data); // returned data['data'] is 'Message', 'Source', 'Lockkeeper' for success - } - } else { - $li.removeClass('msg-is-busy').addClass('msg-is-locked'); - say_status("failed: " + data.error); - } - }, - error: function(jqXHR, textStatus, errorThrown) { - say_status("error: " + textStatus + ": " + errorThrown); - $li.removeClass('msg-is-busy'); - } - }); - }; - - var reply = function(msg_id, reply_text, options) { - if (_use_fancybox){ - $.fancybox.close(); - } - var callback = null; - var check_li_exists = false; - if (options) { - if (typeof(options.callback) === 'function') { - callback = options.callback; - } - if (typeof(options.check_li_exists) !== undefined && options.check_li_exists !== undefined) { - check_li_exists = true; // MM dummy - } - } - var $li = $('#' + _msg_prefix + msg_id); - if (check_li_exists) { - if ($li.size() === 0) { - say_status("Couldn't find message with ID " + msg_id); - return; - } - } - reply_text = $.trim(reply_text); - if (reply_text === '') { - say_status("No reply sent: message was empty!"); - return; - } - $li.addClass('msg-is-busy'); - $.ajax({ - dataType:"json", - type:"post", - data: {reply_text: reply_text}, - url: _url_root +"messages/reply/" + msg_id + ".json", - beforeSend: function (xhr){ - xhr.setRequestHeader('Authorization', get_current_auth_credentials()); - xhr.withCredentials = true; - }, - success:function(data, textStatus) { - if (data.success) { - $li.removeClass('msg-is-busy msg-is-locked').addClass('msg-is-owned'); // no longer available - say_status("Reply sent OK"); - if (typeof(callback) === "function") { - callback.call($(this), data.data); // returned data['data'] is null but may change in future - } - } else { - $li.removeClass('msg-is-busy').addClass('msg-is-locked'); - say_status("Reply failed: " + data.error); - } - }, - error: function(jqXHR, textStatus, errorThrown) { - say_status("Reply error: " + textStatus + ": " + errorThrown); - $li.removeClass('msg-is-busy'); - } - }); - }; - - var hide = function(msg_id, reason_text, options) { - if (_use_fancybox){ - $.fancybox.close(); - } - var callback = null; - var check_li_exists = false; - if (options) { - if (typeof(options.callback) === 'function') { - callback = options.callback; - } - if (typeof(options.check_li_exists) !== undefined && options.check_li_exists !== undefined) { - check_li_exists = true; // MM dummy - } - } - var $li = $('#' + _msg_prefix + msg_id); - if (check_li_exists) { - if ($li.size() === 0) { - say_status("Couldn't find message with ID " + msg_id); - return; - } - } - reason_text = $.trim(reason_text); - $li.addClass('msg-is-busy'); - $.ajax({ - dataType:"json", - type:"post", - data: {reason_text: reason_text}, - url: _url_root +"messages/hide/" + msg_id + ".json", - beforeSend: function (xhr){ - xhr.setRequestHeader('Authorization', get_current_auth_credentials()); - xhr.withCredentials = true; - }, - success:function(data, textStatus) { - if (data.success) { - $li.removeClass('msg-is-busy msg-is-locked').addClass('msg-is-owned').fadeOut('slow'); // no longer available - say_status("Message hidden"); - if (typeof(callback) === "function") { - callback.call($(this), data.data); - } - } else { - $li.removeClass('msg-is-busy').addClass('msg-is-locked'); - say_status("Hide failed: " + data.error); - } - }, - error: function(jqXHR, textStatus, errorThrown) { - say_status("Hide error: " + textStatus + ": " + errorThrown); - $li.removeClass('msg-is-busy'); - } - }); - }; - - var show_info = function(msg_id) { - var $info = $("#msg-info-box-" + msg_id); - if ($info.size()==1) { - if ($info.is(':hidden')) { - $info.slideDown(); - } else { - $info.slideUp(); - } - } - }; - - var mark_as_not_a_reply = function(msg_id, options) { - if (_use_fancybox){ - $.fancybox.close(); - } - var callback = null; - var check_li_exists = false; - if (options) { - if (typeof(options.callback) === 'function') { - callback = options.callback; - } - if (typeof(options.check_li_exists) !== undefined && options.check_li_exists !== undefined) { - check_li_exists = true; // MM dummy - } - } - var $li = $('#' + _msg_prefix + msg_id); - if (check_li_exists) { - if ($li.size() === 0) { - say_status("Couldn't find message with ID " + msg_id); - return; - } - } - $li.addClass('msg-is-busy'); - $.ajax({ - dataType:"json", - type:"post", - data: {}, - url: _url_root +"messages/mark_as_not_a_reply/" + msg_id + ".json", - beforeSend: function (xhr){ - xhr.setRequestHeader('Authorization', get_current_auth_credentials()); - xhr.withCredentials = true; - }, - success:function(data, textStatus) { - if (data.success) { - $li.removeClass('msg-is-busy msg-is-locked').addClass('msg-is-owned').fadeOut('slow'); // no longer available - say_status("Message no longer marked as a reply"); - if (typeof(callback) === "function") { - callback.call($(this), data.data); - } - } else { - $li.removeClass('msg-is-busy').addClass('msg-is-locked'); - say_status("Hide failed: " + data.error); - } - }, - error: function(jqXHR, textStatus, errorThrown) { - say_status("Detach error: " + textStatus + ": " + errorThrown); - $li.removeClass('msg-is-busy'); - } - }); - }; - - // if boilerplate is not already in local storage, make ajax call and load them - // otherwise, populate the boilerplate select lists: these are currently the - // reasons for hiding a message, and pre-loaded replies.message-manager.dev.mysociety.org - // NB no auth required on this call - var populate_boilerplate_strings = function(boilerplate_type, options) { - if (Modernizr.sessionstorage && sessionStorage.getItem('boilerplate_' + boilerplate_type)) { - populate_boilerplate(boilerplate_type, sessionStorage.getItem('boilerplate_' + boilerplate_type)); - return; - } - var callback = null; - if (options) { - if (typeof(options.callback) === 'function') { - callback = options.callback; - } - } - $.ajax({ - dataType:"json", - type:"get", - url: _url_root +"boilerplate_strings/index/" + boilerplate_type + ".json", - success:function(data, textStatus) { - if (data.success) { - var raw_data = data.data; - var select_html = get_select_tag_html(data.data, boilerplate_type); - if (Modernizr.sessionstorage) { - sessionStorage.setItem('boilerplate_' + boilerplate_type, select_html); - } - populate_boilerplate(boilerplate_type, select_html); - if (typeof(callback) === "function") { - callback.call($(this), data.data); - } - } else { - // console.log("failed to load boilerplate"); - } - }, - error: function(jqXHR, textStatus, errorThrown) { - // console.log("boilerplate error: " + textStatus + ": " + errorThrown); - } - }); - }; - - // TODO flatten all HTML in boilerplate text - var get_select_tag_html = function(boilerplate_data, boilerplate_type) { - var html = "<option value=''>--none--</option>\n"; - var qty_langs = 0; - var qty_strings = 0; - if (boilerplate_data.langs) { - for (var i=0; i< boilerplate_data.langs.length; i++) { - var lang = boilerplate_data.langs[i]; - var options = ""; - for (var j in boilerplate_data[lang]) { - if (boilerplate_data[lang].hasOwnProperty(j)) { - options += "<option>" + boilerplate_data[lang][j] + "</option>\n"; - qty_strings++; - } - } - if (boilerplate_data.langs.length > 1) { // really need pretty name for language - options = '<optgroup label="' + lang + '">\n' + options + '</optgroup>\n'; - } - html += options; - } - } - if (qty_strings === 0) { - html = ''; - } - return html; - }; - - // actually load the select tag - var populate_boilerplate = function(boilerplate_type, html) { - var $target = null; - switch(boilerplate_type) { - case 'hide-reason': $target = $hide_reasons; break; - case 'reply': $target = $boilerplate_replies; break; - } - if ($target) { - if (html) { - $target.show().find('select').html(html); - } else { - $target.hide(); - } - } - }; - - // revealed public methods: - return { - config: config, - setup_click_listener: setup_click_listener, - get_available_messages: get_available_messages, - request_lock: request_lock, - assign_fms_id: assign_fms_id, - reply: reply, - hide: hide, - show_info: show_info, - sign_out: sign_out, - populate_boilerplate_strings: populate_boilerplate_strings, - say_status: say_status, - mark_as_not_a_reply: mark_as_not_a_reply - }; -})(); diff --git a/web/cobrands/fixmybarangay/messages.js b/web/cobrands/fixmybarangay/messages.js deleted file mode 100644 index aebf35156..000000000 --- a/web/cobrands/fixmybarangay/messages.js +++ /dev/null @@ -1,26 +0,0 @@ -$(function(){ - - var mm = $('#message_manager'); - - $.getJSON('/cobrands/fixmybarangay/test-texts.json', function(data) { - var items = []; - $.each(data, function(k, v) { - var item = $('<input type="radio"/>').attr({ - 'id': 'mm_text_' + v.id, - 'name': 'mm_text', - 'value': v.text - }).wrap('<p/>').parent().html(); - var label = $('<label/>', { - 'class': 'inline', - 'for': 'mm_text_' + v.id - }).text(v.text).wrap('<p/>').parent().html(); - item = '<li><p>' + item + ' ' + label + '</p></li>'; - items.push(item); - }); - mm.html(items.join('')); - mm.find('input').click(function(){ - $('#form_detail').val( $('input[name=mm_text]:checked').val() ); - }); - }); - -}); diff --git a/web/cobrands/fixmybarangay/position_map.js b/web/cobrands/fixmybarangay/position_map.js deleted file mode 100644 index 753b5f854..000000000 --- a/web/cobrands/fixmybarangay/position_map.js +++ /dev/null @@ -1,22 +0,0 @@ -function position_map_box() { - var $html = $('html'); - if ($html.hasClass('ie6')) { - $('#map_box').prependTo('.wrapper').css({ - zIndex: 0, position: 'absolute', - top: 0, left: 0, right: 0, bottom: 0, - width: '100%', height: $(window).height(), - margin: 0 - }); - } else { - $('#map_box').prependTo('.wrapper').css({ - zIndex: 0, position: 'fixed', - top: 0, left: 0, right: 0, bottom: 0, - width: '100%', height: '100%', - margin: 0 - }); - } -} - -function map_fix() {} -var slide_wards_down = 0; - diff --git a/web/cobrands/fixmybarangay/test-texts.json b/web/cobrands/fixmybarangay/test-texts.json deleted file mode 100644 index 7acde1e32..000000000 --- a/web/cobrands/fixmybarangay/test-texts.json +++ /dev/null @@ -1,17 +0,0 @@ -[ - { - "id" : 1, - "number" : "032-9999999", - "text" : "Pothole on corner of G. De Vera and T. Padilla" - }, - { - "id" : 2, - "number" : "032-1234567", - "text" : "Broken street light on Rahmann Street" - }, - { - "id" : 3, - "number" : "+63 917 0000000", - "text" : "F. Manalo giant pothole" - } -] diff --git a/web/cobrands/fixmystreet.com/_colours.scss b/web/cobrands/fixmystreet.com/_colours.scss index a6d9c2c07..17447c86e 100644 --- a/web/cobrands/fixmystreet.com/_colours.scss +++ b/web/cobrands/fixmystreet.com/_colours.scss @@ -21,4 +21,6 @@ $col_fixed_label: #00BD08; $col_fixed_label_dark: #4B8304; $itemlist_item_background: #f6f6f6; -$itemlist_item_background_hover: mix(#fff, $primary, 50%);
\ No newline at end of file +$itemlist_item_background_hover: mix(#fff, $primary, 50%); + +$layout_front_stats_color: #222; diff --git a/web/cobrands/fixmystreet.com/images/fms-for-councils/angus-logo.png b/web/cobrands/fixmystreet.com/images/fms-for-councils/angus-logo.png Binary files differnew file mode 100644 index 000000000..1baeacba6 --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/fms-for-councils/angus-logo.png diff --git a/web/cobrands/fixmystreet.com/js.js b/web/cobrands/fixmystreet.com/js.js index 3abba8e33..9dbd11f2c 100644 --- a/web/cobrands/fixmystreet.com/js.js +++ b/web/cobrands/fixmystreet.com/js.js @@ -1,3 +1,29 @@ 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 ); + +$(function(){ + + /* Front page banner for other countries */ + + $('.top_banner__close').live('click', function() { + $('.top_banner--country').hide(); + $.cookie('has_seen_country_message', 1, {expires: 365, path: '/'}); + }); + + if ( $('body.frontpage').length ) { + if (!$.cookie('has_seen_country_message')) { + $.ajax({ + url: 'https://gaze.mysociety.org/gaze-rest?f=get_country_from_ip', + success: function(data) { + if ( data && data != 'GB\n' ) { + var banner = '<div class="top_banner top_banner--country"><a href="#" class="top_banner__close">Close</a> <p>This site is for reporting <strong>problems in the UK</strong>. There are FixMyStreet sites <a href="http://www.fixmystreet.org/sites/">all over the world</a>, or you could set up your own using the <a href="http://www.fixmystreet.org/">FixMyStreet Platform</a>.</p></div>'; + $('body').prepend(banner); + $('.top_banner--country').slideDown('slow'); + } + } + }); + } + } + +}); diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss index 81c3b3d54..14eccfd1e 100644 --- a/web/cobrands/fixmystreet.com/layout.scss +++ b/web/cobrands/fixmystreet.com/layout.scss @@ -59,7 +59,8 @@ noindex:-o-prefocus, #site-header { font-family: sans-serif; } -h3, h4 { +h3, h4, +.item-list__heading { font-weight: bold; } diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index f01c5142d..5935d2bae 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -206,7 +206,7 @@ $(function(){ addRemoveLinks: true, thumbnailHeight: 150, thumbnailWidth: 150, - acceptedFiles: 'image/jpeg,image/pjpeg', + acceptedFiles: 'image/jpeg,image/pjpeg,image/gif,image/tiff,image/png', dictDefaultMessage: translation_strings.upload_default_message, dictCancelUploadConfirmation: translation_strings.upload_cancel_confirmation, dictInvalidFileType: translation_strings.upload_invalid_file_type, @@ -258,7 +258,7 @@ $(function(){ } var mockFile = { name: f, server_id: f }; photodrop.emit("addedfile", mockFile); - photodrop.createThumbnailFromUrl(mockFile, '/photo/' + f + '.temp.jpeg'); + photodrop.createThumbnailFromUrl(mockFile, '/photo/temp.' + f); photodrop.emit("complete", mockFile); photodrop.options.maxFiles -= 1; }); @@ -532,25 +532,6 @@ $.fn.drawer = function(id, ajax) { }).fadeOut(500); }); - $('.top_banner__close').live('click', function() { - $('.top_banner--country').hide(); - $.cookie('has_seen_country_message', 1, {expires: 365, path: '/'}); - }); - - if ( cobrand == 'fixmystreet' && $('body.frontpage').length ) { - if (!$.cookie('has_seen_country_message')) { - $.ajax({ - url: '/country_message', - success: function(data) { - if ( data ) { - $('body').prepend(data); - $('.top_banner--country').slideDown('slow'); - } - } - }); - } - } - /* * Fancybox fullscreen images */ diff --git a/web/cobrands/fixmystreet/images/google_play_logo.png b/web/cobrands/fixmystreet/images/google_play_logo.png Binary files differindex 9891cbbd3..893ec5727 100644 --- a/web/cobrands/fixmystreet/images/google_play_logo.png +++ b/web/cobrands/fixmystreet/images/google_play_logo.png diff --git a/web/cobrands/fixmystreet/images/itunes_store_logo.png b/web/cobrands/fixmystreet/images/itunes_store_logo.png Binary files differindex b37f4c230..395769502 100644 --- a/web/cobrands/fixmystreet/images/itunes_store_logo.png +++ b/web/cobrands/fixmystreet/images/itunes_store_logo.png diff --git a/web/cobrands/greenwich/_colours.scss b/web/cobrands/greenwich/_colours.scss index ff8ff2b40..2f3aa913c 100644 --- a/web/cobrands/greenwich/_colours.scss +++ b/web/cobrands/greenwich/_colours.scss @@ -17,6 +17,8 @@ $map_nav_bg: #fff; $nav_fg: #fff; $nav_fg_hover: transparent; +$col_big_numbers: $primary; + $col_click_map: $greenwich_red; $col_click_map_dark: darken($col_click_map, 10%); diff --git a/web/cobrands/greenwich/base.scss b/web/cobrands/greenwich/base.scss index af9df60c7..69b9db052 100644 --- a/web/cobrands/greenwich/base.scss +++ b/web/cobrands/greenwich/base.scss @@ -37,10 +37,6 @@ label[for=pc] { color: $greenwich_dark_red; } -ol.big-numbers > li:before { - color: $primary; -} - #front-howto #front_stats { color: $nav_fg; } diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index a833bb7cf..eaa0113a5 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -8,6 +8,7 @@ $menu-image: 'menu-white' !default; $itemlist_item_background: #f6f6f6 !default; $itemlist_item_background_hover: #e6e6e6 !default; +$col_big_numbers: #ccc !default; @import "_mixins"; @import "_report_list"; @@ -111,7 +112,7 @@ ol.big-numbers { position: absolute; #{$left}: 0; top:-0.2em; - color:#ccc; + color:$col_big_numbers; line-height:1; font: { family: $meta-font; @@ -353,7 +354,7 @@ label{ color: #666; padding-#{$left}: 20px; background: transparent url(/cobrands/fixmystreet/images/wrong-location.png) $left 50% no-repeat; - border-#{$left}: solid 4px #fff; + border-#{$left}: solid 4px transparent; margin-top: -0.5em; } @@ -759,6 +760,21 @@ input.final-submit { } } +.btn--twitter { + @include button-reset(#55acee, darken(#55acee, 10%), #55acee, #fff, darken(#55acee, 5%), darken(#55acee, 10%), #55acee, #fff); + + &:visited { + color: #fff; + } + + img { + margin-right: 0.5em; + vertical-align: -0.2em; + height: 1.3em; + width: auto; + } +} + // Under the button to override its text transform and width .btn--social { display: block; @@ -902,7 +918,7 @@ input.final-submit { margin-bottom: 0.5em; } -.item-list__item--link { +%item-list__item--link { padding: 0; a { color: #222222; @@ -916,11 +932,11 @@ input.final-submit { } .item-list--wards__item { - @extend .item-list__item--link; + @extend %item-list__item--link; } .item-list--reports__item { - @extend .item-list__item--link; + @extend %item-list__item--link; a { @include clearfix; padding: flip(0 0 0 1em, 0 1em 0 0); @@ -931,16 +947,19 @@ input.final-submit { height: auto; margin-#{$left}: 1em; } - h4 { - padding-top: 0.25em; - margin: 0; - } small { color: #666; display: block; padding: 0.25em 0; } } +.item-list__heading { + font-size: 1em; + font-weight: normal; + line-height: 1.5; + padding-top: 0.25em; + margin: 0; +} .item-list__item--empty p { margin: 0; @@ -1372,7 +1391,7 @@ label .muted { padding-#{$left}: 16px; list-style: none; background: transparent url(/cobrands/fixmystreet/images/tick-10px-8px.png) $left 5px no-repeat; - border-#{$left}: solid 4px #fff; + border-#{$left}: solid 4px transparent; } .do { @@ -1387,10 +1406,13 @@ label .muted { background-image: url(/cobrands/fixmystreet/images/cross-7px-7px.png); background-position: $left 6px; padding-#{$left}: 14px; - border-#{$left}: solid 6px #fff; + border-#{$left}: solid 6px transparent; } } } +.description_tips__heading--inline { + display: inline-block; +} #problem_form > label:first-child { margin-top: 0; diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 96b3d2aec..2f601775b 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -2,6 +2,7 @@ @import "_mixins"; $image-sprite: '/cobrands/fixmystreet/images/sprite.png' !default; +$layout_front_stats_color: $primary !default; .internal-link-fixed-header { display: block; @@ -1063,8 +1064,8 @@ body.frontpage { padding-top:1em; div { big { - color:$primary; - font-size:3.2308em; + color: $layout_front_stats_color; + font-size: 3.2308em; } } } diff --git a/web/cobrands/sass/_report_list_pins.scss b/web/cobrands/sass/_report_list_pins.scss index 3432e2bbf..143588b0e 100644 --- a/web/cobrands/sass/_report_list_pins.scss +++ b/web/cobrands/sass/_report_list_pins.scss @@ -7,7 +7,7 @@ a { display: block; padding: 1em; - padding-#{$left}: 4em; + padding-#{$left}: 3em; border-#{$left}: solid 1em transparent; background: transparent url(/i/pin-yellow-small.png) no-repeat $left center; } @@ -30,7 +30,7 @@ display: block; height: 1px; position: absolute; - #{$left}: 4em; + #{$left}: 3em; #{$right}: 0; bottom: 0; background-color: #e5e5e5; @@ -60,7 +60,7 @@ } } -/* The front page is using the parent _item.html template */ +/* We have no padding on the front page */ body.frontpage { .item-list__item--with-pin a { padding: 0; diff --git a/web/cobrands/zerotb/_colours.scss b/web/cobrands/zerotb/_colours.scss deleted file mode 100644 index a5eb83b71..000000000 --- a/web/cobrands/zerotb/_colours.scss +++ /dev/null @@ -1,24 +0,0 @@ -/* COLOURS */ - -$white: #ffffff; -$black: #000000; - -$primary: $black; -$primary_b: $black; -$primary_text: $white; - -$base_bg: $white; -$base_fg: #000; - -$map_nav_bg: $black; -$nav_fg: #ffffff; -$nav_fg_hover: #000; - -$col_click_map: $black; -$col_click_map_dark: darken($black, 10%); - -$col_fixed_label: #00BD08; -$col_fixed_label_dark: #4B8304; - -$button-color: #FF5308; -$alt-background: #f5f5f5; diff --git a/web/cobrands/zerotb/base.scss b/web/cobrands/zerotb/base.scss deleted file mode 100644 index db612094d..000000000 --- a/web/cobrands/zerotb/base.scss +++ /dev/null @@ -1,120 +0,0 @@ -@import "../sass/h5bp"; -@import "./_colours"; -@import "../sass/mixins"; -@import "compass"; - -@import url(http://fonts.googleapis.com/css?family=Lato:300,700); - -$body-font: 'Lato', sans-serif !default; -$meta-font: 'Lato', sans-serif !default; -$heading-font: 'Lato', sans-serif !default; - -@import "../sass/base"; - -body { - font-weight: 300; -} - -input { - background-color: $alt-background; -} - -#front-main { - h2 { - font-weight: 300; - } - - #postcodeForm { - div { - border: 0px; - background: $primary_b; - select#clinic, - input#pc { - background-color: $alt-background; - } - select#clinic { - border: 0; - border-radius: 0px; - display: table-cell; - line-height: 1.5em; - padding: 0.25em 2%; - } - .select2-container, - select#clinic, - input#pc { - border: 0px; - border-radius: 0px; - box-shadow: none; - width: 80%; - } - input#sub { - background-color: $button-color; - border: 1px solid $alt-background; - border-radius: 5px; - color: white; - margin-left: 5px; - } - input#show_report { - width: 14%; - margin-left: 5px; - } - .select2-container { - display: inline-block; - text-align: left; - a { - line-height: 1.5em; - padding: 0.25em 2%; - } - } - .select2-display-none { - display: none; - } - } - } -} - -#site-logo { - background: none; - text-indent: 0px; - text-transform: uppercase; - width: auto; - margin-right: 80px; - @media( min-width: 350px ) { - margin-top: 0.5em; - } - a { - color: white; - &:hover { - text-decoration: none; - } - } - p { - font-weight: 300; - margin-bottom: 0em; - } - .orange { - color: $button-color; - font-weight: bold; - } - #brought-to-you { - display: none; - } -} - -button.green-btn, -input.green-btn, -.green-btn { - background: none; - background-color: $button-color; - border: 1px solid $alt-background; - border-radius: 5px; - color: white; -} - -button.green-btn:hover, -input.green-btn:hover, -.green-btn:hover { - background: none; - background-color: darken( $button-color, 10% ); - border: 1px solid $alt-background; -} diff --git a/web/cobrands/zerotb/config.rb b/web/cobrands/zerotb/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/zerotb/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# 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/zerotb/images/pin-clinic-big.png b/web/cobrands/zerotb/images/pin-clinic-big.png Binary files differdeleted file mode 100644 index c1e359828..000000000 --- a/web/cobrands/zerotb/images/pin-clinic-big.png +++ /dev/null diff --git a/web/cobrands/zerotb/images/pin-clinic.png b/web/cobrands/zerotb/images/pin-clinic.png Binary files differdeleted file mode 100644 index 5cc0828fd..000000000 --- a/web/cobrands/zerotb/images/pin-clinic.png +++ /dev/null diff --git a/web/cobrands/zerotb/images/pin-shadow-big.png b/web/cobrands/zerotb/images/pin-shadow-big.png Binary files differdeleted file mode 100644 index 113184b94..000000000 --- a/web/cobrands/zerotb/images/pin-shadow-big.png +++ /dev/null diff --git a/web/cobrands/zerotb/images/pin-shadow.png b/web/cobrands/zerotb/images/pin-shadow.png Binary files differdeleted file mode 100644 index 8b470592a..000000000 --- a/web/cobrands/zerotb/images/pin-shadow.png +++ /dev/null diff --git a/web/cobrands/zerotb/layout.scss b/web/cobrands/zerotb/layout.scss deleted file mode 100644 index c8afa3abc..000000000 --- a/web/cobrands/zerotb/layout.scss +++ /dev/null @@ -1,105 +0,0 @@ -@import "_colours"; -@import "../sass/layout"; - -body { - &.frontpage { - .nav-wrapper-2 { - background-color: $primary; - color: $primary_text; - height: auto; - } - - #site-header { - background-color: $base_bg; - } - - #site-logo { - background: none; - color: black; - width: auto; - a { - color: black; - } - p { - font-size: 2em; - font-weight: 300; - } - #brought-to-you { - display: block; - font-size: 0.75em; - } - } - } - &.mappage { - .nav-menu--main { - a, a.report-a-problem-btn, span { - padding: 0.25em; - margin: 0.5em; - } - } - .nav-wrapper-2 { - min-height: 4em; - } - } -} - -.nav-wrapper { - .nav-wrapper-2 { - border: none; - min-height: 0; - } -} - -.nav-menu--mysoc a { - color: $primary_text; -} -.nav-menu--main span { - color: $primary_text; -} - -#site-header { - background: $primary; - height: auto; -} - -.container { - padding: 0em 1em; -} - -#front-main { - #front-main-container { - max-width: 40em; - h2 { - text-align: left; - } - } - #postcodeForm { - div { - width: 30em; - .select2-container, - select#clinic, - input#pc { - max-width: none; - width: 27em; - } - input#show_report { - display: block; - float: right; - width: 3em; - } - } - } - - .select2-container { - a { - color: #444; - text-align: left; - text-decoration: none; - } - } -} - -.content { - background-color: $alt-background; - box-shadow: none; -} diff --git a/web/css/_main-import.scss b/web/css/_main-import.scss deleted file mode 100644 index 305a9e43e..000000000 --- a/web/css/_main-import.scss +++ /dev/null @@ -1,279 +0,0 @@ -// Generics - -/* Thanks to normalize.css - * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units - * http://clagnut.com/blog/348/#c790 - * 3. Prevents iOS text size adjust after orientation change, without disabling user zoom - * www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/ - */ -html { - font-size: 100%; /* 1 */ - -webkit-text-size-adjust: 100%; /* 3 */ - -ms-text-size-adjust: 100%; /* 3 */ -} - -body { - font-family: "Gill Sans", "Gill Sans MT", Helvetica, Arial, sans-serif; - margin: 0; - padding: 0; - // color: #a9aeb0; -} - -h1 { - margin: 0; - font-size: 175%; -} -h2 { - font-size: 140%; -} - -select, input, textarea { - font-size: 99%; - max-width: 95%; -} - -#mysociety { - - a.unsuitable-report { - font-size: small; - } - - blockquote { - border-left: solid 4px $header_colour; - } - - .a { - color: #000000; - background-color: $header_back_lighter; - } - - #postcodeForm { - background-color: $header_back; - } - - #front_stats div { - background-color: $header_back; - } - -} - -// Site layout - -#header { - font-size: 200%; - font-weight: bold; - border-bottom: solid 2px $header_colour; - margin: 0; - padding: 0.15em 0.5em; - background-color: $header_back; - color: $header_colour; - - a:link, a:visited { - color: $header_colour; - background-color: $header_back; - text-decoration: none; - } - a:active, a:hover { - text-decoration: underline; - } -} - -#my { - color: $header_darker; - background-color: $header_back; -} - -#mysociety { - width: 100%; /* Must specify a width or IE goes crazy wrong! */ - position: relative; - margin: 0 auto; - max-width: 60em; - overflow: auto; -} - -/* Can't put the margin in #mysociety because of above IE craziness */ -#wrapper { - margin: 1em 2em; -} - -#meta { - list-style-type: none; - margin: 30px 0 0.5em 1em; /* (was 0.25em 0 0 1em) forced to drop below promo (fix before the freeze) image */ - padding: 0; - font-size: 0.875em; - li { - display: inline; - margin: 0; - padding: 0 0 0 0.25em; - border-left: solid 1px $header_colour; - } - li:first-child { - border-left: none; - } -} - -.v { - display: none; -} - -#navigation { - position: absolute; - top: 1em; - right: 1em; - padding: 0; - margin: 0; - list-style-type: none; - - li { - display: inline; - padding: 0; - margin: 0; - } - - a { - display: -moz-inline-box; - display: inline-block; - padding: 0.4em 1em; - } - a:link, a:visited { - color: $header_colour; - } - a:hover, a:active { - background-color: $header_colour; - color: $header_back; - -moz-border-radius-topleft: 0.5em; - -webkit-border-top-left-radius: 0.5em; - border-radius-top-left: 0.5em; - -moz-border-radius-topright: 0.5em; - -webkit-border-top-right-radius: 0.5em; - border-radius-top-right: 0.5em; - } -} - -#nav_new a { - background-image: url("/i/new.png"); - background-repeat: no-repeat; - background-position: 100% 0; -} - -#promo { - position: absolute; - top: 3.3em; - left: 10px; - a { - display: block; - padding:0; - border:2px solid white; - img { - margin:0px; - } - } - a:hover { - border:2px dotted #70CFE3; - } -} - -.promo-background { - margin-top:-4px; - background-image:url(/i/promo-icicles.gif); - background-repeat:repeat-x; - background-position:top left; - padding-top:3em; -} - -#logo { - border: none; - position: absolute; - top: 3.3em; - right: 10px; -} - -.ie6 #logo { - display: none; -} - -.ie6 #logoie { - width: 133px; - height: 26px; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/i/mysociety-dark.png',sizingMethod='scale'); - position: absolute; - top: 4em; - right: 10px; - cursor: pointer; -} - -#footer { - clear: both; - text-align: center; - border-top: solid 2px #ccc; - width: 50%; - margin: 1em auto 0; - padding: 0; - color: #333333; - - .l, .r { - margin-top: 0; - text-align: left; - width: 45%; - } - .l { - float: left; - } - .r { - float: right; - } -} - -@media all and (max-width: 50em) { - #logo { - display: none; - } - #promo { - position: static; - width: 116px; - top: none; - text-align: center; - margin: 0.25em auto; - display:block; - } - .promo-background img#logo { - border:2px solid #fff; - background-color: #fff; - } - #header { - font-size: 150%; - } - h1 { - font-size: 140%; - } - h2 { - font-size: 130%; - } - #navigation { - position: static; - border-top: solid 2px $header_colour; - border-bottom: solid 2px $header_colour; - margin: 1em 0; - padding: 0.15em 0.5em; - text-align: center; - background-color: $header_back; - color: $header_colour; - - a:hover, a:active { - background-color: $header_colour; - color: $header_back; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - border-radius: 0.5em; - } - } - #footer { - width: auto; - padding: 0 1em; - border-top: none; - } - #wrapper { - margin: 0em 1em; - } -} - diff --git a/web/css/cache-eha2.css b/web/css/cache-eha2.css deleted file mode 100644 index 2e98dc574..000000000 --- a/web/css/cache-eha2.css +++ /dev/null @@ -1,493 +0,0 @@ -body{
- text-align:center;
- background-color: #FFFFFF;
-}
-#header {
-text-align:left;
- margin: 0px;
- width: 760px;
-}
-#main {
-text-align:left;
- margin: 0px;
- width: 760px;
-}
-#footer {
-text-align:left;
- width: 760px;
- clear: both;
- background-color: #80AE7D;
- height: 110px;
- margin-top: 5px;
- margin-bottom: 5px;
-}
-#logo {
- margin: 0px;
- float: left;
- width: 400px;
-}
-#search {
- margin: 0px;
- float: right;
- width: 345px;
- height: 70px;
- background-color: #80AE7D;
- padding-top: 10px;
- padding-right: 15px;
- padding-bottom: 10px;
-}
-#bottombox ul {
- list-style-type: none;
- padding: 0px;
- margin: 0px;
-}
-#bottombox li {
- width: 170px;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- background-color: #B1BECF;
- margin-bottom: 1px;
-}
-
-#smallnav {
- width: 750px;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- text-align: right;
- font-weight: 400;
- color: #354664;
- padding-right: 10px;
- padding-bottom: 10px;
- padding-top: 10px;
-}
-#topbox ul {
- list-style-type: none;
- margin: 0px;
- padding: 0px;
-}
-#topbox li {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- width: 170px;
- background-color: #b1becf;
- margin-bottom: 1px;
-}
-#topbox a {
- text-decoration: none;
- color: #30517A;
- display: block;
-}
-#bottombox a:hover {
- background-color: #FFFFFF;
- width: 170px;
-}
-#topbox a:hover {
- background-color: #FFFFFF;
- width: 170px;
-}
-
-#bottombox a {
- color: #30517A;
- text-decoration: none;
- display: block;
-}
-
-
-
-#left {
- float: left;
- width: 120px;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- list-style: none;
-}
-#middle p {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- width: 420px;
- color: #30517A;
-}
-#pressnav {
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- border-top-style: solid;
- border-bottom-style: solid;
- border-top-color: #CCCCCC;
- border-right-color: #CCCCCC;
- border-bottom-color: #CCCCCC;
- border-left-color: #CCCCCC;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- padding: 3px;
-}
-#pressreleases {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- color: #30517A;
-}
-#pressreleases p {
- padding-bottom: 10px;
- background-color: #EBEEF3;
- padding-top: 10px;
- border: 1px dashed #CCCCCC;
-}
-#bulletin p {
- padding-bottom: 10px;
- background-color: #EBEEF3;
- padding-top: 10px;
- border: 1px dashed #CCCCCC;
-}
-
-#events p {
- border: 1px dashed #CCCCCC;
- padding-top: 10px;
- padding-bottom: 10px;
- background-color: #EBEEF3;
-}
-
-
-
-
-
-#right {
- width: 160px;
- float: right;
-}
-#left ul {
- list-style-type: none;
- padding: 0px;
- margin: 0px;
-}
-#left ol {
- list-style-type: none;
- display: inline;
- background-color: #B1BECF;
- width: 90px;
- margin-bottom: 1px;
-}
-#left ol a {
- background-color: #DCDCED;
- color: #30517A;
-}
-#left ol a:hover {
- background-color: #FFFFFF;
-}
-
-
-#left li {
- margin-bottom: 1px;
- display: block;
-}
-#smallnav a {
- text-decoration: none;
- color: #30517A;
-}
-#smallnav a:hover {
- background-color: #B1BECF;
-}
-
-#left a {
- display: block;
- width: 120px;
- font-weight: bold;
- padding: 10px;
- text-decoration: none;
- background-color: #9999CC;
- color: #FFFFFF;
-}
-#address2 a {
- color: #FFFFFF;
-}
-#address1 a {
- color: #FFFFFF;
-}
-
-
-#left a:hover {
- color: #30517A;
- background-color: #FFFFFF;
-}
-
-
-
-#middle {
- margin: 0 250px 0 155px:
- clear: right;
- width: 410px;
- float: left;
- left: 153px;
- margin: 0px;
- padding-right: 10px;
- padding-bottom: 10px;
- padding-left: 10px;
- top: 135px;
- background-color: #FFFFFF;
-}
-#address1 {
- float: left;
- width: 180px;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- margin-bottom: 20px;
- padding: 20px;
- color: #FFFFFF;
-}
-#address2 {
- float: left;
- width: 180px;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- margin-bottom: 20px;
- padding: 20px;
- color: #FFFFFF;
-}
-#toptitle {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-weight: bold;
- color: #FFFFFF;
- font-size: small;
- width: 160px;
- background-color: #30517A;
- padding: 5px;
-}
-#bottomtitle {
- width: 160px;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- font-weight: bold;
- background-color: #30517A;
- color: #FFFFFF;
- padding: 5px;
-}
-#middle h1 {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: large;
- width: 420px;
- background-color: #9999CC;
- color: #FFFFFF;
- padding: 3px;
- font-weight: 500;
-}
-#middle h2 {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- font-weight: bold;
- background-color: #B1BECF;
- display: block;
- color: #30517A;
-}
-#middle h3 {
- text-decoration: underline;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- font-weight: bold;
- color: #30517A;
-}
-
-#middle a:hover {
- background-color: #B1BECF;
-}
-#middle a {
- color: #30517A;
- text-decoration: underline;
-}
-#eventsnav {
- border-top-width: 1px;
- border-bottom-width: 1px;
- border-top-style: solid;
- border-bottom-style: solid;
- border-top-color: #CCCCCC;
- border-bottom-color: #CCCCCC;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- padding: 3px;
- text-align: center;
-}
-#lwoanav {
- padding-top: 5px;
- padding-bottom: 5px;
- border-top-width: 1px;
- border-bottom-width: 1px;
- border-top-style: solid;
- border-bottom-style: solid;
- border-top-color: #CCCCCC;
- border-bottom-color: #CCCCCC;
- text-align: center;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
-}
-#lwoa {
- border: 1px dotted #CCCCCC;
- width: 420px;
-}
-#nwoanav {
- padding-top: 5px;
- padding-bottom: 5px;
- border-top-width: 1px;
- border-bottom-width: 1px;
- border-top-style: solid;
- border-bottom-style: solid;
- border-top-color: #CCCCCC;
- border-bottom-color: #CCCCCC;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- text-align: center;
-}
-#nwoa {
- width: 420px;
- border: 1px dotted #CCCCCC;
-}
-#pubsubleft {
- float: left;
- width: 200px;
- border: 1px solid #CCCCCC;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- color: #30517a;
- font-size: x-small;
-}
-#pubsubright {
- float: right;
- width: 200px;
- border: 1px solid #CCCCCC;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517a;
-}
-#pubtypeleft {
- float: left;
- width: 200px;
- border: 1px solid #CCCCCC;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517a;
-}
-#pubtyperight {
- float: right;
- width: 200px;
- border: 1px solid #CCCCCC;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517a;
-}
-#periodnavleft {
- margin: 0px;
- float: left;
- width: 200px;
- border: 1px solid #CCCCCC;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517A;
-}
-#periodnavright {
- margin: 0px;
- float: right;
- width: 200px;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517A;
- border: 1px dashed #CCCCCC;
-}
-#policynav {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517a;
- margin: 0px;
- float: left;
- width: 400px;
- border: 1px solid #CCCCCC;
-}
-#casenav {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517a;
-}
-#case p {
- padding-bottom: 10px;
- background-color: #EBEEF3;
- padding-top: 10px;
- border: 1px dashed #CCCCCC;
-}
-#grants p {
- padding-bottom: 10px;
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- color: #30517a;
- background-color: #EBEEF3;
- padding-top: 10px;
- border: 1px dashed #CCCCCC;
-}
-#listing {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517a;
-}
-#suppliernav {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- margin: 0px;
- width: 425px;
- border: 1px solid #CCCCCC;
- text-align: center;
-}
-#publist {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- margin: 0px;
- width: 400px;
-}
-#publist p {
- padding-bottom: 10px;
- background-color: #EBEEF3;
- padding-top: 10px;
- border: 1px dashed #CCCCCC;
-}
-#contactnav {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- margin: 0px;
- width: 425px;
- border: 1px solid #CCCCCC;
- text-align: center;
-}
-#statsnav {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: small;
- color: #30517a;
- margin: 0px;
- float: left;
- width: 425px;
-}
-#buyingnav {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517a;
- margin: 0px;
- float: left;
- width: 400px;
- border: 1px solid #CCCCCC;
-}
-#ownernav {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517a;
- margin: 0px;
- float: left;
- width: 400px;
- border: 1px solid #CCCCCC;
-}
-#campnav {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517a;
- margin: 0px;
- float: left;
- width: 400px;
- border: 1px solid #CCCCCC;
-}
-#sitenav {
- font-family: Geneva, Arial, Helvetica, sans-serif;
- font-size: x-small;
- color: #30517a;
-}
diff --git a/web/css/core.scss b/web/css/core.scss deleted file mode 100644 index 897b2d095..000000000 --- a/web/css/core.scss +++ /dev/null @@ -1,751 +0,0 @@ -$map_width: 500px; - -// Generics - -#mysociety { - - blockquote { - border-left: solid 4px #666666; - padding-left: 0.5em; - h2, p { - margin: 0; - } - } - - dt { - font-weight: bold; - margin-top: 0.5em; - } - - .gone { - color: #666666; - background-color: #cccccc; - } - - p.dev-site-notice, p.error { - text-align: center; - color: #cc0000; - font-size: larger; - } - - ul { - padding: 0 0 0 1.5em; - margin: 0; - } - - ul.error { - color: #cc0000; - background-color: #ffeeee; - padding-right: 4px; - text-align: left; - font-size: larger; - } - - div.form-error { - color: #cc0000; - margin: 5px 1em 5px 1em; - padding: 2px 5px 2px 5px; - text-align: left; - } - - div.label-valid { - background-color: white; - } - - div.label-valid-hidden { - display: none; - visibility: hidden; - height: 0px; - width: 0px; - margin: 0px; - padding: 0px; - } - - div.form-field { - clear: both; - } - - // Front page - - p#expl { - text-align: center; - font-size: 150%; - margin: 0; - } - - p#expl small { - display: block; - } - - #postcodeForm { - display: table; /* Full width in IE6 and IE7 */ - text-align: center; - font-size: 150%; - margin: 1em auto; - padding: 1em; - -moz-border-radius: 1em; - -webkit-border-radius: 1em; - border-radius: 1em; - -moz-box-shadow: 2px 2px 4px #999; - -webkit-box-shadow: 2px 2px 4px #999; - box-shadow: 2px 2px 4px #999; - - label { - float: none; - padding-right: 0; - margin-top: 0; - } - - #sub { - font-size: 83%; - } - } - - #geolocate_link { - display: block; - border: none; - font-size: 70%; - margin: 2px 0 0 0; - text-align: right; - } - - #front_intro { - float: left; - width: 48%; - - p { - clear: both; - margin-top: 0; - } - } - - #front_stats { - margin: 0 auto; - display: table; /* IE6 is set to floats below */ - border-spacing: 2em 1em; - } - - #front_stats div { - text-align: center; - width: 5.5em; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - border-radius: 0.5em; - display: table-cell; - - big { - font-size: 150%; - display: block; - } - } - - #front_recent { - float: right; - width: 48%; - margin-bottom: 1em; - } - #front_recent img, #alert_recent img { - margin-right: 0.25em; - margin-bottom: 0.25em; - } - #front_recent > h2:first-child, #front_intro > h2:first-child { - margin-top: 0; - } - - #front_photos { - text-align: center; - } - - // Forms - - form { - margin: 0; - } - - label { - float: left; - text-align: right; - padding-right: 0.5em; - width: 6em; - } - - fieldset, .fieldset { - border: none; - margin: 0.5em; - div { - margin-top: 2px; - clear: left; - } - } - - legend { - display: none; - } - - .fieldset div.checkbox, #problem_submit { - padding-left: 5.5em; - } - .fieldset div.checkbox label, label.n { - float: none; - text-align: left; - padding-right: 0; - width: auto; - cursor: pointer; - cursor: hand; - } - - /* Lots of defaults to override small screen CSS */ - #questionnaire label, #alerts label { - float: none; - margin-top: 0; - display: inline; - } - - .confirmed { - background-color: #ccffcc; - border: solid 2px #009900; - padding: 5px; - text-align: center; - } - - #form_sign_in_yes { - float: left; - width: 47%; - padding-right: 1%; - border-right: solid 1px #999999; - margin-bottom: 1em; - } - - #form_sign_in_no, .fieldset #form_sign_in_no { - float: right; - width: 47%; - padding-left: 1%; - clear: none; - margin-bottom: 1em; - } - - #category_meta { - margin-bottom: 30px; - } - - #category_meta label { - width: 10em; - } - - // Map - - #map_box { - float: right; - width: $map_width + 2px; - position: relative; - padding-left: 20px; - background-color: #ffffff; - } - - p#copyright { - float: right; - text-align: right; - margin: 0 0 1em 0; - font-size: 78%; - } - - #map { - border: solid 1px #666666; - width: $map_width; // Twice a tile width - height: $map_width; - overflow: hidden; - position: relative; - background-color: #f1f1f1; - } - - /* Drag is only present in noscript form */ - #drag { - input, img { - position: absolute; - border: none; - } - input { - cursor: crosshair; - background-color: #cccccc; - } - img { - cursor: move; - } - img.pin { - z-index: 100; - background-color: inherit; - } - a img.pin { - cursor: pointer; - cursor: hand; - } - } - - form#mapForm #map { - cursor: pointer; - } - - form#mapForm .olTileImage { - cursor: crosshair; - } - - .banner { - margin: 0 $map_width + 30px 1em 0; - padding: 5px; - text-align: center; - position: relative; - } - - #text_map { - padding-left: 0.5em; - text-align: left; - margin-top: 0; - font-size: 110%; - background-color: #eeeeee; - -moz-border-radius-topleft: 1em; - -moz-border-radius-bottomleft: 1em; - -webkit-border-top-left-radius: 1em; - -webkit-border-bottom-left-radius: 1em; - border-top-left-radius: 1em; - border-bottom-left-radius: 1em; - } - #text_map_arrow { - display: block; - position: absolute; - top: 0; - right: -28px; - width: 0; - height: 0; - line-height: 0; - font-size: 0; - border-style: solid; - border-width: 26px 14px 26px 14px; - border-color: #fff #fff #fff #eee; - } - - #text_no_map { - margin-top: 0; - // background-color: #ffeecc; - // padding: 4px; - } - - #sub_map_links { - float: right; - clear: right; - margin-top: 0; - } - - // Problem pages - - #fixed { - background-color: #ccffcc; - border: solid 2px #009900; - } - - #unknown { - background-color: #ffcccc; - border: solid 2px #990000; - } - - #closed { - background-color: #ccccff; - border: solid 2px #000099; - } - - #progress { - background-color: #ffffcc; - border: solid 2px #999900; - } - - #updates { - div { - padding: 0 0 0.5em; - margin: 0 0 0.25em; - border-bottom: dotted 1px #5e552b; - - .problem-update, .update-text { - padding: 0; - margin: 0; - border-bottom: 0; - } - } - - p { - margin: 0; - } - } - - #nearby_lists h2 { - margin-top: 1em; - margin-bottom: 0; - } - - #nearby_lists li small { - color: #666666; - } - - #alert_links { - float: right; - } - #alert_links_area { - padding-left: 0.5em; - margin: 0; - color: #666; - font-size: smaller; - } - #rss_alert { - text-decoration: none; - span { - text-decoration: underline; - } - } - #email_alert { - } - #email_alert_box { - display:none; - position: absolute; - padding: 3px; - font-size:83%; - border:solid 1px #7399C3; - background-color: #eeeeff; - color: #000000; - } - #email_alert_box p { - margin: 0; - } - - .council_sent_info { - font-size: smaller; - } - - .update-img { - text-align: center; - } - .update-img span { - display: none; - } - #updates .update-img { - text-align: left; - } - - // RSS feed XSL - - #rss_items { - width:62%; - float:left; - } - #rss_rhs { - border-left:1px dashed #999; - width:36%; - float:right; - padding: 0 0 0 0.5em; - margin: 0 0 1em 0.5em; - } - #rss_box { - padding:10px; - border:1px solid #999999; - } - - // Alerts - #rss_feed { - list-style-type: none; - margin-bottom: 2em; - } - #rss_feed li { - margin-bottom: 1em; - } - #alert_or { - font-style: italic; - font-size: 125%; - margin: 0; - } - #rss_list { - float: left; - width: 47%; - } - #rss_list ul { - list-style-type: none; - } - #rss_buttons { - float: right; - width: 35%; - text-align: center; - margin-bottom: 2em; - } - #rss_local { - margin-left: 1.5em; - margin-bottom: 0; - } - #rss_local_alt { - margin: 0 0 2em 4em; - } - - #alert_photos { - text-align: center; - float: right; - width: 150px; - margin-left: 0.5em; - } - #alert_photos h2 { - font-size: 100%; - } - #alert_photos img { - margin-bottom: 0.25em; - } - - // Report page - - #col_problems, #col_fixed { - float: left; - width: 48%; - margin-right: 1em; - } - - // Contact page - .contact-details { - font-size: 80%; - margin-top: 2em; - } - - // File upload - // .progressContainer { - // margin: 5px; - // padding: 4px; - // width: 357px; - // border: solid 1px #E8E8E8; - // background-color: #F7F7F7; - // overflow: hidden; - // } - // .red { border: solid 1px #B50000; background-color: #FFEBEB; } - // .green { border: solid 1px #DDF0DD; background-color: #EBFFEB; } - // .blue { border: solid 1px #CEE2F2; background-color: #F0F5FF; } - - // .progressName { - // font-size: 8pt; - // font-weight: bold; - // color: #555555; - // width: 323px; - // height: 14px; - // text-align: left; - // white-space: nowrap; - // overflow: hidden; - // } - // .progressBarInProgress, .progressBarComplete, .progressBarError { - // font-size: 0px; - // width: 0%; - // height: 2px; - // background-color: blue; - // margin-top: 2px; - // } - // .progressBarComplete { - // width: 100%; - // background-color: green; - // visibility: hidden; - // } - // .progressBarError { - // width: 100%; - // background-color: red; - // visibility: hidden; - // } - // .progressBarStatus { - // margin-top: 2px; - // width: 337px; - // font-size: 7pt; - // font-family: Verdana; - // text-align: left; - // white-space: nowrap; - // } - -} - -.olControlAttribution { - bottom: 3px !important; - left: 3px; - color: #222222; -} -.olControlPermalink { - bottom: 3px !important; - right: 3px; -} - -.ie6, .ie7 { - #mysociety { - #front_stats div { - float: left; - margin: 0 1em 1em; - } - } -} - -// Printing, SCSS doesn't handle @media nesting - -@media print { - #mysociety { - #map_box { float: none; margin: 0 auto; } - #mysociety { max-width: none; } - #side { margin-right: 0; } - } -} - -@media all and (max-width: 50em) { - #mysociety { - p#expl { - font-size: 120%; - } - - p#expl small { - display: inline; - } - - #postcodeForm { - font-size: 100%; - span { - display: block; - font-size: 150%; - } - #sub { - font-size: 100%; - } - } - - #geolocate_link { - font-size: 100%; - } - - #front_intro { - float: none; - width: auto; - } - #front_recent { - margin-top: 1em; - float: none; - width: auto; - clear: both; - } - #front_photos { - white-space: nowrap; - overflow: hidden; - } - #front_stats { - border-spacing: 0.5em 1em; - } - - #form_sign_in_yes { - float: none; - width: auto; - padding-right: 0; - border-right: none; - margin-bottom: 1em; - } - - #form_sign_in_no, .fieldset #form_sign_in_no { - float: none; - width: auto; - padding-left: 0; - clear: none; - margin-bottom: 1em; - } - - fieldset, .fieldset { - margin: 1em; - } - - label { - margin-top: 1em; - display: block; - float: none; - text-align: left; - padding-right: 0; - width: auto; - } - .fieldset div.checkbox, #problem_submit { - padding-left: 0; - } - .fieldset div.checkbox label, label.n { - display: inline; - } - - #rss_list { - float: none; - width: auto; - } - #rss_buttons { - float: none; - width: auto; - text-align: left; - } - } -} - -@media all and (max-width: 750px) { - $map_width: 365px; - #mysociety { - #map_box { - padding-left: 10px; - width: $map_width + 2px; - } - #map { - width: $map_width; - height: $map_width; - } - .banner { - margin-right: $map_width + 20px; - } - #text_map_arrow { - right: -18px; - border-width: 16px 9px; - } - } -} - -@media all and (max-width: 580px) { - $map_width: 235px; - #mysociety { - #map_box { - width: $map_width + 2px; - } - #map { - width: $map_width; - height: $map_width; - } - .banner { - margin-right: $map_width + 20px; - } - } -} - -@media all and (max-width: 320px) { - #mysociety { - #map_box { - padding-left: 0; - float: none; - width: 100%; - } - #map { - width: 99%; - } - - .banner { - margin-right: 0; - clear: both; - margin-top: 1em; - } - #text_map { - padding: 0.25em 0.5em; - font-size: 100%; - -moz-border-radius-topleft: 0; - -moz-border-radius-bottomleft: 1em; - -moz-border-radius-bottomright: 1em; - -webkit-border-top-left-radius: 0; - -webkit-border-bottom-left-radius: 1em; - -webkit-border-bottom-right-radius: 1em; - border-top-left-radius: 0; - border-bottom-left-radius: 1em; - border-bottom-right-radius: 1em; - } - #text_map_arrow { - display: none; - } - } -} - diff --git a/web/css/main.scss b/web/css/main.scss deleted file mode 100644 index 1106b8a78..000000000 --- a/web/css/main.scss +++ /dev/null @@ -1,14 +0,0 @@ -// Generics - -$header_back: #e3d595; -$header_back_lighter: #f3e5a5; -$header_colour: #5e552b; -$header_darker: #4e451b; - -a { - &:link { color: #0000ff; } - &:visited { color: #000099; } - &:hover, &:active { color: #ff0000; } -} - -@import "main-import"; diff --git a/web/i/pin-spot.png b/web/i/pin-spot.png Binary files differnew file mode 100644 index 000000000..6f8eb5fb5 --- /dev/null +++ b/web/i/pin-spot.png diff --git a/web/i/twitter-icon-32.png b/web/i/twitter-icon-32.png Binary files differnew file mode 100644 index 000000000..9f6cefd9f --- /dev/null +++ b/web/i/twitter-icon-32.png diff --git a/web/js/OpenLayers.angus.js b/web/js/OpenLayers.angus.js new file mode 100644 index 000000000..c1f7ad10c --- /dev/null +++ b/web/js/OpenLayers.angus.js @@ -0,0 +1,732 @@ +/* + + OpenLayers.js -- OpenLayers Map Viewer Library + + Copyright (c) 2006-2013 by OpenLayers Contributors + Published under the 2-clause BSD license. + See http://openlayers.org/dev/license.txt for the full text of the license, and http://openlayers.org/dev/authors.txt for full list of contributors. + + Includes compressed code under the following licenses: + + (For uncompressed versions of the code used, please see the + OpenLayers Github repository: <https://github.com/openlayers/openlayers>) + +*/ + +/** + * Contains XMLHttpRequest.js <http://code.google.com/p/xmlhttprequest/> + * Copyright 2007 Sergey Ilinsky (http://www.ilinsky.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + */ + +/** + * OpenLayers.Util.pagePosition is based on Yahoo's getXY method, which is + * Copyright (c) 2006, Yahoo! Inc. + * All rights reserved. + * + * Redistribution and use of this software in source and binary forms, with or + * without modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * * Neither the name of Yahoo! Inc. nor the names of its contributors may be + * used to endorse or promote products derived from this software without + * specific prior written permission of Yahoo! Inc. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +var OpenLayers={VERSION_NUMBER:"Release 2.13.1",singleFile:!0,_getScriptLocation:function(){return "/js/OpenLayers-2.13.1/"},ImgPath:""};OpenLayers.String={startsWith:function(a,b){return 0==a.indexOf(b)},contains:function(a,b){return-1!=a.indexOf(b)},trim:function(a){return a.replace(/^\s\s*/,"").replace(/\s\s*$/,"")},camelize:function(a){a=a.split("-");for(var b=a[0],c=1,d=a.length;c<d;c++)var e=a[c],b=b+(e.charAt(0).toUpperCase()+e.substring(1));return b},format:function(a,b,c){b||(b=window);return a.replace(OpenLayers.String.tokenRegEx,function(a,e){for(var f,g=e.split(/\.+/),h=0;h<g.length;h++){0==h&&(f=b);if(void 0===f)break; +f=f[g[h]]}"function"==typeof f&&(f=c?f.apply(null,c):f());return"undefined"==typeof f?"undefined":f})},tokenRegEx:/\$\{([\w.]+?)\}/g,numberRegEx:/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/,isNumeric:function(a){return OpenLayers.String.numberRegEx.test(a)},numericIf:function(a,b){var c=a;!0===b&&null!=a&&a.replace&&(a=a.replace(/^\s*|\s*$/g,""));return OpenLayers.String.isNumeric(a)?parseFloat(a):c}}; +OpenLayers.Number={decimalSeparator:".",thousandsSeparator:",",limitSigDigs:function(a,b){var c=0;0<b&&(c=parseFloat(a.toPrecision(b)));return c},format:function(a,b,c,d){b="undefined"!=typeof b?b:0;c="undefined"!=typeof c?c:OpenLayers.Number.thousandsSeparator;d="undefined"!=typeof d?d:OpenLayers.Number.decimalSeparator;null!=b&&(a=parseFloat(a.toFixed(b)));var e=a.toString().split(".");1==e.length&&null==b&&(b=0);a=e[0];if(c)for(var f=/(-?[0-9]+)([0-9]{3})/;f.test(a);)a=a.replace(f,"$1"+c+"$2"); +0==b?b=a:(c=1<e.length?e[1]:"0",null!=b&&(c+=Array(b-c.length+1).join("0")),b=a+d+c);return b},zeroPad:function(a,b,c){for(a=a.toString(c||10);a.length<b;)a="0"+a;return a}}; +OpenLayers.Function={bind:function(a,b){var c=Array.prototype.slice.apply(arguments,[2]);return function(){var d=c.concat(Array.prototype.slice.apply(arguments,[0]));return a.apply(b,d)}},bindAsEventListener:function(a,b){return function(c){return a.call(b,c||window.event)}},False:function(){return!1},True:function(){return!0},Void:function(){}}; +OpenLayers.Array={filter:function(a,b,c){var d=[];if(Array.prototype.filter)d=a.filter(b,c);else{var e=a.length;if("function"!=typeof b)throw new TypeError;for(var f=0;f<e;f++)if(f in a){var g=a[f];b.call(c,g,f,a)&&d.push(g)}}return d}};OpenLayers.Class=function(){var a=arguments.length,b=arguments[0],c=arguments[a-1],d="function"==typeof c.initialize?c.initialize:function(){b.prototype.initialize.apply(this,arguments)};1<a?(a=[d,b].concat(Array.prototype.slice.call(arguments).slice(1,a-1),c),OpenLayers.inherit.apply(null,a)):d.prototype=c;return d}; +OpenLayers.inherit=function(a,b){var c=function(){};c.prototype=b.prototype;a.prototype=new c;var d,e,c=2;for(d=arguments.length;c<d;c++)e=arguments[c],"function"===typeof e&&(e=e.prototype),OpenLayers.Util.extend(a.prototype,e)};OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.extend=function(a,b){a=a||{};if(b){for(var c in b){var d=b[c];void 0!==d&&(a[c]=d)}"function"==typeof window.Event&&b instanceof window.Event||!b.hasOwnProperty||!b.hasOwnProperty("toString")||(a.toString=b.toString)}return a};OpenLayers.Bounds=OpenLayers.Class({left:null,bottom:null,right:null,top:null,centerLonLat:null,initialize:function(a,b,c,d){OpenLayers.Util.isArray(a)&&(d=a[3],c=a[2],b=a[1],a=a[0]);null!=a&&(this.left=OpenLayers.Util.toFloat(a));null!=b&&(this.bottom=OpenLayers.Util.toFloat(b));null!=c&&(this.right=OpenLayers.Util.toFloat(c));null!=d&&(this.top=OpenLayers.Util.toFloat(d))},clone:function(){return new OpenLayers.Bounds(this.left,this.bottom,this.right,this.top)},equals:function(a){var b=!1;null!= +a&&(b=this.left==a.left&&this.right==a.right&&this.top==a.top&&this.bottom==a.bottom);return b},toString:function(){return[this.left,this.bottom,this.right,this.top].join()},toArray:function(a){return!0===a?[this.bottom,this.left,this.top,this.right]:[this.left,this.bottom,this.right,this.top]},toBBOX:function(a,b){null==a&&(a=6);var c=Math.pow(10,a),d=Math.round(this.left*c)/c,e=Math.round(this.bottom*c)/c,f=Math.round(this.right*c)/c,c=Math.round(this.top*c)/c;return!0===b?e+","+d+","+c+","+f:d+ +","+e+","+f+","+c},toGeometry:function(){return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(this.left,this.bottom),new OpenLayers.Geometry.Point(this.right,this.bottom),new OpenLayers.Geometry.Point(this.right,this.top),new OpenLayers.Geometry.Point(this.left,this.top)])])},getWidth:function(){return this.right-this.left},getHeight:function(){return this.top-this.bottom},getSize:function(){return new OpenLayers.Size(this.getWidth(),this.getHeight())}, +getCenterPixel:function(){return new OpenLayers.Pixel((this.left+this.right)/2,(this.bottom+this.top)/2)},getCenterLonLat:function(){this.centerLonLat||(this.centerLonLat=new OpenLayers.LonLat((this.left+this.right)/2,(this.bottom+this.top)/2));return this.centerLonLat},scale:function(a,b){null==b&&(b=this.getCenterLonLat());var c,d;"OpenLayers.LonLat"==b.CLASS_NAME?(c=b.lon,d=b.lat):(c=b.x,d=b.y);return new OpenLayers.Bounds((this.left-c)*a+c,(this.bottom-d)*a+d,(this.right-c)*a+c,(this.top-d)*a+ +d)},add:function(a,b){if(null==a||null==b)throw new TypeError("Bounds.add cannot receive null values");return new OpenLayers.Bounds(this.left+a,this.bottom+b,this.right+a,this.top+b)},extend:function(a){if(a)switch(a.CLASS_NAME){case "OpenLayers.LonLat":this.extendXY(a.lon,a.lat);break;case "OpenLayers.Geometry.Point":this.extendXY(a.x,a.y);break;case "OpenLayers.Bounds":this.centerLonLat=null;if(null==this.left||a.left<this.left)this.left=a.left;if(null==this.bottom||a.bottom<this.bottom)this.bottom= +a.bottom;if(null==this.right||a.right>this.right)this.right=a.right;if(null==this.top||a.top>this.top)this.top=a.top}},extendXY:function(a,b){this.centerLonLat=null;if(null==this.left||a<this.left)this.left=a;if(null==this.bottom||b<this.bottom)this.bottom=b;if(null==this.right||a>this.right)this.right=a;if(null==this.top||b>this.top)this.top=b},containsLonLat:function(a,b){"boolean"===typeof b&&(b={inclusive:b});b=b||{};var c=this.contains(a.lon,a.lat,b.inclusive),d=b.worldBounds;d&&!c&&(c=d.getWidth(), +c=this.containsLonLat({lon:a.lon-Math.round((a.lon-(d.left+d.right)/2)/c)*c,lat:a.lat},{inclusive:b.inclusive}));return c},containsPixel:function(a,b){return this.contains(a.x,a.y,b)},contains:function(a,b,c){null==c&&(c=!0);if(null==a||null==b)return!1;a=OpenLayers.Util.toFloat(a);b=OpenLayers.Util.toFloat(b);var d=!1;return d=c?a>=this.left&&a<=this.right&&b>=this.bottom&&b<=this.top:a>this.left&&a<this.right&&b>this.bottom&&b<this.top},intersectsBounds:function(a,b){"boolean"===typeof b&&(b={inclusive:b}); +b=b||{};if(b.worldBounds){var c=this.wrapDateLine(b.worldBounds);a=a.wrapDateLine(b.worldBounds)}else c=this;null==b.inclusive&&(b.inclusive=!0);var d=!1,e=c.left==a.right||c.right==a.left||c.top==a.bottom||c.bottom==a.top;if(b.inclusive||!e)var d=a.top>=c.bottom&&a.top<=c.top||c.top>a.bottom&&c.top<a.top,e=a.left>=c.left&&a.left<=c.right||c.left>=a.left&&c.left<=a.right,f=a.right>=c.left&&a.right<=c.right||c.right>=a.left&&c.right<=a.right,d=(a.bottom>=c.bottom&&a.bottom<=c.top||c.bottom>=a.bottom&& +c.bottom<=a.top||d)&&(e||f);if(b.worldBounds&&!d){var g=b.worldBounds,e=g.getWidth(),f=!g.containsBounds(c),g=!g.containsBounds(a);f&&!g?(a=a.add(-e,0),d=c.intersectsBounds(a,{inclusive:b.inclusive})):g&&!f&&(c=c.add(-e,0),d=a.intersectsBounds(c,{inclusive:b.inclusive}))}return d},containsBounds:function(a,b,c){null==b&&(b=!1);null==c&&(c=!0);var d=this.contains(a.left,a.bottom,c),e=this.contains(a.right,a.bottom,c),f=this.contains(a.left,a.top,c);a=this.contains(a.right,a.top,c);return b?d||e||f|| +a:d&&e&&f&&a},determineQuadrant:function(a){var b="",c=this.getCenterLonLat(),b=b+(a.lat<c.lat?"b":"t");return b+=a.lon<c.lon?"l":"r"},transform:function(a,b){this.centerLonLat=null;var c=OpenLayers.Projection.transform({x:this.left,y:this.bottom},a,b),d=OpenLayers.Projection.transform({x:this.right,y:this.bottom},a,b),e=OpenLayers.Projection.transform({x:this.left,y:this.top},a,b),f=OpenLayers.Projection.transform({x:this.right,y:this.top},a,b);this.left=Math.min(c.x,e.x);this.bottom=Math.min(c.y, +d.y);this.right=Math.max(d.x,f.x);this.top=Math.max(e.y,f.y);return this},wrapDateLine:function(a,b){b=b||{};var c=b.leftTolerance||0,d=b.rightTolerance||0,e=this.clone();if(a){for(var f=a.getWidth();e.left<a.left&&e.right-d<=a.left;)e=e.add(f,0);for(;e.left+c>=a.right&&e.right>a.right;)e=e.add(-f,0);c=e.left+c;c<a.right&&c>a.left&&e.right-d>a.right&&(e=e.add(-f,0))}return e},CLASS_NAME:"OpenLayers.Bounds"}); +OpenLayers.Bounds.fromString=function(a,b){var c=a.split(",");return OpenLayers.Bounds.fromArray(c,b)};OpenLayers.Bounds.fromArray=function(a,b){return!0===b?new OpenLayers.Bounds(a[1],a[0],a[3],a[2]):new OpenLayers.Bounds(a[0],a[1],a[2],a[3])};OpenLayers.Bounds.fromSize=function(a){return new OpenLayers.Bounds(0,a.h,a.w,0)};OpenLayers.Bounds.oppositeQuadrant=function(a){var b;b=""+("t"==a.charAt(0)?"b":"t");return b+="l"==a.charAt(1)?"r":"l"};OpenLayers.Element={visible:function(a){return"none"!=OpenLayers.Util.getElement(a).style.display},toggle:function(){for(var a=0,b=arguments.length;a<b;a++){var c=OpenLayers.Util.getElement(arguments[a]),d=OpenLayers.Element.visible(c)?"none":"";c.style.display=d}},remove:function(a){a=OpenLayers.Util.getElement(a);a.parentNode.removeChild(a)},getHeight:function(a){a=OpenLayers.Util.getElement(a);return a.offsetHeight},hasClass:function(a,b){var c=a.className;return!!c&&(new RegExp("(^|\\s)"+b+"(\\s|$)")).test(c)}, +addClass:function(a,b){OpenLayers.Element.hasClass(a,b)||(a.className+=(a.className?" ":"")+b);return a},removeClass:function(a,b){var c=a.className;c&&(a.className=OpenLayers.String.trim(c.replace(new RegExp("(^|\\s+)"+b+"(\\s+|$)")," ")));return a},toggleClass:function(a,b){OpenLayers.Element.hasClass(a,b)?OpenLayers.Element.removeClass(a,b):OpenLayers.Element.addClass(a,b);return a},getStyle:function(a,b){a=OpenLayers.Util.getElement(a);var c=null;if(a&&a.style){c=a.style[OpenLayers.String.camelize(b)]; +c||(document.defaultView&&document.defaultView.getComputedStyle?c=(c=document.defaultView.getComputedStyle(a,null))?c.getPropertyValue(b):null:a.currentStyle&&(c=a.currentStyle[OpenLayers.String.camelize(b)]));var d=["left","top","right","bottom"];window.opera&&-1!=OpenLayers.Util.indexOf(d,b)&&"static"==OpenLayers.Element.getStyle(a,"position")&&(c="auto")}return"auto"==c?null:c}};OpenLayers.LonLat=OpenLayers.Class({lon:0,lat:0,initialize:function(a,b){OpenLayers.Util.isArray(a)&&(b=a[1],a=a[0]);this.lon=OpenLayers.Util.toFloat(a);this.lat=OpenLayers.Util.toFloat(b)},toString:function(){return"lon="+this.lon+",lat="+this.lat},toShortString:function(){return this.lon+", "+this.lat},clone:function(){return new OpenLayers.LonLat(this.lon,this.lat)},add:function(a,b){if(null==a||null==b)throw new TypeError("LonLat.add cannot receive null values");return new OpenLayers.LonLat(this.lon+ +OpenLayers.Util.toFloat(a),this.lat+OpenLayers.Util.toFloat(b))},equals:function(a){var b=!1;null!=a&&(b=this.lon==a.lon&&this.lat==a.lat||isNaN(this.lon)&&isNaN(this.lat)&&isNaN(a.lon)&&isNaN(a.lat));return b},transform:function(a,b){var c=OpenLayers.Projection.transform({x:this.lon,y:this.lat},a,b);this.lon=c.x;this.lat=c.y;return this},wrapDateLine:function(a){var b=this.clone();if(a){for(;b.lon<a.left;)b.lon+=a.getWidth();for(;b.lon>a.right;)b.lon-=a.getWidth()}return b},CLASS_NAME:"OpenLayers.LonLat"}); +OpenLayers.LonLat.fromString=function(a){a=a.split(",");return new OpenLayers.LonLat(a[0],a[1])};OpenLayers.LonLat.fromArray=function(a){var b=OpenLayers.Util.isArray(a);return new OpenLayers.LonLat(b&&a[0],b&&a[1])};OpenLayers.Pixel=OpenLayers.Class({x:0,y:0,initialize:function(a,b){this.x=parseFloat(a);this.y=parseFloat(b)},toString:function(){return"x="+this.x+",y="+this.y},clone:function(){return new OpenLayers.Pixel(this.x,this.y)},equals:function(a){var b=!1;null!=a&&(b=this.x==a.x&&this.y==a.y||isNaN(this.x)&&isNaN(this.y)&&isNaN(a.x)&&isNaN(a.y));return b},distanceTo:function(a){return Math.sqrt(Math.pow(this.x-a.x,2)+Math.pow(this.y-a.y,2))},add:function(a,b){if(null==a||null==b)throw new TypeError("Pixel.add cannot receive null values"); +return new OpenLayers.Pixel(this.x+a,this.y+b)},offset:function(a){var b=this.clone();a&&(b=this.add(a.x,a.y));return b},CLASS_NAME:"OpenLayers.Pixel"});OpenLayers.Size=OpenLayers.Class({w:0,h:0,initialize:function(a,b){this.w=parseFloat(a);this.h=parseFloat(b)},toString:function(){return"w="+this.w+",h="+this.h},clone:function(){return new OpenLayers.Size(this.w,this.h)},equals:function(a){var b=!1;null!=a&&(b=this.w==a.w&&this.h==a.h||isNaN(this.w)&&isNaN(this.h)&&isNaN(a.w)&&isNaN(a.h));return b},CLASS_NAME:"OpenLayers.Size"});OpenLayers.Console={log:function(){},debug:function(){},info:function(){},warn:function(){},error:function(){},userError:function(a){alert(a)},assert:function(){},dir:function(){},dirxml:function(){},trace:function(){},group:function(){},groupEnd:function(){},time:function(){},timeEnd:function(){},profile:function(){},profileEnd:function(){},count:function(){},CLASS_NAME:"OpenLayers.Console"}; +(function(){for(var a=document.getElementsByTagName("script"),b=0,c=a.length;b<c;++b)if(-1!=a[b].src.indexOf("firebug.js")&&console){OpenLayers.Util.extend(OpenLayers.Console,console);break}})();OpenLayers.Lang={code:null,defaultCode:"en",getCode:function(){OpenLayers.Lang.code||OpenLayers.Lang.setCode();return OpenLayers.Lang.code},setCode:function(a){var b;a||(a="msie"==OpenLayers.BROWSER_NAME?navigator.userLanguage:navigator.language);a=a.split("-");a[0]=a[0].toLowerCase();"object"==typeof OpenLayers.Lang[a[0]]&&(b=a[0]);if(a[1]){var c=a[0]+"-"+a[1].toUpperCase();"object"==typeof OpenLayers.Lang[c]&&(b=c)}b||(OpenLayers.Console.warn("Failed to find OpenLayers.Lang."+a.join("-")+" dictionary, falling back to default language"), +b=OpenLayers.Lang.defaultCode);OpenLayers.Lang.code=b},translate:function(a,b){var c=OpenLayers.Lang[OpenLayers.Lang.getCode()];(c=c&&c[a])||(c=a);b&&(c=OpenLayers.String.format(c,b));return c}};OpenLayers.i18n=OpenLayers.Lang.translate;OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.getElement=function(){for(var a=[],b=0,c=arguments.length;b<c;b++){var d=arguments[b];"string"==typeof d&&(d=document.getElementById(d));if(1==arguments.length)return d;a.push(d)}return a};OpenLayers.Util.isElement=function(a){return!(!a||1!==a.nodeType)};OpenLayers.Util.isArray=function(a){return"[object Array]"===Object.prototype.toString.call(a)};OpenLayers.Util.removeItem=function(a,b){for(var c=a.length-1;0<=c;c--)a[c]==b&&a.splice(c,1);return a}; +OpenLayers.Util.indexOf=function(a,b){if("function"==typeof a.indexOf)return a.indexOf(b);for(var c=0,d=a.length;c<d;c++)if(a[c]==b)return c;return-1};OpenLayers.Util.dotless=/\./g; +OpenLayers.Util.modifyDOMElement=function(a,b,c,d,e,f,g,h){b&&(a.id=b.replace(OpenLayers.Util.dotless,"_"));c&&(a.style.left=c.x+"px",a.style.top=c.y+"px");d&&(a.style.width=d.w+"px",a.style.height=d.h+"px");e&&(a.style.position=e);f&&(a.style.border=f);g&&(a.style.overflow=g);0<=parseFloat(h)&&1>parseFloat(h)?(a.style.filter="alpha(opacity="+100*h+")",a.style.opacity=h):1==parseFloat(h)&&(a.style.filter="",a.style.opacity="")}; +OpenLayers.Util.createDiv=function(a,b,c,d,e,f,g,h){var k=document.createElement("div");d&&(k.style.backgroundImage="url("+d+")");a||(a=OpenLayers.Util.createUniqueID("OpenLayersDiv"));e||(e="absolute");OpenLayers.Util.modifyDOMElement(k,a,b,c,e,f,g,h);return k}; +OpenLayers.Util.createImage=function(a,b,c,d,e,f,g,h){var k=document.createElement("img");a||(a=OpenLayers.Util.createUniqueID("OpenLayersDiv"));e||(e="relative");OpenLayers.Util.modifyDOMElement(k,a,b,c,e,f,null,g);h&&(b=function(){k.style.display="";OpenLayers.Event.stopObservingElement(k)},k.style.display="none",OpenLayers.Event.observe(k,"load",b),OpenLayers.Event.observe(k,"error",b));k.style.alt=a;k.galleryImg="no";d&&(k.src=d);return k};OpenLayers.IMAGE_RELOAD_ATTEMPTS=0; +OpenLayers.Util.alphaHackNeeded=null;OpenLayers.Util.alphaHack=function(){if(null==OpenLayers.Util.alphaHackNeeded){var a=navigator.appVersion.split("MSIE"),a=parseFloat(a[1]),b=!1;try{b=!!document.body.filters}catch(c){}OpenLayers.Util.alphaHackNeeded=b&&5.5<=a&&7>a}return OpenLayers.Util.alphaHackNeeded}; +OpenLayers.Util.modifyAlphaImageDiv=function(a,b,c,d,e,f,g,h,k){OpenLayers.Util.modifyDOMElement(a,b,c,d,f,null,null,k);b=a.childNodes[0];e&&(b.src=e);OpenLayers.Util.modifyDOMElement(b,a.id+"_innerImage",null,d,"relative",g);OpenLayers.Util.alphaHack()&&("none"!=a.style.display&&(a.style.display="inline-block"),null==h&&(h="scale"),a.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+b.src+"', sizingMethod='"+h+"')",0<=parseFloat(a.style.opacity)&&1>parseFloat(a.style.opacity)&& +(a.style.filter+=" alpha(opacity="+100*a.style.opacity+")"),b.style.filter="alpha(opacity=0)")};OpenLayers.Util.createAlphaImageDiv=function(a,b,c,d,e,f,g,h,k){var l=OpenLayers.Util.createDiv();k=OpenLayers.Util.createImage(null,null,null,null,null,null,null,k);k.className="olAlphaImg";l.appendChild(k);OpenLayers.Util.modifyAlphaImageDiv(l,a,b,c,d,e,f,g,h);return l};OpenLayers.Util.upperCaseObject=function(a){var b={},c;for(c in a)b[c.toUpperCase()]=a[c];return b}; +OpenLayers.Util.applyDefaults=function(a,b){a=a||{};var c="function"==typeof window.Event&&b instanceof window.Event,d;for(d in b)if(void 0===a[d]||!c&&b.hasOwnProperty&&b.hasOwnProperty(d)&&!a.hasOwnProperty(d))a[d]=b[d];!c&&b&&b.hasOwnProperty&&b.hasOwnProperty("toString")&&!a.hasOwnProperty("toString")&&(a.toString=b.toString);return a}; +OpenLayers.Util.getParameterString=function(a){var b=[],c;for(c in a){var d=a[c];if(null!=d&&"function"!=typeof d){if("object"==typeof d&&d.constructor==Array){for(var e=[],f,g=0,h=d.length;g<h;g++)f=d[g],e.push(encodeURIComponent(null===f||void 0===f?"":f));d=e.join(",")}else d=encodeURIComponent(d);b.push(encodeURIComponent(c)+"="+d)}}return b.join("&")};OpenLayers.Util.urlAppend=function(a,b){var c=a;if(b)var d=(a+" ").split(/[?&]/),c=c+(" "===d.pop()?b:d.length?"&"+b:"?"+b);return c}; +OpenLayers.Util.getImagesLocation=function(){return OpenLayers.ImgPath||OpenLayers._getScriptLocation()+"img/"};OpenLayers.Util.getImageLocation=function(a){return OpenLayers.Util.getImagesLocation()+a};OpenLayers.Util.Try=function(){for(var a=null,b=0,c=arguments.length;b<c;b++){var d=arguments[b];try{a=d();break}catch(e){}}return a}; +OpenLayers.Util.getXmlNodeValue=function(a){var b=null;OpenLayers.Util.Try(function(){b=a.text;b||(b=a.textContent);b||(b=a.firstChild.nodeValue)},function(){b=a.textContent});return b};OpenLayers.Util.mouseLeft=function(a,b){for(var c=a.relatedTarget?a.relatedTarget:a.toElement;c!=b&&null!=c;)c=c.parentNode;return c!=b};OpenLayers.Util.DEFAULT_PRECISION=14;OpenLayers.Util.toFloat=function(a,b){null==b&&(b=OpenLayers.Util.DEFAULT_PRECISION);"number"!==typeof a&&(a=parseFloat(a));return 0===b?a:parseFloat(a.toPrecision(b))}; +OpenLayers.Util.rad=function(a){return a*Math.PI/180};OpenLayers.Util.deg=function(a){return 180*a/Math.PI};OpenLayers.Util.VincentyConstants={a:6378137,b:6356752.3142,f:1/298.257223563}; +OpenLayers.Util.distVincenty=function(a,b){for(var c=OpenLayers.Util.VincentyConstants,d=c.a,e=c.b,c=c.f,f=OpenLayers.Util.rad(b.lon-a.lon),g=Math.atan((1-c)*Math.tan(OpenLayers.Util.rad(a.lat))),h=Math.atan((1-c)*Math.tan(OpenLayers.Util.rad(b.lat))),k=Math.sin(g),g=Math.cos(g),l=Math.sin(h),h=Math.cos(h),m=f,q=2*Math.PI,n=20;1E-12<Math.abs(m-q)&&0<--n;){var p=Math.sin(m),r=Math.cos(m),t=Math.sqrt(h*p*h*p+(g*l-k*h*r)*(g*l-k*h*r));if(0==t)return 0;var r=k*l+g*h*r,u=Math.atan2(t,r),v=Math.asin(g*h* +p/t),w=Math.cos(v)*Math.cos(v),p=r-2*k*l/w,x=c/16*w*(4+c*(4-3*w)),q=m,m=f+(1-x)*c*Math.sin(v)*(u+x*t*(p+x*r*(-1+2*p*p)))}if(0==n)return NaN;d=w*(d*d-e*e)/(e*e);c=d/1024*(256+d*(-128+d*(74-47*d)));return(e*(1+d/16384*(4096+d*(-768+d*(320-175*d))))*(u-c*t*(p+c/4*(r*(-1+2*p*p)-c/6*p*(-3+4*t*t)*(-3+4*p*p))))).toFixed(3)/1E3}; +OpenLayers.Util.destinationVincenty=function(a,b,c){var d=OpenLayers.Util,e=d.VincentyConstants,f=e.a,g=e.b,e=e.f,h=a.lon,k=a.lat;a=d.rad(b);b=Math.sin(a);a=Math.cos(a);for(var l=(1-e)*Math.tan(d.rad(k)),k=1/Math.sqrt(1+l*l),m=l*k,q=Math.atan2(l,a),l=k*b,n=1-l*l,f=n*(f*f-g*g)/(g*g),p=1+f/16384*(4096+f*(-768+f*(320-175*f))),r=f/1024*(256+f*(-128+f*(74-47*f))),f=c/(g*p),t=2*Math.PI;1E-12<Math.abs(f-t);)var u=Math.cos(2*q+f),v=Math.sin(f),w=Math.cos(f),x=r*v*(u+r/4*(w*(-1+2*u*u)-r/6*u*(-3+4*v*v)*(-3+ +4*u*u))),t=f,f=c/(g*p)+x;c=m*v-k*w*a;c=Math.atan2(m*w+k*v*a,(1-e)*Math.sqrt(l*l+c*c));g=e/16*n*(4+e*(4-3*n));return new OpenLayers.LonLat(h+d.deg(Math.atan2(v*b,k*w-m*v*a)-(1-g)*e*l*(f+g*v*(u+g*w*(-1+2*u*u)))),d.deg(c))}; +OpenLayers.Util.getParameters=function(a,b){b=b||{};a=null===a||void 0===a?window.location.href:a;var c="";if(OpenLayers.String.contains(a,"?"))var d=a.indexOf("?")+1,c=OpenLayers.String.contains(a,"#")?a.indexOf("#"):a.length,c=a.substring(d,c);for(var d={},c=c.split(/[&;]/),e=0,f=c.length;e<f;++e){var g=c[e].split("=");if(g[0]){var h=g[0];try{h=decodeURIComponent(h)}catch(k){h=unescape(h)}g=(g[1]||"").replace(/\+/g," ");try{g=decodeURIComponent(g)}catch(k){g=unescape(g)}!1!==b.splitArgs&&(g=g.split(",")); +1==g.length&&(g=g[0]);d[h]=g}}return d};OpenLayers.Util.lastSeqID=0;OpenLayers.Util.createUniqueID=function(a){a=null==a?"id_":a.replace(OpenLayers.Util.dotless,"_");OpenLayers.Util.lastSeqID+=1;return a+OpenLayers.Util.lastSeqID};OpenLayers.INCHES_PER_UNIT={inches:1,ft:12,mi:63360,m:39.37,km:39370,dd:4374754,yd:36};OpenLayers.INCHES_PER_UNIT["in"]=OpenLayers.INCHES_PER_UNIT.inches;OpenLayers.INCHES_PER_UNIT.degrees=OpenLayers.INCHES_PER_UNIT.dd;OpenLayers.INCHES_PER_UNIT.nmi=1852*OpenLayers.INCHES_PER_UNIT.m; +OpenLayers.METERS_PER_INCH=.0254000508001016; +OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{Inch:OpenLayers.INCHES_PER_UNIT.inches,Meter:1/OpenLayers.METERS_PER_INCH,Foot:.3048006096012192/OpenLayers.METERS_PER_INCH,IFoot:.3048/OpenLayers.METERS_PER_INCH,ClarkeFoot:.3047972651151/OpenLayers.METERS_PER_INCH,SearsFoot:.30479947153867626/OpenLayers.METERS_PER_INCH,GoldCoastFoot:.3047997101815088/OpenLayers.METERS_PER_INCH,IInch:.0254/OpenLayers.METERS_PER_INCH,MicroInch:2.54E-5/OpenLayers.METERS_PER_INCH,Mil:2.54E-8/OpenLayers.METERS_PER_INCH, +Centimeter:.01/OpenLayers.METERS_PER_INCH,Kilometer:1E3/OpenLayers.METERS_PER_INCH,Yard:.9144018288036576/OpenLayers.METERS_PER_INCH,SearsYard:.914398414616029/OpenLayers.METERS_PER_INCH,IndianYard:.9143985307444408/OpenLayers.METERS_PER_INCH,IndianYd37:.91439523/OpenLayers.METERS_PER_INCH,IndianYd62:.9143988/OpenLayers.METERS_PER_INCH,IndianYd75:.9143985/OpenLayers.METERS_PER_INCH,IndianFoot:.30479951/OpenLayers.METERS_PER_INCH,IndianFt37:.30479841/OpenLayers.METERS_PER_INCH,IndianFt62:.3047996/ +OpenLayers.METERS_PER_INCH,IndianFt75:.3047995/OpenLayers.METERS_PER_INCH,Mile:1609.3472186944373/OpenLayers.METERS_PER_INCH,IYard:.9144/OpenLayers.METERS_PER_INCH,IMile:1609.344/OpenLayers.METERS_PER_INCH,NautM:1852/OpenLayers.METERS_PER_INCH,"Lat-66":110943.31648893273/OpenLayers.METERS_PER_INCH,"Lat-83":110946.25736872235/OpenLayers.METERS_PER_INCH,Decimeter:.1/OpenLayers.METERS_PER_INCH,Millimeter:.001/OpenLayers.METERS_PER_INCH,Dekameter:10/OpenLayers.METERS_PER_INCH,Decameter:10/OpenLayers.METERS_PER_INCH, +Hectometer:100/OpenLayers.METERS_PER_INCH,GermanMeter:1.0000135965/OpenLayers.METERS_PER_INCH,CaGrid:.999738/OpenLayers.METERS_PER_INCH,ClarkeChain:20.1166194976/OpenLayers.METERS_PER_INCH,GunterChain:20.11684023368047/OpenLayers.METERS_PER_INCH,BenoitChain:20.116782494375872/OpenLayers.METERS_PER_INCH,SearsChain:20.11676512155/OpenLayers.METERS_PER_INCH,ClarkeLink:.201166194976/OpenLayers.METERS_PER_INCH,GunterLink:.2011684023368047/OpenLayers.METERS_PER_INCH,BenoitLink:.20116782494375873/OpenLayers.METERS_PER_INCH, +SearsLink:.2011676512155/OpenLayers.METERS_PER_INCH,Rod:5.02921005842012/OpenLayers.METERS_PER_INCH,IntnlChain:20.1168/OpenLayers.METERS_PER_INCH,IntnlLink:.201168/OpenLayers.METERS_PER_INCH,Perch:5.02921005842012/OpenLayers.METERS_PER_INCH,Pole:5.02921005842012/OpenLayers.METERS_PER_INCH,Furlong:201.1684023368046/OpenLayers.METERS_PER_INCH,Rood:3.778266898/OpenLayers.METERS_PER_INCH,CapeFoot:.3047972615/OpenLayers.METERS_PER_INCH,Brealey:375/OpenLayers.METERS_PER_INCH,ModAmFt:.304812252984506/OpenLayers.METERS_PER_INCH, +Fathom:1.8288/OpenLayers.METERS_PER_INCH,"NautM-UK":1853.184/OpenLayers.METERS_PER_INCH,"50kilometers":5E4/OpenLayers.METERS_PER_INCH,"150kilometers":15E4/OpenLayers.METERS_PER_INCH}); +OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{mm:OpenLayers.INCHES_PER_UNIT.Meter/1E3,cm:OpenLayers.INCHES_PER_UNIT.Meter/100,dm:100*OpenLayers.INCHES_PER_UNIT.Meter,km:1E3*OpenLayers.INCHES_PER_UNIT.Meter,kmi:OpenLayers.INCHES_PER_UNIT.nmi,fath:OpenLayers.INCHES_PER_UNIT.Fathom,ch:OpenLayers.INCHES_PER_UNIT.IntnlChain,link:OpenLayers.INCHES_PER_UNIT.IntnlLink,"us-in":OpenLayers.INCHES_PER_UNIT.inches,"us-ft":OpenLayers.INCHES_PER_UNIT.Foot,"us-yd":OpenLayers.INCHES_PER_UNIT.Yard,"us-ch":OpenLayers.INCHES_PER_UNIT.GunterChain, +"us-mi":OpenLayers.INCHES_PER_UNIT.Mile,"ind-yd":OpenLayers.INCHES_PER_UNIT.IndianYd37,"ind-ft":OpenLayers.INCHES_PER_UNIT.IndianFt37,"ind-ch":20.11669506/OpenLayers.METERS_PER_INCH});OpenLayers.DOTS_PER_INCH=72;OpenLayers.Util.normalizeScale=function(a){return 1<a?1/a:a};OpenLayers.Util.getResolutionFromScale=function(a,b){var c;a&&(null==b&&(b="degrees"),c=1/(OpenLayers.Util.normalizeScale(a)*OpenLayers.INCHES_PER_UNIT[b]*OpenLayers.DOTS_PER_INCH));return c}; +OpenLayers.Util.getScaleFromResolution=function(a,b){null==b&&(b="degrees");return a*OpenLayers.INCHES_PER_UNIT[b]*OpenLayers.DOTS_PER_INCH}; +OpenLayers.Util.pagePosition=function(a){var b=[0,0],c=OpenLayers.Util.getViewportElement();if(!a||a==window||a==c)return b;var d=OpenLayers.IS_GECKO&&document.getBoxObjectFor&&"absolute"==OpenLayers.Element.getStyle(a,"position")&&(""==a.style.top||""==a.style.left),e=null;if(a.getBoundingClientRect)a=a.getBoundingClientRect(),e=window.pageYOffset||c.scrollTop,b[0]=a.left+(window.pageXOffset||c.scrollLeft),b[1]=a.top+e;else if(document.getBoxObjectFor&&!d)a=document.getBoxObjectFor(a),c=document.getBoxObjectFor(c), +b[0]=a.screenX-c.screenX,b[1]=a.screenY-c.screenY;else{b[0]=a.offsetLeft;b[1]=a.offsetTop;e=a.offsetParent;if(e!=a)for(;e;)b[0]+=e.offsetLeft,b[1]+=e.offsetTop,e=e.offsetParent;c=OpenLayers.BROWSER_NAME;if("opera"==c||"safari"==c&&"absolute"==OpenLayers.Element.getStyle(a,"position"))b[1]-=document.body.offsetTop;for(e=a.offsetParent;e&&e!=document.body;){b[0]-=e.scrollLeft;if("opera"!=c||"TR"!=e.tagName)b[1]-=e.scrollTop;e=e.offsetParent}}return b}; +OpenLayers.Util.getViewportElement=function(){var a=arguments.callee.viewportElement;void 0==a&&(a="msie"==OpenLayers.BROWSER_NAME&&"CSS1Compat"!=document.compatMode?document.body:document.documentElement,arguments.callee.viewportElement=a);return a}; +OpenLayers.Util.isEquivalentUrl=function(a,b,c){c=c||{};OpenLayers.Util.applyDefaults(c,{ignoreCase:!0,ignorePort80:!0,ignoreHash:!0,splitArgs:!1});a=OpenLayers.Util.createUrlObject(a,c);b=OpenLayers.Util.createUrlObject(b,c);for(var d in a)if("args"!==d&&a[d]!=b[d])return!1;for(d in a.args){if(a.args[d]!=b.args[d])return!1;delete b.args[d]}for(d in b.args)return!1;return!0}; +OpenLayers.Util.createUrlObject=function(a,b){b=b||{};if(!/^\w+:\/\//.test(a)){var c=window.location,d=c.port?":"+c.port:"",d=c.protocol+"//"+c.host.split(":").shift()+d;0===a.indexOf("/")?a=d+a:(c=c.pathname.split("/"),c.pop(),a=d+c.join("/")+"/"+a)}b.ignoreCase&&(a=a.toLowerCase());c=document.createElement("a");c.href=a;d={};d.host=c.host.split(":").shift();d.protocol=c.protocol;d.port=b.ignorePort80?"80"==c.port||"0"==c.port?"":c.port:""==c.port||"0"==c.port?"80":c.port;d.hash=b.ignoreHash||"#"=== +c.hash?"":c.hash;var e=c.search;e||(e=a.indexOf("?"),e=-1!=e?a.substr(e):"");d.args=OpenLayers.Util.getParameters(e,{splitArgs:b.splitArgs});d.pathname="/"==c.pathname.charAt(0)?c.pathname:"/"+c.pathname;return d};OpenLayers.Util.removeTail=function(a){var b=null,b=a.indexOf("?"),c=a.indexOf("#");return b=-1==b?-1!=c?a.substr(0,c):a:-1!=c?a.substr(0,Math.min(b,c)):a.substr(0,b)};OpenLayers.IS_GECKO=function(){var a=navigator.userAgent.toLowerCase();return-1==a.indexOf("webkit")&&-1!=a.indexOf("gecko")}(); +OpenLayers.CANVAS_SUPPORTED=function(){var a=document.createElement("canvas");return!(!a.getContext||!a.getContext("2d"))}();OpenLayers.BROWSER_NAME=function(){var a="",b=navigator.userAgent.toLowerCase();-1!=b.indexOf("opera")?a="opera":-1!=b.indexOf("msie")?a="msie":-1!=b.indexOf("safari")?a="safari":-1!=b.indexOf("mozilla")&&(a=-1!=b.indexOf("firefox")?"firefox":"mozilla");return a}();OpenLayers.Util.getBrowserName=function(){return OpenLayers.BROWSER_NAME}; +OpenLayers.Util.getRenderedDimensions=function(a,b,c){var d,e,f=document.createElement("div");f.style.visibility="hidden";for(var g=c&&c.containerElement?c.containerElement:document.body,h=!1,k=null,l=g;l&&"body"!=l.tagName.toLowerCase();){var m=OpenLayers.Element.getStyle(l,"position");if("absolute"==m){h=!0;break}else if(m&&"static"!=m)break;l=l.parentNode}!h||0!==g.clientHeight&&0!==g.clientWidth||(k=document.createElement("div"),k.style.visibility="hidden",k.style.position="absolute",k.style.overflow= +"visible",k.style.width=document.body.clientWidth+"px",k.style.height=document.body.clientHeight+"px",k.appendChild(f));f.style.position="absolute";b&&(b.w?(d=b.w,f.style.width=d+"px"):b.h&&(e=b.h,f.style.height=e+"px"));c&&c.displayClass&&(f.className=c.displayClass);b=document.createElement("div");b.innerHTML=a;b.style.overflow="visible";if(b.childNodes)for(a=0,c=b.childNodes.length;a<c;a++)b.childNodes[a].style&&(b.childNodes[a].style.overflow="visible");f.appendChild(b);k?g.appendChild(k):g.appendChild(f); +d||(d=parseInt(b.scrollWidth),f.style.width=d+"px");e||(e=parseInt(b.scrollHeight));f.removeChild(b);k?(k.removeChild(f),g.removeChild(k)):g.removeChild(f);return new OpenLayers.Size(d,e)}; +OpenLayers.Util.getScrollbarWidth=function(){var a=OpenLayers.Util._scrollbarWidth;if(null==a){var b=null,c=null,b=a=0,b=document.createElement("div");b.style.position="absolute";b.style.top="-1000px";b.style.left="-1000px";b.style.width="100px";b.style.height="50px";b.style.overflow="hidden";c=document.createElement("div");c.style.width="100%";c.style.height="200px";b.appendChild(c);document.body.appendChild(b);a=c.offsetWidth;b.style.overflow="scroll";b=c.offsetWidth;document.body.removeChild(document.body.lastChild); +OpenLayers.Util._scrollbarWidth=a-b;a=OpenLayers.Util._scrollbarWidth}return a}; +OpenLayers.Util.getFormattedLonLat=function(a,b,c){c||(c="dms");a=(a+540)%360-180;var d=Math.abs(a),e=Math.floor(d),f=d=(d-e)/(1/60),d=Math.floor(d),f=Math.round((f-d)/(1/60)*10),f=f/10;60<=f&&(f-=60,d+=1,60<=d&&(d-=60,e+=1));10>e&&(e="0"+e);e+="\u00b0";0<=c.indexOf("dm")&&(10>d&&(d="0"+d),e+=d+"'",0<=c.indexOf("dms")&&(10>f&&(f="0"+f),e+=f+'"'));return e="lon"==b?e+(0>a?OpenLayers.i18n("W"):OpenLayers.i18n("E")):e+(0>a?OpenLayers.i18n("S"):OpenLayers.i18n("N"))};OpenLayers.Event={observers:!1,KEY_SPACE:32,KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,element:function(a){return a.target||a.srcElement},isSingleTouch:function(a){return a.touches&&1==a.touches.length},isMultiTouch:function(a){return a.touches&&1<a.touches.length},isLeftClick:function(a){return a.which&&1==a.which||a.button&&1==a.button},isRightClick:function(a){return a.which&&3==a.which||a.button&&2==a.button},stop:function(a, +b){b||OpenLayers.Event.preventDefault(a);a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},preventDefault:function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},findElement:function(a,b){for(var c=OpenLayers.Event.element(a);c.parentNode&&(!c.tagName||c.tagName.toUpperCase()!=b.toUpperCase());)c=c.parentNode;return c},observe:function(a,b,c,d){a=OpenLayers.Util.getElement(a);d=d||!1;"keypress"==b&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||a.attachEvent)&&(b="keydown"); +this.observers||(this.observers={});if(!a._eventCacheID){var e="eventCacheID_";a.id&&(e=a.id+"_"+e);a._eventCacheID=OpenLayers.Util.createUniqueID(e)}e=a._eventCacheID;this.observers[e]||(this.observers[e]=[]);this.observers[e].push({element:a,name:b,observer:c,useCapture:d});a.addEventListener?a.addEventListener(b,c,d):a.attachEvent&&a.attachEvent("on"+b,c)},stopObservingElement:function(a){a=OpenLayers.Util.getElement(a)._eventCacheID;this._removeElementObservers(OpenLayers.Event.observers[a])}, +_removeElementObservers:function(a){if(a)for(var b=a.length-1;0<=b;b--){var c=a[b];OpenLayers.Event.stopObserving.apply(this,[c.element,c.name,c.observer,c.useCapture])}},stopObserving:function(a,b,c,d){d=d||!1;a=OpenLayers.Util.getElement(a);var e=a._eventCacheID;"keypress"==b&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||a.detachEvent)&&(b="keydown");var f=!1,g=OpenLayers.Event.observers[e];if(g)for(var h=0;!f&&h<g.length;){var k=g[h];if(k.name==b&&k.observer==c&&k.useCapture==d){g.splice(h, +1);0==g.length&&delete OpenLayers.Event.observers[e];f=!0;break}h++}f&&(a.removeEventListener?a.removeEventListener(b,c,d):a&&a.detachEvent&&a.detachEvent("on"+b,c));return f},unloadCache:function(){if(OpenLayers.Event&&OpenLayers.Event.observers){for(var a in OpenLayers.Event.observers)OpenLayers.Event._removeElementObservers.apply(this,[OpenLayers.Event.observers[a]]);OpenLayers.Event.observers=!1}},CLASS_NAME:"OpenLayers.Event"}; +OpenLayers.Event.observe(window,"unload",OpenLayers.Event.unloadCache,!1); +OpenLayers.Events=OpenLayers.Class({BROWSER_EVENTS:"mouseover mouseout mousedown mouseup mousemove click dblclick rightclick dblrightclick resize focus blur touchstart touchmove touchend keydown".split(" "),listeners:null,object:null,element:null,eventHandler:null,fallThrough:null,includeXY:!1,extensions:null,extensionCount:null,clearMouseListener:null,initialize:function(a,b,c,d,e){OpenLayers.Util.extend(this,e);this.object=a;this.fallThrough=d;this.listeners={};this.extensions={};this.extensionCount= +{};this._msTouches=[];null!=b&&this.attachToElement(b)},destroy:function(){for(var a in this.extensions)"boolean"!==typeof this.extensions[a]&&this.extensions[a].destroy();this.extensions=null;this.element&&(OpenLayers.Event.stopObservingElement(this.element),this.element.hasScrollEvent&&OpenLayers.Event.stopObserving(window,"scroll",this.clearMouseListener));this.eventHandler=this.fallThrough=this.object=this.listeners=this.element=null},addEventType:function(a){},attachToElement:function(a){this.element? +OpenLayers.Event.stopObservingElement(this.element):(this.eventHandler=OpenLayers.Function.bindAsEventListener(this.handleBrowserEvent,this),this.clearMouseListener=OpenLayers.Function.bind(this.clearMouseCache,this));this.element=a;for(var b=!!window.navigator.msMaxTouchPoints,c,d=0,e=this.BROWSER_EVENTS.length;d<e;d++)c=this.BROWSER_EVENTS[d],OpenLayers.Event.observe(a,c,this.eventHandler),b&&0===c.indexOf("touch")&&this.addMsTouchListener(a,c,this.eventHandler);OpenLayers.Event.observe(a,"dragstart", +OpenLayers.Event.stop)},on:function(a){for(var b in a)"scope"!=b&&a.hasOwnProperty(b)&&this.register(b,a.scope,a[b])},register:function(a,b,c,d){a in OpenLayers.Events&&!this.extensions[a]&&(this.extensions[a]=new OpenLayers.Events[a](this));if(null!=c){null==b&&(b=this.object);var e=this.listeners[a];e||(e=[],this.listeners[a]=e,this.extensionCount[a]=0);b={obj:b,func:c};d?(e.splice(this.extensionCount[a],0,b),"object"===typeof d&&d.extension&&this.extensionCount[a]++):e.push(b)}},registerPriority:function(a, +b,c){this.register(a,b,c,!0)},un:function(a){for(var b in a)"scope"!=b&&a.hasOwnProperty(b)&&this.unregister(b,a.scope,a[b])},unregister:function(a,b,c){null==b&&(b=this.object);a=this.listeners[a];if(null!=a)for(var d=0,e=a.length;d<e;d++)if(a[d].obj==b&&a[d].func==c){a.splice(d,1);break}},remove:function(a){null!=this.listeners[a]&&(this.listeners[a]=[])},triggerEvent:function(a,b){var c=this.listeners[a];if(c&&0!=c.length){null==b&&(b={});b.object=this.object;b.element=this.element;b.type||(b.type= +a);for(var c=c.slice(),d,e=0,f=c.length;e<f&&(d=c[e],d=d.func.apply(d.obj,[b]),void 0==d||0!=d);e++);this.fallThrough||OpenLayers.Event.stop(b,!0);return d}},handleBrowserEvent:function(a){var b=a.type,c=this.listeners[b];if(c&&0!=c.length){if((c=a.touches)&&c[0]){for(var d=0,e=0,f=c.length,g,h=0;h<f;++h)g=this.getTouchClientXY(c[h]),d+=g.clientX,e+=g.clientY;a.clientX=d/f;a.clientY=e/f}this.includeXY&&(a.xy=this.getMousePosition(a));this.triggerEvent(b,a)}},getTouchClientXY:function(a){var b=window.olMockWin|| +window,c=b.pageXOffset,b=b.pageYOffset,d=a.clientX,e=a.clientY;if(0===a.pageY&&Math.floor(e)>Math.floor(a.pageY)||0===a.pageX&&Math.floor(d)>Math.floor(a.pageX))d-=c,e-=b;else if(e<a.pageY-b||d<a.pageX-c)d=a.pageX-c,e=a.pageY-b;a.olClientX=d;a.olClientY=e;return{clientX:d,clientY:e}},clearMouseCache:function(){this.element.scrolls=null;this.element.lefttop=null;this.element.offsets=null},getMousePosition:function(a){this.includeXY?this.element.hasScrollEvent||(OpenLayers.Event.observe(window,"scroll", +this.clearMouseListener),this.element.hasScrollEvent=!0):this.clearMouseCache();if(!this.element.scrolls){var b=OpenLayers.Util.getViewportElement();this.element.scrolls=[window.pageXOffset||b.scrollLeft,window.pageYOffset||b.scrollTop]}this.element.lefttop||(this.element.lefttop=[document.documentElement.clientLeft||0,document.documentElement.clientTop||0]);this.element.offsets||(this.element.offsets=OpenLayers.Util.pagePosition(this.element));return new OpenLayers.Pixel(a.clientX+this.element.scrolls[0]- +this.element.offsets[0]-this.element.lefttop[0],a.clientY+this.element.scrolls[1]-this.element.offsets[1]-this.element.lefttop[1])},addMsTouchListener:function(a,b,c){function d(a){c(OpenLayers.Util.applyDefaults({stopPropagation:function(){for(var a=e.length-1;0<=a;--a)e[a].stopPropagation()},preventDefault:function(){for(var a=e.length-1;0<=a;--a)e[a].preventDefault()},type:b},a))}var e=this._msTouches;switch(b){case "touchstart":return this.addMsTouchListenerStart(a,b,d);case "touchend":return this.addMsTouchListenerEnd(a, +b,d);case "touchmove":return this.addMsTouchListenerMove(a,b,d);default:throw"Unknown touch event type";}},addMsTouchListenerStart:function(a,b,c){var d=this._msTouches;OpenLayers.Event.observe(a,"MSPointerDown",function(a){for(var b=!1,g=0,h=d.length;g<h;++g)if(d[g].pointerId==a.pointerId){b=!0;break}b||d.push(a);a.touches=d.slice();c(a)});OpenLayers.Event.observe(a,"MSPointerUp",function(a){for(var b=0,c=d.length;b<c;++b)if(d[b].pointerId==a.pointerId){d.splice(b,1);break}})},addMsTouchListenerMove:function(a, +b,c){var d=this._msTouches;OpenLayers.Event.observe(a,"MSPointerMove",function(a){if(a.pointerType!=a.MSPOINTER_TYPE_MOUSE||0!=a.buttons)if(1!=d.length||d[0].pageX!=a.pageX||d[0].pageY!=a.pageY){for(var b=0,g=d.length;b<g;++b)if(d[b].pointerId==a.pointerId){d[b]=a;break}a.touches=d.slice();c(a)}})},addMsTouchListenerEnd:function(a,b,c){var d=this._msTouches;OpenLayers.Event.observe(a,"MSPointerUp",function(a){for(var b=0,g=d.length;b<g;++b)if(d[b].pointerId==a.pointerId){d.splice(b,1);break}a.touches= +d.slice();c(a)})},CLASS_NAME:"OpenLayers.Events"});OpenLayers.Events.buttonclick=OpenLayers.Class({target:null,events:"mousedown mouseup click dblclick touchstart touchmove touchend keydown".split(" "),startRegEx:/^mousedown|touchstart$/,cancelRegEx:/^touchmove$/,completeRegEx:/^mouseup|touchend$/,initialize:function(a){this.target=a;for(a=this.events.length-1;0<=a;--a)this.target.register(this.events[a],this,this.buttonClick,{extension:!0})},destroy:function(){for(var a=this.events.length-1;0<=a;--a)this.target.unregister(this.events[a],this,this.buttonClick); +delete this.target},getPressedButton:function(a){var b=3,c;do{if(OpenLayers.Element.hasClass(a,"olButton")){c=a;break}a=a.parentNode}while(0<--b&&a);return c},ignore:function(a){var b=3,c=!1;do{if("a"===a.nodeName.toLowerCase()){c=!0;break}a=a.parentNode}while(0<--b&&a);return c},buttonClick:function(a){var b=!0,c=OpenLayers.Event.element(a);if(c&&(OpenLayers.Event.isLeftClick(a)||!~a.type.indexOf("mouse")))if(c=this.getPressedButton(c)){if("keydown"===a.type)switch(a.keyCode){case OpenLayers.Event.KEY_RETURN:case OpenLayers.Event.KEY_SPACE:this.target.triggerEvent("buttonclick", +{buttonElement:c}),OpenLayers.Event.stop(a),b=!1}else if(this.startEvt){if(this.completeRegEx.test(a.type)){var b=OpenLayers.Util.pagePosition(c),d=OpenLayers.Util.getViewportElement(),e=window.pageYOffset||d.scrollTop;b[0]-=window.pageXOffset||d.scrollLeft;b[1]-=e;this.target.triggerEvent("buttonclick",{buttonElement:c,buttonXY:{x:this.startEvt.clientX-b[0],y:this.startEvt.clientY-b[1]}})}this.cancelRegEx.test(a.type)&&delete this.startEvt;OpenLayers.Event.stop(a);b=!1}this.startRegEx.test(a.type)&& +(this.startEvt=a,OpenLayers.Event.stop(a),b=!1)}else b=!this.ignore(OpenLayers.Event.element(a)),delete this.startEvt;return b}});OpenLayers.Format=OpenLayers.Class({options:null,externalProjection:null,internalProjection:null,data:null,keepData:!1,initialize:function(a){OpenLayers.Util.extend(this,a);this.options=a},destroy:function(){},read:function(a){throw Error("Read not implemented.");},write:function(a){throw Error("Write not implemented.");},CLASS_NAME:"OpenLayers.Format"});OpenLayers.Format.XML=OpenLayers.Class(OpenLayers.Format,{namespaces:null,namespaceAlias:null,defaultPrefix:null,readers:{},writers:{},xmldom:null,initialize:function(a){window.ActiveXObject&&(this.xmldom=new ActiveXObject("Microsoft.XMLDOM"));OpenLayers.Format.prototype.initialize.apply(this,[a]);this.namespaces=OpenLayers.Util.extend({},this.namespaces);this.namespaceAlias={};for(var b in this.namespaces)this.namespaceAlias[this.namespaces[b]]=b},destroy:function(){this.xmldom=null;OpenLayers.Format.prototype.destroy.apply(this, +arguments)},setNamespace:function(a,b){this.namespaces[a]=b;this.namespaceAlias[b]=a},read:function(a){var b=a.indexOf("<");0<b&&(a=a.substring(b));b=OpenLayers.Util.Try(OpenLayers.Function.bind(function(){var b;b=window.ActiveXObject&&!this.xmldom?new ActiveXObject("Microsoft.XMLDOM"):this.xmldom;b.loadXML(a);return b},this),function(){return(new DOMParser).parseFromString(a,"text/xml")},function(){var b=new XMLHttpRequest;b.open("GET","data:text/xml;charset=utf-8,"+encodeURIComponent(a),!1);b.overrideMimeType&& +b.overrideMimeType("text/xml");b.send(null);return b.responseXML});this.keepData&&(this.data=b);return b},write:function(a){if(this.xmldom)a=a.xml;else{var b=new XMLSerializer;if(1==a.nodeType){var c=document.implementation.createDocument("","",null);c.importNode&&(a=c.importNode(a,!0));c.appendChild(a);a=b.serializeToString(c)}else a=b.serializeToString(a)}return a},createElementNS:function(a,b){return this.xmldom?"string"==typeof a?this.xmldom.createNode(1,b,a):this.xmldom.createNode(1,b,""):document.createElementNS(a, +b)},createDocumentFragment:function(){return this.xmldom?this.xmldom.createDocumentFragment():document.createDocumentFragment()},createTextNode:function(a){"string"!==typeof a&&(a=String(a));return this.xmldom?this.xmldom.createTextNode(a):document.createTextNode(a)},getElementsByTagNameNS:function(a,b,c){var d=[];if(a.getElementsByTagNameNS)d=a.getElementsByTagNameNS(b,c);else{a=a.getElementsByTagName("*");for(var e,f,g=0,h=a.length;g<h;++g)if(e=a[g],f=e.prefix?e.prefix+":"+c:c,"*"==c||f==e.nodeName)"*"!= +b&&b!=e.namespaceURI||d.push(e)}return d},getAttributeNodeNS:function(a,b,c){var d=null;if(a.getAttributeNodeNS)d=a.getAttributeNodeNS(b,c);else{a=a.attributes;for(var e,f,g=0,h=a.length;g<h;++g)if(e=a[g],e.namespaceURI==b&&(f=e.prefix?e.prefix+":"+c:c,f==e.nodeName)){d=e;break}}return d},getAttributeNS:function(a,b,c){var d="";if(a.getAttributeNS)d=a.getAttributeNS(b,c)||"";else if(a=this.getAttributeNodeNS(a,b,c))d=a.nodeValue;return d},getChildValue:function(a,b){var c=b||"";if(a)for(var d=a.firstChild;d;d= +d.nextSibling)switch(d.nodeType){case 3:case 4:c+=d.nodeValue}return c},isSimpleContent:function(a){var b=!0;for(a=a.firstChild;a;a=a.nextSibling)if(1===a.nodeType){b=!1;break}return b},contentType:function(a){var b=!1,c=!1,d=OpenLayers.Format.XML.CONTENT_TYPE.EMPTY;for(a=a.firstChild;a;a=a.nextSibling){switch(a.nodeType){case 1:c=!0;break;case 8:break;default:b=!0}if(c&&b)break}if(c&&b)d=OpenLayers.Format.XML.CONTENT_TYPE.MIXED;else{if(c)return OpenLayers.Format.XML.CONTENT_TYPE.COMPLEX;if(b)return OpenLayers.Format.XML.CONTENT_TYPE.SIMPLE}return d}, +hasAttributeNS:function(a,b,c){var d=!1;return d=a.hasAttributeNS?a.hasAttributeNS(b,c):!!this.getAttributeNodeNS(a,b,c)},setAttributeNS:function(a,b,c,d){if(a.setAttributeNS)a.setAttributeNS(b,c,d);else if(this.xmldom)b?(b=a.ownerDocument.createNode(2,c,b),b.nodeValue=d,a.setAttributeNode(b)):a.setAttribute(c,d);else throw"setAttributeNS not implemented";},createElementNSPlus:function(a,b){b=b||{};var c=b.uri||this.namespaces[b.prefix];c||(c=a.indexOf(":"),c=this.namespaces[a.substring(0,c)]);c|| +(c=this.namespaces[this.defaultPrefix]);c=this.createElementNS(c,a);b.attributes&&this.setAttributes(c,b.attributes);var d=b.value;null!=d&&c.appendChild(this.createTextNode(d));return c},setAttributes:function(a,b){var c,d,e;for(e in b)null!=b[e]&&b[e].toString&&(c=b[e].toString(),d=this.namespaces[e.substring(0,e.indexOf(":"))]||null,this.setAttributeNS(a,d,e,c))},readNode:function(a,b){b||(b={});var c=this.readers[a.namespaceURI?this.namespaceAlias[a.namespaceURI]:this.defaultPrefix];if(c){var d= +a.localName||a.nodeName.split(":").pop();(c=c[d]||c["*"])&&c.apply(this,[a,b])}return b},readChildNodes:function(a,b){b||(b={});for(var c=a.childNodes,d,e=0,f=c.length;e<f;++e)d=c[e],1==d.nodeType&&this.readNode(d,b);return b},writeNode:function(a,b,c){var d,e=a.indexOf(":");0<e?(d=a.substring(0,e),a=a.substring(e+1)):d=c?this.namespaceAlias[c.namespaceURI]:this.defaultPrefix;b=this.writers[d][a].apply(this,[b]);c&&c.appendChild(b);return b},getChildEl:function(a,b,c){return a&&this.getThisOrNextEl(a.firstChild, +b,c)},getNextEl:function(a,b,c){return a&&this.getThisOrNextEl(a.nextSibling,b,c)},getThisOrNextEl:function(a,b,c){a:for(;a;a=a.nextSibling)switch(a.nodeType){case 1:if(!(b&&b!==(a.localName||a.nodeName.split(":").pop())||c&&c!==a.namespaceURI))break a;a=null;break a;case 3:if(/^\s*$/.test(a.nodeValue))break;case 4:case 6:case 12:case 10:case 11:a=null;break a}return a||null},lookupNamespaceURI:function(a,b){var c=null;if(a)if(a.lookupNamespaceURI)c=a.lookupNamespaceURI(b);else a:switch(a.nodeType){case 1:if(null!== +a.namespaceURI&&a.prefix===b){c=a.namespaceURI;break a}if(c=a.attributes.length)for(var d,e=0;e<c;++e)if(d=a.attributes[e],"xmlns"===d.prefix&&d.name==="xmlns:"+b){c=d.value||null;break a}else if("xmlns"===d.name&&null===b){c=d.value||null;break a}c=this.lookupNamespaceURI(a.parentNode,b);break a;case 2:c=this.lookupNamespaceURI(a.ownerElement,b);break a;case 9:c=this.lookupNamespaceURI(a.documentElement,b);break a;case 6:case 12:case 10:case 11:break a;default:c=this.lookupNamespaceURI(a.parentNode, +b)}return c},getXMLDoc:function(){OpenLayers.Format.XML.document||this.xmldom||(document.implementation&&document.implementation.createDocument?OpenLayers.Format.XML.document=document.implementation.createDocument("","",null):!this.xmldom&&window.ActiveXObject&&(this.xmldom=new ActiveXObject("Microsoft.XMLDOM")));return OpenLayers.Format.XML.document||this.xmldom},CLASS_NAME:"OpenLayers.Format.XML"});OpenLayers.Format.XML.CONTENT_TYPE={EMPTY:0,SIMPLE:1,COMPLEX:2,MIXED:3}; +OpenLayers.Format.XML.lookupNamespaceURI=OpenLayers.Function.bind(OpenLayers.Format.XML.prototype.lookupNamespaceURI,OpenLayers.Format.XML.prototype);OpenLayers.Format.XML.document=null;OpenLayers.Format.WFST=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Format.WFST.DEFAULTS);var b=OpenLayers.Format.WFST["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported WFST version: "+a.version;return new b(a)};OpenLayers.Format.WFST.DEFAULTS={version:"1.0.0"};OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:null,popup:null,initialize:function(a,b,c){this.layer=a;this.lonlat=b;this.data=null!=c?c:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){null!=this.layer&&null!=this.layer.map&&null!=this.popup&&this.layer.map.removePopup(this.popup);null!=this.layer&&null!=this.marker&&this.layer.removeMarker(this.marker);this.data=this.lonlat=this.id=this.layer=null;null!=this.marker&& +(this.destroyMarker(this.marker),this.marker=null);null!=this.popup&&(this.destroyPopup(this.popup),this.popup=null)},onScreen:function(){var a=!1;null!=this.layer&&null!=this.layer.map&&(a=this.layer.map.getExtent().containsLonLat(this.lonlat));return a},createMarker:function(){null!=this.lonlat&&(this.marker=new OpenLayers.Marker(this.lonlat,this.data.icon));return this.marker},destroyMarker:function(){this.marker.destroy()},createPopup:function(a){null!=this.lonlat&&(this.popup||(this.popup=new (this.popupClass? +this.popupClass:OpenLayers.Popup.Anchored)(this.id+"_popup",this.lonlat,this.data.popupSize,this.data.popupContentHTML,this.marker?this.marker.icon:null,a)),null!=this.data.overflow&&(this.popup.contentDiv.style.overflow=this.data.overflow),this.popup.feature=this);return this.popup},destroyPopup:function(){this.popup&&(this.popup.feature=null,this.popup.destroy(),this.popup=null)},CLASS_NAME:"OpenLayers.Feature"});OpenLayers.State={UNKNOWN:"Unknown",INSERT:"Insert",UPDATE:"Update",DELETE:"Delete"}; +OpenLayers.Feature.Vector=OpenLayers.Class(OpenLayers.Feature,{fid:null,geometry:null,attributes:null,bounds:null,state:null,style:null,url:null,renderIntent:"default",modified:null,initialize:function(a,b,c){OpenLayers.Feature.prototype.initialize.apply(this,[null,null,b]);this.lonlat=null;this.geometry=a?a:null;this.state=null;this.attributes={};b&&(this.attributes=OpenLayers.Util.extend(this.attributes,b));this.style=c?c:null},destroy:function(){this.layer&&(this.layer.removeFeatures(this),this.layer= +null);this.modified=this.geometry=null;OpenLayers.Feature.prototype.destroy.apply(this,arguments)},clone:function(){return new OpenLayers.Feature.Vector(this.geometry?this.geometry.clone():null,this.attributes,this.style)},onScreen:function(a){var b=!1;this.layer&&this.layer.map&&(b=this.layer.map.getExtent(),a?(a=this.geometry.getBounds(),b=b.intersectsBounds(a)):b=b.toGeometry().intersects(this.geometry));return b},getVisibility:function(){return!(this.style&&"none"==this.style.display||!this.layer|| +this.layer&&this.layer.styleMap&&"none"==this.layer.styleMap.createSymbolizer(this,this.renderIntent).display||this.layer&&!this.layer.getVisibility())},createMarker:function(){return null},destroyMarker:function(){},createPopup:function(){return null},atPoint:function(a,b,c){var d=!1;this.geometry&&(d=this.geometry.atPoint(a,b,c));return d},destroyPopup:function(){},move:function(a){if(this.layer&&this.geometry.move){a="OpenLayers.LonLat"==a.CLASS_NAME?this.layer.getViewPortPxFromLonLat(a):a;var b= +this.layer.getViewPortPxFromLonLat(this.geometry.getBounds().getCenterLonLat()),c=this.layer.map.getResolution();this.geometry.move(c*(a.x-b.x),c*(b.y-a.y));this.layer.drawFeature(this);return b}},toState:function(a){if(a==OpenLayers.State.UPDATE)switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.DELETE:this.state=a}else if(a==OpenLayers.State.INSERT)switch(this.state){case OpenLayers.State.UNKNOWN:break;default:this.state=a}else if(a==OpenLayers.State.DELETE)switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.UPDATE:this.state= +a}else a==OpenLayers.State.UNKNOWN&&(this.state=a)},CLASS_NAME:"OpenLayers.Feature.Vector"}); +OpenLayers.Feature.Vector.style={"default":{fillColor:"#ee9900",fillOpacity:.4,hoverFillColor:"white",hoverFillOpacity:.8,strokeColor:"#ee9900",strokeOpacity:1,strokeWidth:1,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},select:{fillColor:"blue",fillOpacity:.4, +hoverFillColor:"white",hoverFillOpacity:.8,strokeColor:"blue",strokeOpacity:1,strokeWidth:2,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"pointer",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},temporary:{fillColor:"#66cccc",fillOpacity:.2,hoverFillColor:"white",hoverFillOpacity:.8,strokeColor:"#66cccc",strokeOpacity:1, +strokeLinecap:"round",strokeWidth:2,strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},"delete":{display:"none"}};OpenLayers.Style=OpenLayers.Class({id:null,name:null,title:null,description:null,layerName:null,isDefault:!1,rules:null,context:null,defaultStyle:null,defaultsPerSymbolizer:!1,propertyStyles:null,initialize:function(a,b){OpenLayers.Util.extend(this,b);this.rules=[];b&&b.rules&&this.addRules(b.rules);this.setDefaultStyle(a||OpenLayers.Feature.Vector.style["default"]);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){for(var a=0,b=this.rules.length;a<b;a++)this.rules[a].destroy(), +this.rules[a]=null;this.defaultStyle=this.rules=null},createSymbolizer:function(a){for(var b=this.defaultsPerSymbolizer?{}:this.createLiterals(OpenLayers.Util.extend({},this.defaultStyle),a),c=this.rules,d,e=[],f=!1,g=0,h=c.length;g<h;g++)d=c[g],d.evaluate(a)&&(d instanceof OpenLayers.Rule&&d.elseFilter?e.push(d):(f=!0,this.applySymbolizer(d,b,a)));if(0==f&&0<e.length)for(f=!0,g=0,h=e.length;g<h;g++)this.applySymbolizer(e[g],b,a);0<c.length&&0==f&&(b.display="none");null!=b.label&&"string"!==typeof b.label&& +(b.label=String(b.label));return b},applySymbolizer:function(a,b,c){var d=c.geometry?this.getSymbolizerPrefix(c.geometry):OpenLayers.Style.SYMBOLIZER_PREFIXES[0];a=a.symbolizer[d]||a.symbolizer;!0===this.defaultsPerSymbolizer&&(d=this.defaultStyle,OpenLayers.Util.applyDefaults(a,{pointRadius:d.pointRadius}),!0!==a.stroke&&!0!==a.graphic||OpenLayers.Util.applyDefaults(a,{strokeWidth:d.strokeWidth,strokeColor:d.strokeColor,strokeOpacity:d.strokeOpacity,strokeDashstyle:d.strokeDashstyle,strokeLinecap:d.strokeLinecap}), +!0!==a.fill&&!0!==a.graphic||OpenLayers.Util.applyDefaults(a,{fillColor:d.fillColor,fillOpacity:d.fillOpacity}),!0===a.graphic&&OpenLayers.Util.applyDefaults(a,{pointRadius:this.defaultStyle.pointRadius,externalGraphic:this.defaultStyle.externalGraphic,graphicName:this.defaultStyle.graphicName,graphicOpacity:this.defaultStyle.graphicOpacity,graphicWidth:this.defaultStyle.graphicWidth,graphicHeight:this.defaultStyle.graphicHeight,graphicXOffset:this.defaultStyle.graphicXOffset,graphicYOffset:this.defaultStyle.graphicYOffset})); +return this.createLiterals(OpenLayers.Util.extend(b,a),c)},createLiterals:function(a,b){var c=OpenLayers.Util.extend({},b.attributes||b.data);OpenLayers.Util.extend(c,this.context);for(var d in this.propertyStyles)a[d]=OpenLayers.Style.createLiteral(a[d],c,b,d);return a},findPropertyStyles:function(){var a={};this.addPropertyStyles(a,this.defaultStyle);for(var b=this.rules,c,d,e=0,f=b.length;e<f;e++){c=b[e].symbolizer;for(var g in c)if(d=c[g],"object"==typeof d)this.addPropertyStyles(a,d);else{this.addPropertyStyles(a, +c);break}}return a},addPropertyStyles:function(a,b){var c,d;for(d in b)c=b[d],"string"==typeof c&&c.match(/\$\{\w+\}/)&&(a[d]=!0);return a},addRules:function(a){Array.prototype.push.apply(this.rules,a);this.propertyStyles=this.findPropertyStyles()},setDefaultStyle:function(a){this.defaultStyle=a;this.propertyStyles=this.findPropertyStyles()},getSymbolizerPrefix:function(a){for(var b=OpenLayers.Style.SYMBOLIZER_PREFIXES,c=0,d=b.length;c<d;c++)if(-1!=a.CLASS_NAME.indexOf(b[c]))return b[c]},clone:function(){var a= +OpenLayers.Util.extend({},this);if(this.rules){a.rules=[];for(var b=0,c=this.rules.length;b<c;++b)a.rules.push(this.rules[b].clone())}a.context=this.context&&OpenLayers.Util.extend({},this.context);b=OpenLayers.Util.extend({},this.defaultStyle);return new OpenLayers.Style(b,a)},CLASS_NAME:"OpenLayers.Style"});OpenLayers.Style.createLiteral=function(a,b,c,d){"string"==typeof a&&-1!=a.indexOf("${")&&(a=OpenLayers.String.format(a,b,[c,d]),a=isNaN(a)||!a?a:parseFloat(a));return a}; +OpenLayers.Style.SYMBOLIZER_PREFIXES=["Point","Line","Polygon","Text","Raster"];OpenLayers.Filter=OpenLayers.Class({initialize:function(a){OpenLayers.Util.extend(this,a)},destroy:function(){},evaluate:function(a){return!0},clone:function(){return null},toString:function(){return OpenLayers.Format&&OpenLayers.Format.CQL?OpenLayers.Format.CQL.prototype.write(this):Object.prototype.toString.call(this)},CLASS_NAME:"OpenLayers.Filter"});OpenLayers.Filter.Spatial=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,distance:null,distanceUnits:null,evaluate:function(a){var b=!1;switch(this.type){case OpenLayers.Filter.Spatial.BBOX:case OpenLayers.Filter.Spatial.INTERSECTS:if(a.geometry){var c=this.value;"OpenLayers.Bounds"==this.value.CLASS_NAME&&(c=this.value.toGeometry());a.geometry.intersects(c)&&(b=!0)}break;default:throw Error("evaluate is not implemented for this filter type.");}return b},clone:function(){var a= +OpenLayers.Util.applyDefaults({value:this.value&&this.value.clone&&this.value.clone()},this);return new OpenLayers.Filter.Spatial(a)},CLASS_NAME:"OpenLayers.Filter.Spatial"});OpenLayers.Filter.Spatial.BBOX="BBOX";OpenLayers.Filter.Spatial.INTERSECTS="INTERSECTS";OpenLayers.Filter.Spatial.DWITHIN="DWITHIN";OpenLayers.Filter.Spatial.WITHIN="WITHIN";OpenLayers.Filter.Spatial.CONTAINS="CONTAINS";OpenLayers.Filter.FeatureId=OpenLayers.Class(OpenLayers.Filter,{fids:null,type:"FID",initialize:function(a){this.fids=[];OpenLayers.Filter.prototype.initialize.apply(this,[a])},evaluate:function(a){for(var b=0,c=this.fids.length;b<c;b++)if((a.fid||a.id)==this.fids[b])return!0;return!1},clone:function(){var a=new OpenLayers.Filter.FeatureId;OpenLayers.Util.extend(a,this);a.fids=this.fids.slice();return a},CLASS_NAME:"OpenLayers.Filter.FeatureId"});OpenLayers.Format.WFST.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",wfs:"http://www.opengis.net/wfs",gml:"http://www.opengis.net/gml",ogc:"http://www.opengis.net/ogc",ows:"http://www.opengis.net/ows"},defaultPrefix:"wfs",version:null,schemaLocations:null,srsName:null,extractAttributes:!0,xy:!0,stateName:null,initialize:function(a){this.stateName={};this.stateName[OpenLayers.State.INSERT]="wfs:Insert";this.stateName[OpenLayers.State.UPDATE]= +"wfs:Update";this.stateName[OpenLayers.State.DELETE]="wfs:Delete";OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},getSrsName:function(a,b){var c=b&&b.srsName;c||(c=a&&a.layer?a.layer.projection.getCode():this.srsName);return c},read:function(a,b){b=b||{};OpenLayers.Util.applyDefaults(b,{output:"features"});"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var c={};a&&this.readNode(a,c,!0);c.features&&"features"===b.output&& +(c=c.features);return c},readers:{wfs:{FeatureCollection:function(a,b){b.features=[];this.readChildNodes(a,b)}}},write:function(a,b){var c=this.writeNode("wfs:Transaction",{features:a,options:b}),d=this.schemaLocationAttr();d&&this.setAttributeNS(c,this.namespaces.xsi,"xsi:schemaLocation",d);return OpenLayers.Format.XML.prototype.write.apply(this,[c])},writers:{wfs:{GetFeature:function(a){var b=this.createElementNSPlus("wfs:GetFeature",{attributes:{service:"WFS",version:this.version,handle:a&&a.handle, +outputFormat:a&&a.outputFormat,maxFeatures:a&&a.maxFeatures,"xsi:schemaLocation":this.schemaLocationAttr(a)}});if("string"==typeof this.featureType)this.writeNode("Query",a,b);else for(var c=0,d=this.featureType.length;c<d;c++)a.featureType=this.featureType[c],this.writeNode("Query",a,b);return b},Transaction:function(a){a=a||{};var b=a.options||{},c=this.createElementNSPlus("wfs:Transaction",{attributes:{service:"WFS",version:this.version,handle:b.handle}}),d,e=a.features;if(e){!0===b.multi&&OpenLayers.Util.extend(this.geometryTypes, +{"OpenLayers.Geometry.Point":"MultiPoint","OpenLayers.Geometry.LineString":!0===this.multiCurve?"MultiCurve":"MultiLineString","OpenLayers.Geometry.Polygon":!0===this.multiSurface?"MultiSurface":"MultiPolygon"});var f,g;a=0;for(d=e.length;a<d;++a)g=e[a],(f=this.stateName[g.state])&&this.writeNode(f,{feature:g,options:b},c);!0===b.multi&&this.setGeometryTypes()}if(b.nativeElements)for(a=0,d=b.nativeElements.length;a<d;++a)this.writeNode("wfs:Native",b.nativeElements[a],c);return c},Native:function(a){return this.createElementNSPlus("wfs:Native", +{attributes:{vendorId:a.vendorId,safeToIgnore:a.safeToIgnore},value:a.value})},Insert:function(a){var b=a.feature;a=a.options;a=this.createElementNSPlus("wfs:Insert",{attributes:{handle:a&&a.handle}});this.srsName=this.getSrsName(b);this.writeNode("feature:_typeName",b,a);return a},Update:function(a){var b=a.feature;a=a.options;a=this.createElementNSPlus("wfs:Update",{attributes:{handle:a&&a.handle,typeName:(this.featureNS?this.featurePrefix+":":"")+this.featureType}});this.featureNS&&a.setAttribute("xmlns:"+ +this.featurePrefix,this.featureNS);var c=b.modified;null===this.geometryName||c&&void 0===c.geometry||(this.srsName=this.getSrsName(b),this.writeNode("Property",{name:this.geometryName,value:b.geometry},a));for(var d in b.attributes)void 0===b.attributes[d]||c&&c.attributes&&(!c.attributes||void 0===c.attributes[d])||this.writeNode("Property",{name:d,value:b.attributes[d]},a);this.writeNode("ogc:Filter",new OpenLayers.Filter.FeatureId({fids:[b.fid]}),a);return a},Property:function(a){var b=this.createElementNSPlus("wfs:Property"); +this.writeNode("Name",a.name,b);null!==a.value&&this.writeNode("Value",a.value,b);return b},Name:function(a){return this.createElementNSPlus("wfs:Name",{value:a})},Value:function(a){var b;a instanceof OpenLayers.Geometry?(b=this.createElementNSPlus("wfs:Value"),a=this.writeNode("feature:_geometry",a).firstChild,b.appendChild(a)):b=this.createElementNSPlus("wfs:Value",{value:a});return b},Delete:function(a){var b=a.feature;a=a.options;a=this.createElementNSPlus("wfs:Delete",{attributes:{handle:a&& +a.handle,typeName:(this.featureNS?this.featurePrefix+":":"")+this.featureType}});this.featureNS&&a.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);this.writeNode("ogc:Filter",new OpenLayers.Filter.FeatureId({fids:[b.fid]}),a);return a}}},schemaLocationAttr:function(a){a=OpenLayers.Util.extend({featurePrefix:this.featurePrefix,schema:this.schema},a);var b=OpenLayers.Util.extend({},this.schemaLocations);a.schema&&(b[a.featurePrefix]=a.schema);a=[];var c,d;for(d in b)(c=this.namespaces[d])&& +a.push(c+" "+b[d]);return a.join(" ")||void 0},setFilterProperty:function(a){if(a.filters)for(var b=0,c=a.filters.length;b<c;++b)OpenLayers.Format.WFST.v1.prototype.setFilterProperty.call(this,a.filters[b]);else a instanceof OpenLayers.Filter.Spatial&&!a.property&&(a.property=this.geometryName)},CLASS_NAME:"OpenLayers.Format.WFST.v1"});OpenLayers.Format.OGCExceptionReport=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ogc:"http://www.opengis.net/ogc"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},defaultPrefix:"ogc",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b={exceptionReport:null};a.documentElement&&(this.readChildNodes(a,b),null===b.exceptionReport&&(b=(new OpenLayers.Format.OWSCommon).read(a)));return b},readers:{ogc:{ServiceExceptionReport:function(a, +b){b.exceptionReport={exceptions:[]};this.readChildNodes(a,b.exceptionReport)},ServiceException:function(a,b){var c={code:a.getAttribute("code"),locator:a.getAttribute("locator"),text:this.getChildValue(a)};b.exceptions.push(c)}}},CLASS_NAME:"OpenLayers.Format.OGCExceptionReport"});OpenLayers.Format.XML.VersionedOGC=OpenLayers.Class(OpenLayers.Format.XML,{defaultVersion:null,version:null,profile:null,allowFallback:!1,name:null,stringifyOutput:!1,parser:null,initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);a=this.CLASS_NAME;this.name=a.substring(a.lastIndexOf(".")+1)},getVersion:function(a,b){var c;a?(c=this.version,c||(c=a.getAttribute("version"),c||(c=this.defaultVersion))):c=b&&b.version||this.version||this.defaultVersion;return c},getParser:function(a){a= +a||this.defaultVersion;var b=this.profile?"_"+this.profile:"";if(!this.parser||this.parser.VERSION!=a){var c=OpenLayers.Format[this.name]["v"+a.replace(/\./g,"_")+b];if(!c&&(""!==b&&this.allowFallback&&(b="",c=OpenLayers.Format[this.name]["v"+a.replace(/\./g,"_")]),!c))throw"Can't find a "+this.name+" parser for version "+a+b;this.parser=new c(this.options)}return this.parser},write:function(a,b){var c=this.getVersion(null,b);this.parser=this.getParser(c);c=this.parser.write(a,b);return!1===this.stringifyOutput? +c:OpenLayers.Format.XML.prototype.write.apply(this,[c])},read:function(a,b){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var c=this.getVersion(a.documentElement);this.parser=this.getParser(c);var d=this.parser.read(a,b),e=this.parser.errorProperty||null;null!==e&&void 0===d[e]&&(e=new OpenLayers.Format.OGCExceptionReport,d.error=e.read(a));d.version=c;return d},CLASS_NAME:"OpenLayers.Format.XML.VersionedOGC"});OpenLayers.Filter.Logical=OpenLayers.Class(OpenLayers.Filter,{filters:null,type:null,initialize:function(a){this.filters=[];OpenLayers.Filter.prototype.initialize.apply(this,[a])},destroy:function(){this.filters=null;OpenLayers.Filter.prototype.destroy.apply(this)},evaluate:function(a){var b,c;switch(this.type){case OpenLayers.Filter.Logical.AND:b=0;for(c=this.filters.length;b<c;b++)if(0==this.filters[b].evaluate(a))return!1;return!0;case OpenLayers.Filter.Logical.OR:b=0;for(c=this.filters.length;b< +c;b++)if(1==this.filters[b].evaluate(a))return!0;return!1;case OpenLayers.Filter.Logical.NOT:return!this.filters[0].evaluate(a)}},clone:function(){for(var a=[],b=0,c=this.filters.length;b<c;++b)a.push(this.filters[b].clone());return new OpenLayers.Filter.Logical({type:this.type,filters:a})},CLASS_NAME:"OpenLayers.Filter.Logical"});OpenLayers.Filter.Logical.AND="&&";OpenLayers.Filter.Logical.OR="||";OpenLayers.Filter.Logical.NOT="!";OpenLayers.Filter.Comparison=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,matchCase:!0,lowerBoundary:null,upperBoundary:null,initialize:function(a){OpenLayers.Filter.prototype.initialize.apply(this,[a]);this.type===OpenLayers.Filter.Comparison.LIKE&&void 0===a.matchCase&&(this.matchCase=null)},evaluate:function(a){a instanceof OpenLayers.Feature.Vector&&(a=a.attributes);var b=!1;a=a[this.property];switch(this.type){case OpenLayers.Filter.Comparison.EQUAL_TO:b=this.value; +b=this.matchCase||"string"!=typeof a||"string"!=typeof b?a==b:a.toUpperCase()==b.toUpperCase();break;case OpenLayers.Filter.Comparison.NOT_EQUAL_TO:b=this.value;b=this.matchCase||"string"!=typeof a||"string"!=typeof b?a!=b:a.toUpperCase()!=b.toUpperCase();break;case OpenLayers.Filter.Comparison.LESS_THAN:b=a<this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN:b=a>this.value;break;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:b=a<=this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:b= +a>=this.value;break;case OpenLayers.Filter.Comparison.BETWEEN:b=a>=this.lowerBoundary&&a<=this.upperBoundary;break;case OpenLayers.Filter.Comparison.LIKE:b=(new RegExp(this.value,"gi")).test(a);break;case OpenLayers.Filter.Comparison.IS_NULL:b=null===a}return b},value2regex:function(a,b,c){if("."==a)throw Error("'.' is an unsupported wildCard character for OpenLayers.Filter.Comparison");a=a?a:"*";b=b?b:".";this.value=this.value.replace(new RegExp("\\"+(c?c:"!")+"(.|$)","g"),"\\$1");this.value=this.value.replace(new RegExp("\\"+ +b,"g"),".");this.value=this.value.replace(new RegExp("\\"+a,"g"),".*");this.value=this.value.replace(RegExp("\\\\.\\*","g"),"\\"+a);return this.value=this.value.replace(RegExp("\\\\\\.","g"),"\\"+b)},regex2value:function(){var a=this.value,a=a.replace(/!/g,"!!"),a=a.replace(/(\\)?\\\./g,function(a,c){return c?a:"!."}),a=a.replace(/(\\)?\\\*/g,function(a,c){return c?a:"!*"}),a=a.replace(/\\\\/g,"\\");return a=a.replace(/\.\*/g,"*")},clone:function(){return OpenLayers.Util.extend(new OpenLayers.Filter.Comparison, +this)},CLASS_NAME:"OpenLayers.Filter.Comparison"});OpenLayers.Filter.Comparison.EQUAL_TO="==";OpenLayers.Filter.Comparison.NOT_EQUAL_TO="!=";OpenLayers.Filter.Comparison.LESS_THAN="<";OpenLayers.Filter.Comparison.GREATER_THAN=">";OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO="<=";OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO=">=";OpenLayers.Filter.Comparison.BETWEEN="..";OpenLayers.Filter.Comparison.LIKE="~";OpenLayers.Filter.Comparison.IS_NULL="NULL";OpenLayers.Format.Filter=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",CLASS_NAME:"OpenLayers.Format.Filter"});OpenLayers.Filter.Function=OpenLayers.Class(OpenLayers.Filter,{name:null,params:null,CLASS_NAME:"OpenLayers.Filter.Function"});OpenLayers.Date={dateRegEx:/^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:(?:T(\d{1,2}):(\d{2}):(\d{2}(?:\.\d+)?)(Z|(?:[+-]\d{1,2}(?::(\d{2}))?)))|Z)?$/,toISOString:function(){return"toISOString"in Date.prototype?function(a){return a.toISOString()}:function(a){return isNaN(a.getTime())?"Invalid Date":a.getUTCFullYear()+"-"+OpenLayers.Number.zeroPad(a.getUTCMonth()+1,2)+"-"+OpenLayers.Number.zeroPad(a.getUTCDate(),2)+"T"+OpenLayers.Number.zeroPad(a.getUTCHours(),2)+":"+OpenLayers.Number.zeroPad(a.getUTCMinutes(), +2)+":"+OpenLayers.Number.zeroPad(a.getUTCSeconds(),2)+"."+OpenLayers.Number.zeroPad(a.getUTCMilliseconds(),3)+"Z"}}(),parse:function(a){var b;if((a=a.match(this.dateRegEx))&&(a[1]||a[7])){b=parseInt(a[1],10)||0;var c=parseInt(a[2],10)-1||0,d=parseInt(a[3],10)||1;b=new Date(Date.UTC(b,c,d));if(c=a[7]){var d=parseInt(a[4],10),e=parseInt(a[5],10),f=parseFloat(a[6]),g=f|0;b.setUTCHours(d,e,g,Math.round(1E3*(f-g)));"Z"!==c&&(c=parseInt(c,10),a=parseInt(a[8],10)||0,a=-1E3*(3600*c+60*a),b=new Date(b.getTime()+ +a))}}else b=new Date("invalid");return b}};OpenLayers.Format.Filter.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ogc:"http://www.opengis.net/ogc",gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"ogc",schemaLocation:null,initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){var b={};this.readers.ogc.Filter.apply(this,[a,b]);return b.filter},readers:{ogc:{_expression:function(a){for(var b="",c=a.firstChild;c;c= +c.nextSibling)switch(c.nodeType){case 1:a=this.readNode(c);a.property?b+="${"+a.property+"}":void 0!==a.value&&(b+=a.value);break;case 3:case 4:b+=c.nodeValue}return b},Filter:function(a,b){var c={fids:[],filters:[]};this.readChildNodes(a,c);0<c.fids.length?b.filter=new OpenLayers.Filter.FeatureId({fids:c.fids}):0<c.filters.length&&(b.filter=c.filters[0])},FeatureId:function(a,b){var c=a.getAttribute("fid");c&&b.fids.push(c)},And:function(a,b){var c=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND}); +this.readChildNodes(a,c);b.filters.push(c)},Or:function(a,b){var c=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.OR});this.readChildNodes(a,c);b.filters.push(c)},Not:function(a,b){var c=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.NOT});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLessThan:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LESS_THAN});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsGreaterThan:function(a, +b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.GREATER_THAN});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLessThanOrEqualTo:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsGreaterThanOrEqualTo:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)}, +PropertyIsBetween:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.BETWEEN});this.readChildNodes(a,c);b.filters.push(c)},Literal:function(a,b){b.value=OpenLayers.String.numericIf(this.getChildValue(a),!0)},PropertyName:function(a,b){b.property=this.getChildValue(a)},LowerBoundary:function(a,b){b.lowerBoundary=OpenLayers.String.numericIf(this.readers.ogc._expression.call(this,a),!0)},UpperBoundary:function(a,b){b.upperBoundary=OpenLayers.String.numericIf(this.readers.ogc._expression.call(this, +a),!0)},Intersects:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.INTERSECTS)},Within:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.WITHIN)},Contains:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.CONTAINS)},DWithin:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.DWITHIN)},Distance:function(a,b){b.distance=parseInt(this.getChildValue(a));b.distanceUnits=a.getAttribute("units")},Function:function(a,b){},PropertyIsNull:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.IS_NULL}); +this.readChildNodes(a,c);b.filters.push(c)}}},readSpatial:function(a,b,c){c=new OpenLayers.Filter.Spatial({type:c});this.readChildNodes(a,c);c.value=c.components[0];delete c.components;b.filters.push(c)},encodeLiteral:function(a){a instanceof Date&&(a=OpenLayers.Date.toISOString(a));return a},writeOgcExpression:function(a,b){a instanceof OpenLayers.Filter.Function?this.writeNode("Function",a,b):this.writeNode("Literal",a,b);return b},write:function(a){return this.writers.ogc.Filter.apply(this,[a])}, +writers:{ogc:{Filter:function(a){var b=this.createElementNSPlus("ogc:Filter");this.writeNode(this.getFilterType(a),a,b);return b},_featureIds:function(a){for(var b=this.createDocumentFragment(),c=0,d=a.fids.length;c<d;++c)this.writeNode("ogc:FeatureId",a.fids[c],b);return b},FeatureId:function(a){return this.createElementNSPlus("ogc:FeatureId",{attributes:{fid:a}})},And:function(a){for(var b=this.createElementNSPlus("ogc:And"),c,d=0,e=a.filters.length;d<e;++d)c=a.filters[d],this.writeNode(this.getFilterType(c), +c,b);return b},Or:function(a){for(var b=this.createElementNSPlus("ogc:Or"),c,d=0,e=a.filters.length;d<e;++d)c=a.filters[d],this.writeNode(this.getFilterType(c),c,b);return b},Not:function(a){var b=this.createElementNSPlus("ogc:Not");a=a.filters[0];this.writeNode(this.getFilterType(a),a,b);return b},PropertyIsLessThan:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLessThan");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsGreaterThan:function(a){var b= +this.createElementNSPlus("ogc:PropertyIsGreaterThan");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsLessThanOrEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLessThanOrEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsGreaterThanOrEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsGreaterThanOrEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b); +return b},PropertyIsBetween:function(a){var b=this.createElementNSPlus("ogc:PropertyIsBetween");this.writeNode("PropertyName",a,b);this.writeNode("LowerBoundary",a,b);this.writeNode("UpperBoundary",a,b);return b},PropertyName:function(a){return this.createElementNSPlus("ogc:PropertyName",{value:a.property})},Literal:function(a){return this.createElementNSPlus("ogc:Literal",{value:(this.encodeLiteral||OpenLayers.Format.Filter.v1.prototype.encodeLiteral)(a)})},LowerBoundary:function(a){var b=this.createElementNSPlus("ogc:LowerBoundary"); +this.writeOgcExpression(a.lowerBoundary,b);return b},UpperBoundary:function(a){var b=this.createElementNSPlus("ogc:UpperBoundary");this.writeNode("Literal",a.upperBoundary,b);return b},INTERSECTS:function(a){return this.writeSpatial(a,"Intersects")},WITHIN:function(a){return this.writeSpatial(a,"Within")},CONTAINS:function(a){return this.writeSpatial(a,"Contains")},DWITHIN:function(a){var b=this.writeSpatial(a,"DWithin");this.writeNode("Distance",a,b);return b},Distance:function(a){return this.createElementNSPlus("ogc:Distance", +{attributes:{units:a.distanceUnits},value:a.distance})},Function:function(a){var b=this.createElementNSPlus("ogc:Function",{attributes:{name:a.name}});a=a.params;for(var c=0,d=a.length;c<d;c++)this.writeOgcExpression(a[c],b);return b},PropertyIsNull:function(a){var b=this.createElementNSPlus("ogc:PropertyIsNull");this.writeNode("PropertyName",a,b);return b}}},getFilterType:function(a){var b=this.filterMap[a.type];if(!b)throw"Filter writing not supported for rule type: "+a.type;return b},filterMap:{"&&":"And", +"||":"Or","!":"Not","==":"PropertyIsEqualTo","!=":"PropertyIsNotEqualTo","<":"PropertyIsLessThan",">":"PropertyIsGreaterThan","<=":"PropertyIsLessThanOrEqualTo",">=":"PropertyIsGreaterThanOrEqualTo","..":"PropertyIsBetween","~":"PropertyIsLike",NULL:"PropertyIsNull",BBOX:"BBOX",DWITHIN:"DWITHIN",WITHIN:"WITHIN",CONTAINS:"CONTAINS",INTERSECTS:"INTERSECTS",FID:"_featureIds"},CLASS_NAME:"OpenLayers.Format.Filter.v1"});OpenLayers.Geometry=OpenLayers.Class({id:null,parent:null,bounds:null,initialize:function(){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){this.bounds=this.id=null},clone:function(){return new OpenLayers.Geometry},setBounds:function(a){a&&(this.bounds=a.clone())},clearBounds:function(){this.bounds=null;this.parent&&this.parent.clearBounds()},extendBounds:function(a){this.getBounds()?this.bounds.extend(a):this.setBounds(a)},getBounds:function(){null==this.bounds&&this.calculateBounds(); +return this.bounds},calculateBounds:function(){},distanceTo:function(a,b){},getVertices:function(a){},atPoint:function(a,b,c){var d=!1;null!=this.getBounds()&&null!=a&&(b=null!=b?b:0,c=null!=c?c:0,d=(new OpenLayers.Bounds(this.bounds.left-b,this.bounds.bottom-c,this.bounds.right+b,this.bounds.top+c)).containsLonLat(a));return d},getLength:function(){return 0},getArea:function(){return 0},getCentroid:function(){return null},toString:function(){return OpenLayers.Format&&OpenLayers.Format.WKT?OpenLayers.Format.WKT.prototype.write(new OpenLayers.Feature.Vector(this)): +Object.prototype.toString.call(this)},CLASS_NAME:"OpenLayers.Geometry"});OpenLayers.Geometry.fromWKT=function(a){var b;if(OpenLayers.Format&&OpenLayers.Format.WKT){var c=OpenLayers.Geometry.fromWKT.format;c||(c=new OpenLayers.Format.WKT,OpenLayers.Geometry.fromWKT.format=c);a=c.read(a);if(a instanceof OpenLayers.Feature.Vector)b=a.geometry;else if(OpenLayers.Util.isArray(a)){b=a.length;for(var c=Array(b),d=0;d<b;++d)c[d]=a[d].geometry;b=new OpenLayers.Geometry.Collection(c)}}return b}; +OpenLayers.Geometry.segmentsIntersect=function(a,b,c){var d=c&&c.point;c=c&&c.tolerance;var e=!1,f=a.x1-b.x1,g=a.y1-b.y1,h=a.x2-a.x1,k=a.y2-a.y1,l=b.y2-b.y1,m=b.x2-b.x1,q=l*h-m*k,l=m*g-l*f,g=h*g-k*f;0==q?0==l&&0==g&&(e=!0):(f=l/q,q=g/q,0<=f&&1>=f&&0<=q&&1>=q&&(d?(h=a.x1+f*h,q=a.y1+f*k,e=new OpenLayers.Geometry.Point(h,q)):e=!0));if(c)if(e){if(d)a:for(a=[a,b],b=0;2>b;++b)for(f=a[b],k=1;3>k;++k)if(h=f["x"+k],q=f["y"+k],d=Math.sqrt(Math.pow(h-e.x,2)+Math.pow(q-e.y,2)),d<c){e.x=h;e.y=q;break a}}else a:for(a= +[a,b],b=0;2>b;++b)for(h=a[b],q=a[(b+1)%2],k=1;3>k;++k)if(f={x:h["x"+k],y:h["y"+k]},g=OpenLayers.Geometry.distanceToSegment(f,q),g.distance<c){e=d?new OpenLayers.Geometry.Point(f.x,f.y):!0;break a}return e};OpenLayers.Geometry.distanceToSegment=function(a,b){var c=OpenLayers.Geometry.distanceSquaredToSegment(a,b);c.distance=Math.sqrt(c.distance);return c}; +OpenLayers.Geometry.distanceSquaredToSegment=function(a,b){var c=a.x,d=a.y,e=b.x1,f=b.y1,g=b.x2,h=b.y2,k=g-e,l=h-f,m=(k*(c-e)+l*(d-f))/(Math.pow(k,2)+Math.pow(l,2));0>=m||(1<=m?(e=g,f=h):(e+=m*k,f+=m*l));return{distance:Math.pow(e-c,2)+Math.pow(f-d,2),x:e,y:f,along:m}};OpenLayers.Geometry.Point=OpenLayers.Class(OpenLayers.Geometry,{x:null,y:null,initialize:function(a,b){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.x=parseFloat(a);this.y=parseFloat(b)},clone:function(a){null==a&&(a=new OpenLayers.Geometry.Point(this.x,this.y));OpenLayers.Util.applyDefaults(a,this);return a},calculateBounds:function(){this.bounds=new OpenLayers.Bounds(this.x,this.y,this.x,this.y)},distanceTo:function(a,b){var c=!(b&&!1===b.edge)&&b&&b.details,d,e,f,g,h;a instanceof +OpenLayers.Geometry.Point?(e=this.x,f=this.y,g=a.x,h=a.y,d=Math.sqrt(Math.pow(e-g,2)+Math.pow(f-h,2)),d=c?{x0:e,y0:f,x1:g,y1:h,distance:d}:d):(d=a.distanceTo(this,b),c&&(d={x0:d.x1,y0:d.y1,x1:d.x0,y1:d.y0,distance:d.distance}));return d},equals:function(a){var b=!1;null!=a&&(b=this.x==a.x&&this.y==a.y||isNaN(this.x)&&isNaN(this.y)&&isNaN(a.x)&&isNaN(a.y));return b},toShortString:function(){return this.x+", "+this.y},move:function(a,b){this.x+=a;this.y+=b;this.clearBounds()},rotate:function(a,b){a*= +Math.PI/180;var c=this.distanceTo(b),d=a+Math.atan2(this.y-b.y,this.x-b.x);this.x=b.x+c*Math.cos(d);this.y=b.y+c*Math.sin(d);this.clearBounds()},getCentroid:function(){return new OpenLayers.Geometry.Point(this.x,this.y)},resize:function(a,b,c){this.x=b.x+a*(void 0==c?1:c)*(this.x-b.x);this.y=b.y+a*(this.y-b.y);this.clearBounds();return this},intersects:function(a){var b=!1;return b="OpenLayers.Geometry.Point"==a.CLASS_NAME?this.equals(a):a.intersects(this)},transform:function(a,b){a&&b&&(OpenLayers.Projection.transform(this, +a,b),this.bounds=null);return this},getVertices:function(a){return[this]},CLASS_NAME:"OpenLayers.Geometry.Point"});OpenLayers.Geometry.Collection=OpenLayers.Class(OpenLayers.Geometry,{components:null,componentTypes:null,initialize:function(a){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.components=[];null!=a&&this.addComponents(a)},destroy:function(){this.components.length=0;this.components=null;OpenLayers.Geometry.prototype.destroy.apply(this,arguments)},clone:function(){for(var a=eval("new "+this.CLASS_NAME+"()"),b=0,c=this.components.length;b<c;b++)a.addComponent(this.components[b].clone()); +OpenLayers.Util.applyDefaults(a,this);return a},getComponentsString:function(){for(var a=[],b=0,c=this.components.length;b<c;b++)a.push(this.components[b].toShortString());return a.join(",")},calculateBounds:function(){this.bounds=null;var a=new OpenLayers.Bounds,b=this.components;if(b)for(var c=0,d=b.length;c<d;c++)a.extend(b[c].getBounds());null!=a.left&&null!=a.bottom&&null!=a.right&&null!=a.top&&this.setBounds(a)},addComponents:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=0,c=a.length;b< +c;b++)this.addComponent(a[b])},addComponent:function(a,b){var c=!1;if(a&&(null==this.componentTypes||-1<OpenLayers.Util.indexOf(this.componentTypes,a.CLASS_NAME))){if(null!=b&&b<this.components.length){var c=this.components.slice(0,b),d=this.components.slice(b,this.components.length);c.push(a);this.components=c.concat(d)}else this.components.push(a);a.parent=this;this.clearBounds();c=!0}return c},removeComponents:function(a){var b=!1;OpenLayers.Util.isArray(a)||(a=[a]);for(var c=a.length-1;0<=c;--c)b= +this.removeComponent(a[c])||b;return b},removeComponent:function(a){OpenLayers.Util.removeItem(this.components,a);this.clearBounds();return!0},getLength:function(){for(var a=0,b=0,c=this.components.length;b<c;b++)a+=this.components[b].getLength();return a},getArea:function(){for(var a=0,b=0,c=this.components.length;b<c;b++)a+=this.components[b].getArea();return a},getGeodesicArea:function(a){for(var b=0,c=0,d=this.components.length;c<d;c++)b+=this.components[c].getGeodesicArea(a);return b},getCentroid:function(a){if(!a)return this.components.length&& +this.components[0].getCentroid();a=this.components.length;if(!a)return!1;for(var b=[],c=[],d=0,e=Number.MAX_VALUE,f,g=0;g<a;++g){f=this.components[g];var h=f.getArea();f=f.getCentroid(!0);isNaN(h)||isNaN(f.x)||isNaN(f.y)||(b.push(h),d+=h,e=h<e&&0<h?h:e,c.push(f))}a=b.length;if(0===d){for(g=0;g<a;++g)b[g]=1;d=b.length}else{for(g=0;g<a;++g)b[g]/=e;d/=e}for(var k=e=0,g=0;g<a;++g)f=c[g],h=b[g],e+=f.x*h,k+=f.y*h;return new OpenLayers.Geometry.Point(e/d,k/d)},getGeodesicLength:function(a){for(var b=0,c= +0,d=this.components.length;c<d;c++)b+=this.components[c].getGeodesicLength(a);return b},move:function(a,b){for(var c=0,d=this.components.length;c<d;c++)this.components[c].move(a,b)},rotate:function(a,b){for(var c=0,d=this.components.length;c<d;++c)this.components[c].rotate(a,b)},resize:function(a,b,c){for(var d=0;d<this.components.length;++d)this.components[d].resize(a,b,c);return this},distanceTo:function(a,b){for(var c=!(b&&!1===b.edge)&&b&&b.details,d,e,f,g=Number.POSITIVE_INFINITY,h=0,k=this.components.length;h< +k&&!(d=this.components[h].distanceTo(a,b),f=c?d.distance:d,f<g&&(g=f,e=d,0==g));++h);return e},equals:function(a){var b=!0;if(a&&a.CLASS_NAME&&this.CLASS_NAME==a.CLASS_NAME)if(OpenLayers.Util.isArray(a.components)&&a.components.length==this.components.length)for(var c=0,d=this.components.length;c<d;++c){if(!this.components[c].equals(a.components[c])){b=!1;break}}else b=!1;else b=!1;return b},transform:function(a,b){if(a&&b){for(var c=0,d=this.components.length;c<d;c++)this.components[c].transform(a, +b);this.bounds=null}return this},intersects:function(a){for(var b=!1,c=0,d=this.components.length;c<d&&!(b=a.intersects(this.components[c]));++c);return b},getVertices:function(a){for(var b=[],c=0,d=this.components.length;c<d;++c)Array.prototype.push.apply(b,this.components[c].getVertices(a));return b},CLASS_NAME:"OpenLayers.Geometry.Collection"});OpenLayers.Geometry.MultiPoint=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Point"],addPoint:function(a,b){this.addComponent(a,b)},removePoint:function(a){this.removeComponent(a)},CLASS_NAME:"OpenLayers.Geometry.MultiPoint"});OpenLayers.Geometry.Curve=OpenLayers.Class(OpenLayers.Geometry.MultiPoint,{componentTypes:["OpenLayers.Geometry.Point"],getLength:function(){var a=0;if(this.components&&1<this.components.length)for(var b=1,c=this.components.length;b<c;b++)a+=this.components[b-1].distanceTo(this.components[b]);return a},getGeodesicLength:function(a){var b=this;if(a){var c=new OpenLayers.Projection("EPSG:4326");c.equals(a)||(b=this.clone().transform(a,c))}a=0;if(b.components&&1<b.components.length)for(var d,e=1,f=b.components.length;e< +f;e++)c=b.components[e-1],d=b.components[e],a+=OpenLayers.Util.distVincenty({lon:c.x,lat:c.y},{lon:d.x,lat:d.y});return 1E3*a},CLASS_NAME:"OpenLayers.Geometry.Curve"});OpenLayers.Geometry.LineString=OpenLayers.Class(OpenLayers.Geometry.Curve,{removeComponent:function(a){var b=this.components&&2<this.components.length;b&&OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);return b},intersects:function(a){var b=!1,c=a.CLASS_NAME;if("OpenLayers.Geometry.LineString"==c||"OpenLayers.Geometry.LinearRing"==c||"OpenLayers.Geometry.Point"==c){var d=this.getSortedSegments();a="OpenLayers.Geometry.Point"==c?[{x1:a.x,y1:a.y,x2:a.x,y2:a.y}]:a.getSortedSegments(); +var e,f,g,h,k,l,m,q=0,n=d.length;a:for(;q<n;++q){c=d[q];e=c.x1;f=c.x2;g=c.y1;h=c.y2;var p=0,r=a.length;for(;p<r;++p){k=a[p];if(k.x1>f)break;if(!(k.x2<e||(l=k.y1,m=k.y2,Math.min(l,m)>Math.max(g,h)||Math.max(l,m)<Math.min(g,h)||!OpenLayers.Geometry.segmentsIntersect(c,k)))){b=!0;break a}}}}else b=a.intersects(this);return b},getSortedSegments:function(){for(var a=this.components.length-1,b=Array(a),c,d,e=0;e<a;++e)c=this.components[e],d=this.components[e+1],b[e]=c.x<d.x?{x1:c.x,y1:c.y,x2:d.x,y2:d.y}: +{x1:d.x,y1:d.y,x2:c.x,y2:c.y};return b.sort(function(a,b){return a.x1-b.x1})},splitWithSegment:function(a,b){for(var c=!(b&&!1===b.edge),d=b&&b.tolerance,e=[],f=this.getVertices(),g=[],h=[],k=!1,l,m,q,n={point:!0,tolerance:d},p=null,r=0,t=f.length-2;r<=t;++r)if(d=f[r],g.push(d.clone()),l=f[r+1],m={x1:d.x,y1:d.y,x2:l.x,y2:l.y},m=OpenLayers.Geometry.segmentsIntersect(a,m,n),m instanceof OpenLayers.Geometry.Point&&((q=m.x===a.x1&&m.y===a.y1||m.x===a.x2&&m.y===a.y2||m.equals(d)||m.equals(l)?!0:!1)||c))m.equals(h[h.length- +1])||h.push(m.clone()),0===r&&m.equals(d)||m.equals(l)||(k=!0,m.equals(d)||g.push(m),e.push(new OpenLayers.Geometry.LineString(g)),g=[m.clone()]);k&&(g.push(l.clone()),e.push(new OpenLayers.Geometry.LineString(g)));if(0<h.length)var u=a.x1<a.x2?1:-1,v=a.y1<a.y2?1:-1,p={lines:e,points:h.sort(function(a,b){return u*a.x-u*b.x||v*a.y-v*b.y})};return p},split:function(a,b){var c=null,d=b&&b.mutual,e,f,g,h;if(a instanceof OpenLayers.Geometry.LineString){var k=this.getVertices(),l,m,q,n,p,r=[];g=[];for(var t= +0,u=k.length-2;t<=u;++t){l=k[t];m=k[t+1];q={x1:l.x,y1:l.y,x2:m.x,y2:m.y};h=h||[a];d&&r.push(l.clone());for(var v=0;v<h.length;++v)if(n=h[v].splitWithSegment(q,b))if(p=n.lines,0<p.length&&(p.unshift(v,1),Array.prototype.splice.apply(h,p),v+=p.length-2),d)for(var w=0,x=n.points.length;w<x;++w)p=n.points[w],p.equals(l)||(r.push(p),g.push(new OpenLayers.Geometry.LineString(r)),r=p.equals(m)?[]:[p.clone()])}d&&0<g.length&&0<r.length&&(r.push(m.clone()),g.push(new OpenLayers.Geometry.LineString(r)))}else c= +a.splitWith(this,b);h&&1<h.length?f=!0:h=[];g&&1<g.length?e=!0:g=[];if(f||e)c=d?[g,h]:h;return c},splitWith:function(a,b){return a.split(this,b)},getVertices:function(a){return!0===a?[this.components[0],this.components[this.components.length-1]]:!1===a?this.components.slice(1,this.components.length-1):this.components.slice()},distanceTo:function(a,b){var c=!(b&&!1===b.edge)&&b&&b.details,d,e={},f=Number.POSITIVE_INFINITY;if(a instanceof OpenLayers.Geometry.Point){for(var g=this.getSortedSegments(), +h=a.x,k=a.y,l,m=0,q=g.length;m<q;++m)if(l=g[m],d=OpenLayers.Geometry.distanceToSegment(a,l),d.distance<f){if(f=d.distance,e=d,0===f)break}else if(l.x2>h&&(k>l.y1&&k<l.y2||k<l.y1&&k>l.y2))break;e=c?{distance:e.distance,x0:e.x,y0:e.y,x1:h,y1:k}:e.distance}else if(a instanceof OpenLayers.Geometry.LineString){var g=this.getSortedSegments(),h=a.getSortedSegments(),n,p,r=h.length,t={point:!0},m=0,q=g.length;a:for(;m<q;++m){k=g[m];l=k.x1;p=k.y1;for(var u=0;u<r;++u)if(d=h[u],n=OpenLayers.Geometry.segmentsIntersect(k, +d,t)){f=0;e={distance:0,x0:n.x,y0:n.y,x1:n.x,y1:n.y};break a}else d=OpenLayers.Geometry.distanceToSegment({x:l,y:p},d),d.distance<f&&(f=d.distance,e={distance:f,x0:l,y0:p,x1:d.x,y1:d.y})}c||(e=e.distance);0!==f&&k&&(d=a.distanceTo(new OpenLayers.Geometry.Point(k.x2,k.y2),b),m=c?d.distance:d,m<f&&(e=c?{distance:f,x0:d.x1,y0:d.y1,x1:d.x0,y1:d.y0}:m))}else e=a.distanceTo(this,b),c&&(e={distance:e.distance,x0:e.x1,y0:e.y1,x1:e.x0,y1:e.y0});return e},simplify:function(a){if(this&&null!==this){var b=this.getVertices(); +if(3>b.length)return this;var c=function(a,b,d,k){for(var l=0,m=0,q=b,n;q<d;q++){n=a[b];var p=a[d],r=a[q];n=Math.abs(.5*(n.x*p.y+p.x*r.y+r.x*n.y-p.x*n.y-r.x*p.y-n.x*r.y))/Math.sqrt(Math.pow(n.x-p.x,2)+Math.pow(n.y-p.y,2))*2;n>l&&(l=n,m=q)}l>k&&m!=b&&(e.push(m),c(a,b,m,k),c(a,m,d,k))},d=b.length-1,e=[];e.push(0);for(e.push(d);b[0].equals(b[d]);)d--,e.push(d);c(b,0,d,a);a=[];e.sort(function(a,b){return a-b});for(d=0;d<e.length;d++)a.push(b[e[d]]);return new OpenLayers.Geometry.LineString(a)}return this}, +CLASS_NAME:"OpenLayers.Geometry.LineString"});OpenLayers.Geometry.MultiLineString=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LineString"],split:function(a,b){for(var c=null,d=b&&b.mutual,e,f,g,h,k=[],l=[a],m=0,q=this.components.length;m<q;++m){f=this.components[m];g=!1;for(var n=0;n<l.length;++n)if(e=f.split(l[n],b)){if(d){g=e[0];for(var p=0,r=g.length;p<r;++p)0===p&&k.length?k[k.length-1].addComponent(g[p]):k.push(new OpenLayers.Geometry.MultiLineString([g[p]]));g=!0;e=e[1]}if(e.length){e.unshift(n, +1);Array.prototype.splice.apply(l,e);break}}g||(k.length?k[k.length-1].addComponent(f.clone()):k=[new OpenLayers.Geometry.MultiLineString(f.clone())])}k&&1<k.length?g=!0:k=[];l&&1<l.length?h=!0:l=[];if(g||h)c=d?[k,l]:l;return c},splitWith:function(a,b){var c=null,d=b&&b.mutual,e,f,g,h,k,l;if(a instanceof OpenLayers.Geometry.LineString){l=[];k=[a];for(var m=0,q=this.components.length;m<q;++m){g=!1;f=this.components[m];for(var n=0;n<k.length;++n)if(e=k[n].split(f,b)){d&&(g=e[0],g.length&&(g.unshift(n, +1),Array.prototype.splice.apply(k,g),n+=g.length-2),e=e[1],0===e.length&&(e=[f.clone()]));g=0;for(var p=e.length;g<p;++g)0===g&&l.length?l[l.length-1].addComponent(e[g]):l.push(new OpenLayers.Geometry.MultiLineString([e[g]]));g=!0}g||(l.length?l[l.length-1].addComponent(f.clone()):l=[new OpenLayers.Geometry.MultiLineString([f.clone()])])}}else c=a.split(this);k&&1<k.length?h=!0:k=[];l&&1<l.length?g=!0:l=[];if(h||g)c=d?[k,l]:l;return c},CLASS_NAME:"OpenLayers.Geometry.MultiLineString"});OpenLayers.Geometry.LinearRing=OpenLayers.Class(OpenLayers.Geometry.LineString,{componentTypes:["OpenLayers.Geometry.Point"],addComponent:function(a,b){var c=!1,d=this.components.pop();null==b&&a.equals(d)||(c=OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,arguments));OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[this.components[0]]);return c},removeComponent:function(a){var b=this.components&&3<this.components.length;b&&(this.components.pop(),OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this, +arguments),OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[this.components[0]]));return b},move:function(a,b){for(var c=0,d=this.components.length;c<d-1;c++)this.components[c].move(a,b)},rotate:function(a,b){for(var c=0,d=this.components.length;c<d-1;++c)this.components[c].rotate(a,b)},resize:function(a,b,c){for(var d=0,e=this.components.length;d<e-1;++d)this.components[d].resize(a,b,c);return this},transform:function(a,b){if(a&&b){for(var c=0,d=this.components.length;c<d-1;c++)this.components[c].transform(a, +b);this.bounds=null}return this},getCentroid:function(){if(this.components){var a=this.components.length;if(0<a&&2>=a)return this.components[0].clone();if(2<a){var b=0,c=0,d=this.components[0].x,e=this.components[0].y,f=-1*this.getArea();if(0!=f){for(var g=0;g<a-1;g++)var h=this.components[g],k=this.components[g+1],b=b+(h.x+k.x-2*d)*((h.x-d)*(k.y-e)-(k.x-d)*(h.y-e)),c=c+(h.y+k.y-2*e)*((h.x-d)*(k.y-e)-(k.x-d)*(h.y-e));b=d+b/(6*f);a=e+c/(6*f)}else{for(g=0;g<a-1;g++)b+=this.components[g].x,c+=this.components[g].y; +b/=a-1;a=c/(a-1)}return new OpenLayers.Geometry.Point(b,a)}return null}},getArea:function(){var a=0;if(this.components&&2<this.components.length){for(var b=a=0,c=this.components.length;b<c-1;b++)var d=this.components[b],e=this.components[b+1],a=a+(d.x+e.x)*(e.y-d.y);a=-a/2}return a},getGeodesicArea:function(a){var b=this;if(a){var c=new OpenLayers.Projection("EPSG:4326");c.equals(a)||(b=this.clone().transform(a,c))}a=0;c=b.components&&b.components.length;if(2<c){for(var d,e,f=0;f<c-1;f++)d=b.components[f], +e=b.components[f+1],a+=OpenLayers.Util.rad(e.x-d.x)*(2+Math.sin(OpenLayers.Util.rad(d.y))+Math.sin(OpenLayers.Util.rad(e.y)));a=40680631590769*a/2}return a},containsPoint:function(a){var b=OpenLayers.Number.limitSigDigs,c=b(a.x,14);a=b(a.y,14);for(var d=this.components.length-1,e,f,g,h,k,l=0,m=0;m<d;++m)if(e=this.components[m],g=b(e.x,14),e=b(e.y,14),f=this.components[m+1],h=b(f.x,14),f=b(f.y,14),e==f){if(a==e&&(g<=h&&c>=g&&c<=h||g>=h&&c<=g&&c>=h)){l=-1;break}}else{k=b((h-g)/(f-e)*(a-f)+h,14);if(k== +c&&(e<f&&a>=e&&a<=f||e>f&&a<=e&&a>=f)){l=-1;break}k<=c||g!=h&&(k<Math.min(g,h)||k>Math.max(g,h))||(e<f&&a>=e&&a<f||e>f&&a<e&&a>=f)&&++l}return-1==l?1:!!(l&1)},intersects:function(a){var b=!1;if("OpenLayers.Geometry.Point"==a.CLASS_NAME)b=this.containsPoint(a);else if("OpenLayers.Geometry.LineString"==a.CLASS_NAME)b=a.intersects(this);else if("OpenLayers.Geometry.LinearRing"==a.CLASS_NAME)b=OpenLayers.Geometry.LineString.prototype.intersects.apply(this,[a]);else for(var c=0,d=a.components.length;c< +d&&!(b=a.components[c].intersects(this));++c);return b},getVertices:function(a){return!0===a?[]:this.components.slice(0,this.components.length-1)},CLASS_NAME:"OpenLayers.Geometry.LinearRing"});OpenLayers.Geometry.Polygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LinearRing"],getArea:function(){var a=0;if(this.components&&0<this.components.length)for(var a=a+Math.abs(this.components[0].getArea()),b=1,c=this.components.length;b<c;b++)a-=Math.abs(this.components[b].getArea());return a},getGeodesicArea:function(a){var b=0;if(this.components&&0<this.components.length)for(var b=b+Math.abs(this.components[0].getGeodesicArea(a)),c=1,d=this.components.length;c< +d;c++)b-=Math.abs(this.components[c].getGeodesicArea(a));return b},containsPoint:function(a){var b=this.components.length,c=!1;if(0<b&&(c=this.components[0].containsPoint(a),1!==c&&c&&1<b))for(var d,e=1;e<b;++e)if(d=this.components[e].containsPoint(a)){c=1===d?1:!1;break}return c},intersects:function(a){var b=!1,c,d;if("OpenLayers.Geometry.Point"==a.CLASS_NAME)b=this.containsPoint(a);else if("OpenLayers.Geometry.LineString"==a.CLASS_NAME||"OpenLayers.Geometry.LinearRing"==a.CLASS_NAME){c=0;for(d= +this.components.length;c<d&&!(b=a.intersects(this.components[c]));++c);if(!b)for(c=0,d=a.components.length;c<d&&!(b=this.containsPoint(a.components[c]));++c);}else for(c=0,d=a.components.length;c<d&&!(b=this.intersects(a.components[c]));++c);if(!b&&"OpenLayers.Geometry.Polygon"==a.CLASS_NAME){var e=this.components[0];c=0;for(d=e.components.length;c<d&&!(b=a.containsPoint(e.components[c]));++c);}return b},distanceTo:function(a,b){return b&&!1===b.edge&&this.intersects(a)?0:OpenLayers.Geometry.Collection.prototype.distanceTo.apply(this, +[a,b])},CLASS_NAME:"OpenLayers.Geometry.Polygon"});OpenLayers.Geometry.Polygon.createRegularPolygon=function(a,b,c,d){var e=Math.PI*(1/c-.5);d&&(e+=d/180*Math.PI);for(var f,g=[],h=0;h<c;++h)f=e+2*h*Math.PI/c,d=a.x+b*Math.cos(f),f=a.y+b*Math.sin(f),g.push(new OpenLayers.Geometry.Point(d,f));a=new OpenLayers.Geometry.LinearRing(g);return new OpenLayers.Geometry.Polygon([a])};OpenLayers.Geometry.MultiPolygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Polygon"],CLASS_NAME:"OpenLayers.Geometry.MultiPolygon"});OpenLayers.Format.GML=OpenLayers.Class(OpenLayers.Format.XML,{featureNS:"http://mapserver.gis.umn.edu/mapserver",featurePrefix:"feature",featureName:"featureMember",layerName:"features",geometryName:"geometry",collectionName:"FeatureCollection",gmlns:"http://www.opengis.net/gml",extractAttributes:!0,xy:!0,initialize:function(a){this.regExes={trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g};OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){"string"== +typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a=this.getElementsByTagNameNS(a.documentElement,this.gmlns,this.featureName);for(var b=[],c=0;c<a.length;c++){var d=this.parseFeature(a[c]);d&&b.push(d)}return b},parseFeature:function(a){for(var b="MultiPolygon Polygon MultiLineString LineString MultiPoint Point Envelope".split(" "),c,d,e,f=0;f<b.length;++f)if(c=b[f],d=this.getElementsByTagNameNS(a,this.gmlns,c),0<d.length){if(e=this.parseGeometry[c.toLowerCase()])e=e.apply(this, +[d[0]]),this.internalProjection&&this.externalProjection&&e.transform(this.externalProjection,this.internalProjection);else throw new TypeError("Unsupported geometry type: "+c);break}var g;c=this.getElementsByTagNameNS(a,this.gmlns,"Box");for(f=0;f<c.length;++f)b=c[f],d=this.parseGeometry.box.apply(this,[b]),b=b.parentNode,"boundedBy"===(b.localName||b.nodeName.split(":").pop())?g=d:e=d.toGeometry();var h;this.extractAttributes&&(h=this.parseAttributes(a));h=new OpenLayers.Feature.Vector(e,h);h.bounds= +g;h.gml={featureType:a.firstChild.nodeName.split(":")[1],featureNS:a.firstChild.namespaceURI,featureNSPrefix:a.firstChild.prefix};a=a.firstChild;for(var k;a&&(1!=a.nodeType||!(k=a.getAttribute("fid")||a.getAttribute("id")));)a=a.nextSibling;h.fid=k;return h},parseGeometry:{point:function(a){var b,c;c=[];b=this.getElementsByTagNameNS(a,this.gmlns,"pos");0<b.length&&(c=b[0].firstChild.nodeValue,c=c.replace(this.regExes.trimSpace,""),c=c.split(this.regExes.splitSpace));0==c.length&&(b=this.getElementsByTagNameNS(a, +this.gmlns,"coordinates"),0<b.length&&(c=b[0].firstChild.nodeValue,c=c.replace(this.regExes.removeSpace,""),c=c.split(",")));0==c.length&&(b=this.getElementsByTagNameNS(a,this.gmlns,"coord"),0<b.length&&(a=this.getElementsByTagNameNS(b[0],this.gmlns,"X"),b=this.getElementsByTagNameNS(b[0],this.gmlns,"Y"),0<a.length&&0<b.length&&(c=[a[0].firstChild.nodeValue,b[0].firstChild.nodeValue])));2==c.length&&(c[2]=null);return this.xy?new OpenLayers.Geometry.Point(c[0],c[1],c[2]):new OpenLayers.Geometry.Point(c[1], +c[0],c[2])},multipoint:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"Point");var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.point.apply(this,[a[d]]))&&b.push(c);return new OpenLayers.Geometry.MultiPoint(b)},linestring:function(a,b){var c,d;d=[];var e=[];c=this.getElementsByTagNameNS(a,this.gmlns,"posList");if(0<c.length){d=this.getChildValue(c[0]);d=d.replace(this.regExes.trimSpace,"");d=d.split(this.regExes.splitSpace);var f=parseInt(c[0].getAttribute("dimension")), +g,h,k;for(c=0;c<d.length/f;++c)g=c*f,h=d[g],k=d[g+1],g=2==f?null:d[g+2],this.xy?e.push(new OpenLayers.Geometry.Point(h,k,g)):e.push(new OpenLayers.Geometry.Point(k,h,g))}if(0==d.length&&(c=this.getElementsByTagNameNS(a,this.gmlns,"coordinates"),0<c.length))for(d=this.getChildValue(c[0]),d=d.replace(this.regExes.trimSpace,""),d=d.replace(this.regExes.trimComma,","),f=d.split(this.regExes.splitSpace),c=0;c<f.length;++c)d=f[c].split(","),2==d.length&&(d[2]=null),this.xy?e.push(new OpenLayers.Geometry.Point(d[0], +d[1],d[2])):e.push(new OpenLayers.Geometry.Point(d[1],d[0],d[2]));d=null;0!=e.length&&(d=b?new OpenLayers.Geometry.LinearRing(e):new OpenLayers.Geometry.LineString(e));return d},multilinestring:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"LineString");var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.linestring.apply(this,[a[d]]))&&b.push(c);return new OpenLayers.Geometry.MultiLineString(b)},polygon:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"LinearRing"); +var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.linestring.apply(this,[a[d],!0]))&&b.push(c);return new OpenLayers.Geometry.Polygon(b)},multipolygon:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"Polygon");var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.polygon.apply(this,[a[d]]))&&b.push(c);return new OpenLayers.Geometry.MultiPolygon(b)},envelope:function(a){var b=[],c,d,e=this.getElementsByTagNameNS(a,this.gmlns,"lowerCorner");if(0<e.length){c= +[];0<e.length&&(c=e[0].firstChild.nodeValue,c=c.replace(this.regExes.trimSpace,""),c=c.split(this.regExes.splitSpace));2==c.length&&(c[2]=null);var f=this.xy?new OpenLayers.Geometry.Point(c[0],c[1],c[2]):new OpenLayers.Geometry.Point(c[1],c[0],c[2])}a=this.getElementsByTagNameNS(a,this.gmlns,"upperCorner");if(0<a.length){c=[];0<a.length&&(c=a[0].firstChild.nodeValue,c=c.replace(this.regExes.trimSpace,""),c=c.split(this.regExes.splitSpace));2==c.length&&(c[2]=null);var g=this.xy?new OpenLayers.Geometry.Point(c[0], +c[1],c[2]):new OpenLayers.Geometry.Point(c[1],c[0],c[2])}f&&g&&(b.push(new OpenLayers.Geometry.Point(f.x,f.y)),b.push(new OpenLayers.Geometry.Point(g.x,f.y)),b.push(new OpenLayers.Geometry.Point(g.x,g.y)),b.push(new OpenLayers.Geometry.Point(f.x,g.y)),b.push(new OpenLayers.Geometry.Point(f.x,f.y)),b=new OpenLayers.Geometry.LinearRing(b),d=new OpenLayers.Geometry.Polygon([b]));return d},box:function(a){var b=this.getElementsByTagNameNS(a,this.gmlns,"coordinates"),c=a=null;0<b.length&&(b=b[0].firstChild.nodeValue, +b=b.split(" "),2==b.length&&(a=b[0].split(","),c=b[1].split(",")));if(null!==a&&null!==c)return new OpenLayers.Bounds(parseFloat(a[0]),parseFloat(a[1]),parseFloat(c[0]),parseFloat(c[1]))}},parseAttributes:function(a){var b={};a=a.firstChild;for(var c,d,e;a;){if(1==a.nodeType){a=a.childNodes;for(c=0;c<a.length;++c)if(d=a[c],1==d.nodeType)if(e=d.childNodes,1==e.length){if(e=e[0],3==e.nodeType||4==e.nodeType)d=d.prefix?d.nodeName.split(":")[1]:d.nodeName,e=e.nodeValue.replace(this.regExes.trimSpace, +""),b[d]=e}else b[d.nodeName.split(":").pop()]=null;break}a=a.nextSibling}return b},write:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=this.createElementNS("http://www.opengis.net/wfs","wfs:"+this.collectionName),c=0;c<a.length;c++)b.appendChild(this.createFeatureXML(a[c]));return OpenLayers.Format.XML.prototype.write.apply(this,[b])},createFeatureXML:function(a){var b=this.buildGeometryNode(a.geometry),c=this.createElementNS(this.featureNS,this.featurePrefix+":"+this.geometryName);c.appendChild(b); +var b=this.createElementNS(this.gmlns,"gml:"+this.featureName),d=this.createElementNS(this.featureNS,this.featurePrefix+":"+this.layerName);d.setAttribute("fid",a.fid||a.id);d.appendChild(c);for(var e in a.attributes){var c=this.createTextNode(a.attributes[e]),f=e.substring(e.lastIndexOf(":")+1),f=this.createElementNS(this.featureNS,this.featurePrefix+":"+f);f.appendChild(c);d.appendChild(f)}b.appendChild(d);return b},buildGeometryNode:function(a){this.externalProjection&&this.internalProjection&& +(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));var b=a.CLASS_NAME,b=b.substring(b.lastIndexOf(".")+1);return this.buildGeometry[b.toLowerCase()].apply(this,[a])},buildGeometry:{point:function(a){var b=this.createElementNS(this.gmlns,"gml:Point");b.appendChild(this.buildCoordinatesNode(a));return b},multipoint:function(a){var b=this.createElementNS(this.gmlns,"gml:MultiPoint");a=a.components;for(var c,d,e=0;e<a.length;e++)c=this.createElementNS(this.gmlns,"gml:pointMember"), +d=this.buildGeometry.point.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},linestring:function(a){var b=this.createElementNS(this.gmlns,"gml:LineString");b.appendChild(this.buildCoordinatesNode(a));return b},multilinestring:function(a){var b=this.createElementNS(this.gmlns,"gml:MultiLineString");a=a.components;for(var c,d,e=0;e<a.length;++e)c=this.createElementNS(this.gmlns,"gml:lineStringMember"),d=this.buildGeometry.linestring.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c); +return b},linearring:function(a){var b=this.createElementNS(this.gmlns,"gml:LinearRing");b.appendChild(this.buildCoordinatesNode(a));return b},polygon:function(a){var b=this.createElementNS(this.gmlns,"gml:Polygon");a=a.components;for(var c,d,e=0;e<a.length;++e)c=0==e?"outerBoundaryIs":"innerBoundaryIs",c=this.createElementNS(this.gmlns,"gml:"+c),d=this.buildGeometry.linearring.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},multipolygon:function(a){var b=this.createElementNS(this.gmlns, +"gml:MultiPolygon");a=a.components;for(var c,d,e=0;e<a.length;++e)c=this.createElementNS(this.gmlns,"gml:polygonMember"),d=this.buildGeometry.polygon.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},bounds:function(a){var b=this.createElementNS(this.gmlns,"gml:Box");b.appendChild(this.buildCoordinatesNode(a));return b}},buildCoordinatesNode:function(a){var b=this.createElementNS(this.gmlns,"gml:coordinates");b.setAttribute("decimal",".");b.setAttribute("cs",",");b.setAttribute("ts", +" ");var c=[];if(a instanceof OpenLayers.Bounds)c.push(a.left+","+a.bottom),c.push(a.right+","+a.top);else{a=a.components?a.components:[a];for(var d=0;d<a.length;d++)c.push(a[d].x+","+a[d].y)}c=this.createTextNode(c.join(" "));b.appendChild(c);return b},CLASS_NAME:"OpenLayers.Format.GML"});OpenLayers.Format.GML||(OpenLayers.Format.GML={}); +OpenLayers.Format.GML.Base=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",wfs:"http://www.opengis.net/wfs"},defaultPrefix:"gml",schemaLocation:null,featureType:null,featureNS:null,geometryName:"geometry",extractAttributes:!0,srsName:null,xy:!0,geometryTypes:null,singleFeatureType:null,regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g,featureMember:/^(.*:)?featureMembers?$/}, +initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);this.setGeometryTypes();a&&a.featureNS&&this.setNamespace("feature",a.featureNS);this.singleFeatureType=!a||"string"===typeof a.featureType},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b=[];this.readNode(a,{features:b},!0);if(0==b.length){var c=this.getElementsByTagNameNS(a,this.namespaces.gml,"featureMember");if(c.length){a= +0;for(var d=c.length;a<d;++a)this.readNode(c[a],{features:b},!0)}else c=this.getElementsByTagNameNS(a,this.namespaces.gml,"featureMembers"),c.length&&this.readNode(c[0],{features:b},!0)}return b},readNode:function(a,b,c){!0===c&&!0===this.autoConfig&&(this.featureType=null,delete this.namespaceAlias[this.featureNS],delete this.namespaces.feature,this.featureNS=null);this.featureNS||a.prefix in this.namespaces||a.parentNode.namespaceURI!=this.namespaces.gml||!this.regExes.featureMember.test(a.parentNode.nodeName)|| +(this.featureType=a.nodeName.split(":").pop(),this.setNamespace("feature",a.namespaceURI),this.featureNS=a.namespaceURI,this.autoConfig=!0);return OpenLayers.Format.XML.prototype.readNode.apply(this,[a,b])},readers:{gml:{_inherit:function(a,b,c){},featureMember:function(a,b){this.readChildNodes(a,b)},featureMembers:function(a,b){this.readChildNodes(a,b)},name:function(a,b){b.name=this.getChildValue(a)},boundedBy:function(a,b){var c={};this.readChildNodes(a,c);c.components&&0<c.components.length&& +(b.bounds=c.components[0])},Point:function(a,b){var c={points:[]};this.readChildNodes(a,c);b.components||(b.components=[]);b.components.push(c.points[0])},coordinates:function(a,b){for(var c=this.getChildValue(a).replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),c=c.split(this.regExes.splitSpace),d,e=c.length,f=Array(e),g=0;g<e;++g)d=c[g].split(","),f[g]=this.xy?new OpenLayers.Geometry.Point(d[0],d[1],d[2]):new OpenLayers.Geometry.Point(d[1],d[0],d[2]);b.points=f},coord:function(a, +b){var c={};this.readChildNodes(a,c);b.points||(b.points=[]);b.points.push(new OpenLayers.Geometry.Point(c.x,c.y,c.z))},X:function(a,b){b.x=this.getChildValue(a)},Y:function(a,b){b.y=this.getChildValue(a)},Z:function(a,b){b.z=this.getChildValue(a)},MultiPoint:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.MultiPoint(c.components)]},pointMember:function(a,b){this.readChildNodes(a,b)},LineString:function(a, +b){var c={};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components||(b.components=[]);b.components.push(new OpenLayers.Geometry.LineString(c.points))},MultiLineString:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.MultiLineString(c.components)]},lineStringMember:function(a,b){this.readChildNodes(a,b)},Polygon:function(a,b){var c={outer:null,inner:[]};this.readers.gml._inherit.apply(this, +[a,c,b]);this.readChildNodes(a,c);c.inner.unshift(c.outer);b.components||(b.components=[]);b.components.push(new OpenLayers.Geometry.Polygon(c.inner))},LinearRing:function(a,b){var c={};this.readers.gml._inherit.apply(this,[a,c]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.LinearRing(c.points)]},MultiPolygon:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.MultiPolygon(c.components)]}, +polygonMember:function(a,b){this.readChildNodes(a,b)},GeometryCollection:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.Collection(c.components)]},geometryMember:function(a,b){this.readChildNodes(a,b)}},feature:{"*":function(a,b){var c,d=a.localName||a.nodeName.split(":").pop();b.features?this.singleFeatureType||-1===OpenLayers.Util.indexOf(this.featureType,d)?d===this.featureType&&(c="_typeName"):c= +"_typeName":0==a.childNodes.length||1==a.childNodes.length&&3==a.firstChild.nodeType?this.extractAttributes&&(c="_attribute"):c="_geometry";c&&this.readers.feature[c].apply(this,[a,b])},_typeName:function(a,b){var c={components:[],attributes:{}};this.readChildNodes(a,c);c.name&&(c.attributes.name=c.name);var d=new OpenLayers.Feature.Vector(c.components[0],c.attributes);this.singleFeatureType||(d.type=a.nodeName.split(":").pop(),d.namespace=a.namespaceURI);var e=a.getAttribute("fid")||this.getAttributeNS(a, +this.namespaces.gml,"id");e&&(d.fid=e);this.internalProjection&&this.externalProjection&&d.geometry&&d.geometry.transform(this.externalProjection,this.internalProjection);c.bounds&&(d.bounds=c.bounds);b.features.push(d)},_geometry:function(a,b){this.geometryName||(this.geometryName=a.nodeName.split(":").pop());this.readChildNodes(a,b)},_attribute:function(a,b){var c=a.localName||a.nodeName.split(":").pop(),d=this.getChildValue(a);b.attributes[c]=d}},wfs:{FeatureCollection:function(a,b){this.readChildNodes(a, +b)}}},write:function(a){var b;b=OpenLayers.Util.isArray(a)?"featureMembers":"featureMember";a=this.writeNode("gml:"+b,a);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{gml:{featureMember:function(a){var b=this.createElementNSPlus("gml:featureMember");this.writeNode("feature:_typeName",a,b);return b},MultiPoint:function(a){var b=this.createElementNSPlus("gml:MultiPoint");a=a.components||[a]; +for(var c=0,d=a.length;c<d;++c)this.writeNode("pointMember",a[c],b);return b},pointMember:function(a){var b=this.createElementNSPlus("gml:pointMember");this.writeNode("Point",a,b);return b},MultiLineString:function(a){var b=this.createElementNSPlus("gml:MultiLineString");a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("lineStringMember",a[c],b);return b},lineStringMember:function(a){var b=this.createElementNSPlus("gml:lineStringMember");this.writeNode("LineString",a,b);return b}, +MultiPolygon:function(a){var b=this.createElementNSPlus("gml:MultiPolygon");a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("polygonMember",a[c],b);return b},polygonMember:function(a){var b=this.createElementNSPlus("gml:polygonMember");this.writeNode("Polygon",a,b);return b},GeometryCollection:function(a){for(var b=this.createElementNSPlus("gml:GeometryCollection"),c=0,d=a.components.length;c<d;++c)this.writeNode("geometryMember",a.components[c],b);return b},geometryMember:function(a){var b= +this.createElementNSPlus("gml:geometryMember");a=this.writeNode("feature:_geometry",a);b.appendChild(a.firstChild);return b}},feature:{_typeName:function(a){var b=this.createElementNSPlus("feature:"+this.featureType,{attributes:{fid:a.fid}});a.geometry&&this.writeNode("feature:_geometry",a.geometry,b);for(var c in a.attributes){var d=a.attributes[c];null!=d&&this.writeNode("feature:_attribute",{name:c,value:d},b)}return b},_geometry:function(a){this.externalProjection&&this.internalProjection&&(a= +a.clone().transform(this.internalProjection,this.externalProjection));var b=this.createElementNSPlus("feature:"+this.geometryName);a=this.writeNode("gml:"+this.geometryTypes[a.CLASS_NAME],a,b);this.srsName&&a.setAttribute("srsName",this.srsName);return b},_attribute:function(a){return this.createElementNSPlus("feature:"+a.name,{value:a.value})}},wfs:{FeatureCollection:function(a){for(var b=this.createElementNSPlus("wfs:FeatureCollection"),c=0,d=a.length;c<d;++c)this.writeNode("gml:featureMember", +a[c],b);return b}}},setGeometryTypes:function(){this.geometryTypes={"OpenLayers.Geometry.Point":"Point","OpenLayers.Geometry.MultiPoint":"MultiPoint","OpenLayers.Geometry.LineString":"LineString","OpenLayers.Geometry.MultiLineString":"MultiLineString","OpenLayers.Geometry.Polygon":"Polygon","OpenLayers.Geometry.MultiPolygon":"MultiPolygon","OpenLayers.Geometry.Collection":"GeometryCollection"}},CLASS_NAME:"OpenLayers.Format.GML.Base"});OpenLayers.Format.GML.v3=OpenLayers.Class(OpenLayers.Format.GML.Base,{schemaLocation:"http://www.opengis.net/gml http://schemas.opengis.net/gml/3.1.1/profiles/gmlsfProfile/1.0.0/gmlsf.xsd",curve:!1,multiCurve:!0,surface:!1,multiSurface:!0,initialize:function(a){OpenLayers.Format.GML.Base.prototype.initialize.apply(this,[a])},readers:{gml:OpenLayers.Util.applyDefaults({_inherit:function(a,b,c){if(a=parseInt(a.getAttribute("srsDimension"),10)||c&&c.srsDimension)b.srsDimension=a},featureMembers:function(a, +b){this.readChildNodes(a,b)},Curve:function(a,b){var c={points:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components||(b.components=[]);b.components.push(new OpenLayers.Geometry.LineString(c.points))},segments:function(a,b){this.readChildNodes(a,b)},LineStringSegment:function(a,b){var c={};this.readChildNodes(a,c);c.points&&Array.prototype.push.apply(b.points,c.points)},pos:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(this.regExes.splitSpace), +c=this.xy?new OpenLayers.Geometry.Point(c[0],c[1],c[2]):new OpenLayers.Geometry.Point(c[1],c[0],c[2]);b.points=[c]},posList:function(a,b){for(var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(this.regExes.splitSpace),d=b.srsDimension||parseInt(a.getAttribute("srsDimension")||a.getAttribute("dimension"),10)||2,e,f,g,h=Array(c.length/d),k=0,l=c.length;k<l;k+=d)e=c[k],f=c[k+1],g=2==d?void 0:c[k+2],h[k/d]=this.xy?new OpenLayers.Geometry.Point(e,f,g):new OpenLayers.Geometry.Point(f, +e,g);b.points=h},Surface:function(a,b){this.readChildNodes(a,b)},patches:function(a,b){this.readChildNodes(a,b)},PolygonPatch:function(a,b){this.readers.gml.Polygon.apply(this,[a,b])},exterior:function(a,b){var c={};this.readChildNodes(a,c);b.outer=c.components[0]},interior:function(a,b){var c={};this.readChildNodes(a,c);b.inner.push(c.components[0])},MultiCurve:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);0<c.components.length&&(b.components= +[new OpenLayers.Geometry.MultiLineString(c.components)])},curveMember:function(a,b){this.readChildNodes(a,b)},MultiSurface:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);0<c.components.length&&(b.components=[new OpenLayers.Geometry.MultiPolygon(c.components)])},surfaceMember:function(a,b){this.readChildNodes(a,b)},surfaceMembers:function(a,b){this.readChildNodes(a,b)},pointMembers:function(a,b){this.readChildNodes(a,b)},lineStringMembers:function(a, +b){this.readChildNodes(a,b)},polygonMembers:function(a,b){this.readChildNodes(a,b)},geometryMembers:function(a,b){this.readChildNodes(a,b)},Envelope:function(a,b){var c={points:Array(2)};this.readChildNodes(a,c);b.components||(b.components=[]);var d=c.points[0],c=c.points[1];b.components.push(new OpenLayers.Bounds(d.x,d.y,c.x,c.y))},lowerCorner:function(a,b){var c={};this.readers.gml.pos.apply(this,[a,c]);b.points[0]=c.points[0]},upperCorner:function(a,b){var c={};this.readers.gml.pos.apply(this, +[a,c]);b.points[1]=c.points[0]}},OpenLayers.Format.GML.Base.prototype.readers.gml),feature:OpenLayers.Format.GML.Base.prototype.readers.feature,wfs:OpenLayers.Format.GML.Base.prototype.readers.wfs},write:function(a){var b;b=OpenLayers.Util.isArray(a)?"featureMembers":"featureMember";a=this.writeNode("gml:"+b,a);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{gml:OpenLayers.Util.applyDefaults({featureMembers:function(a){for(var b= +this.createElementNSPlus("gml:featureMembers"),c=0,d=a.length;c<d;++c)this.writeNode("feature:_typeName",a[c],b);return b},Point:function(a){var b=this.createElementNSPlus("gml:Point");this.writeNode("pos",a,b);return b},pos:function(a){return this.createElementNSPlus("gml:pos",{value:this.xy?a.x+" "+a.y:a.y+" "+a.x})},LineString:function(a){var b=this.createElementNSPlus("gml:LineString");this.writeNode("posList",a.components,b);return b},Curve:function(a){var b=this.createElementNSPlus("gml:Curve"); +this.writeNode("segments",a,b);return b},segments:function(a){var b=this.createElementNSPlus("gml:segments");this.writeNode("LineStringSegment",a,b);return b},LineStringSegment:function(a){var b=this.createElementNSPlus("gml:LineStringSegment");this.writeNode("posList",a.components,b);return b},posList:function(a){for(var b=a.length,c=Array(b),d,e=0;e<b;++e)d=a[e],c[e]=this.xy?d.x+" "+d.y:d.y+" "+d.x;return this.createElementNSPlus("gml:posList",{value:c.join(" ")})},Surface:function(a){var b=this.createElementNSPlus("gml:Surface"); +this.writeNode("patches",a,b);return b},patches:function(a){var b=this.createElementNSPlus("gml:patches");this.writeNode("PolygonPatch",a,b);return b},PolygonPatch:function(a){var b=this.createElementNSPlus("gml:PolygonPatch",{attributes:{interpolation:"planar"}});this.writeNode("exterior",a.components[0],b);for(var c=1,d=a.components.length;c<d;++c)this.writeNode("interior",a.components[c],b);return b},Polygon:function(a){var b=this.createElementNSPlus("gml:Polygon");this.writeNode("exterior",a.components[0], +b);for(var c=1,d=a.components.length;c<d;++c)this.writeNode("interior",a.components[c],b);return b},exterior:function(a){var b=this.createElementNSPlus("gml:exterior");this.writeNode("LinearRing",a,b);return b},interior:function(a){var b=this.createElementNSPlus("gml:interior");this.writeNode("LinearRing",a,b);return b},LinearRing:function(a){var b=this.createElementNSPlus("gml:LinearRing");this.writeNode("posList",a.components,b);return b},MultiCurve:function(a){var b=this.createElementNSPlus("gml:MultiCurve"); +a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("curveMember",a[c],b);return b},curveMember:function(a){var b=this.createElementNSPlus("gml:curveMember");this.curve?this.writeNode("Curve",a,b):this.writeNode("LineString",a,b);return b},MultiSurface:function(a){var b=this.createElementNSPlus("gml:MultiSurface");a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("surfaceMember",a[c],b);return b},surfaceMember:function(a){var b=this.createElementNSPlus("gml:surfaceMember"); +this.surface?this.writeNode("Surface",a,b):this.writeNode("Polygon",a,b);return b},Envelope:function(a){var b=this.createElementNSPlus("gml:Envelope");this.writeNode("lowerCorner",a,b);this.writeNode("upperCorner",a,b);this.srsName&&b.setAttribute("srsName",this.srsName);return b},lowerCorner:function(a){return this.createElementNSPlus("gml:lowerCorner",{value:this.xy?a.left+" "+a.bottom:a.bottom+" "+a.left})},upperCorner:function(a){return this.createElementNSPlus("gml:upperCorner",{value:this.xy? +a.right+" "+a.top:a.top+" "+a.right})}},OpenLayers.Format.GML.Base.prototype.writers.gml),feature:OpenLayers.Format.GML.Base.prototype.writers.feature,wfs:OpenLayers.Format.GML.Base.prototype.writers.wfs},setGeometryTypes:function(){this.geometryTypes={"OpenLayers.Geometry.Point":"Point","OpenLayers.Geometry.MultiPoint":"MultiPoint","OpenLayers.Geometry.LineString":!0===this.curve?"Curve":"LineString","OpenLayers.Geometry.MultiLineString":!1===this.multiCurve?"MultiLineString":"MultiCurve","OpenLayers.Geometry.Polygon":!0=== +this.surface?"Surface":"Polygon","OpenLayers.Geometry.MultiPolygon":!1===this.multiSurface?"MultiPolygon":"MultiSurface","OpenLayers.Geometry.Collection":"GeometryCollection"}},CLASS_NAME:"OpenLayers.Format.GML.v3"});OpenLayers.Format.Filter.v1_1_0=OpenLayers.Class(OpenLayers.Format.GML.v3,OpenLayers.Format.Filter.v1,{VERSION:"1.1.0",schemaLocation:"http://www.opengis.net/ogc/filter/1.1.0/filter.xsd",initialize:function(a){OpenLayers.Format.GML.v3.prototype.initialize.apply(this,[a])},readers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a,b){var c=a.getAttribute("matchCase"),c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO,matchCase:!("false"===c||"0"===c)});this.readChildNodes(a, +c);b.filters.push(c)},PropertyIsNotEqualTo:function(a,b){var c=a.getAttribute("matchCase"),c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.NOT_EQUAL_TO,matchCase:!("false"===c||"0"===c)});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLike:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LIKE});this.readChildNodes(a,c);var d=a.getAttribute("wildCard"),e=a.getAttribute("singleChar"),f=a.getAttribute("escapeChar");c.value2regex(d,e, +f);b.filters.push(c)}},OpenLayers.Format.Filter.v1.prototype.readers.ogc),gml:OpenLayers.Format.GML.v3.prototype.readers.gml,feature:OpenLayers.Format.GML.v3.prototype.readers.feature},writers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsEqualTo",{attributes:{matchCase:a.matchCase}});this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsNotEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsNotEqualTo", +{attributes:{matchCase:a.matchCase}});this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsLike:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLike",{attributes:{matchCase:a.matchCase,wildCard:"*",singleChar:".",escapeChar:"!"}});this.writeNode("PropertyName",a,b);this.writeNode("Literal",a.regex2value(),b);return b},BBOX:function(a){var b=this.createElementNSPlus("ogc:BBOX");a.property&&this.writeNode("PropertyName",a,b);var c=this.writeNode("gml:Envelope", +a.value);a.projection&&c.setAttribute("srsName",a.projection);b.appendChild(c);return b},SortBy:function(a){for(var b=this.createElementNSPlus("ogc:SortBy"),c=0,d=a.length;c<d;c++)this.writeNode("ogc:SortProperty",a[c],b);return b},SortProperty:function(a){var b=this.createElementNSPlus("ogc:SortProperty");this.writeNode("ogc:PropertyName",a,b);this.writeNode("ogc:SortOrder","DESC"==a.order?"DESC":"ASC",b);return b},SortOrder:function(a){return this.createElementNSPlus("ogc:SortOrder",{value:a})}}, +OpenLayers.Format.Filter.v1.prototype.writers.ogc),gml:OpenLayers.Format.GML.v3.prototype.writers.gml,feature:OpenLayers.Format.GML.v3.prototype.writers.feature},writeSpatial:function(a,b){var c=this.createElementNSPlus("ogc:"+b);this.writeNode("PropertyName",a,c);if(a.value instanceof OpenLayers.Filter.Function)this.writeNode("Function",a.value,c);else{var d;d=a.value instanceof OpenLayers.Geometry?this.writeNode("feature:_geometry",a.value).firstChild:this.writeNode("gml:Envelope",a.value);a.projection&& +d.setAttribute("srsName",a.projection);c.appendChild(d)}return c},CLASS_NAME:"OpenLayers.Format.Filter.v1_1_0"});OpenLayers.Format.OWSCommon=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",getVersion:function(a,b){var c=this.version;if(!c){var d=a.getAttribute("xmlns:ows");d&&"1.1"===d.substring(d.lastIndexOf("/")+1)&&(c="1.1.0");c||(c=this.defaultVersion)}return c},CLASS_NAME:"OpenLayers.Format.OWSCommon"});OpenLayers.Format.OWSCommon.v1=OpenLayers.Class(OpenLayers.Format.XML,{regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},read:function(a,b){OpenLayers.Util.applyDefaults(b,this.options);var c={};this.readChildNodes(a,c);return c},readers:{ows:{Exception:function(a,b){var c={code:a.getAttribute("exceptionCode"),locator:a.getAttribute("locator"),texts:[]};b.exceptions.push(c);this.readChildNodes(a,c)},ExceptionText:function(a,b){var c=this.getChildValue(a);b.texts.push(c)}, +ServiceIdentification:function(a,b){b.serviceIdentification={};this.readChildNodes(a,b.serviceIdentification)},Title:function(a,b){b.title=this.getChildValue(a)},Abstract:function(a,b){b["abstract"]=this.getChildValue(a)},Keywords:function(a,b){b.keywords={};this.readChildNodes(a,b.keywords)},Keyword:function(a,b){b[this.getChildValue(a)]=!0},ServiceType:function(a,b){b.serviceType={codeSpace:a.getAttribute("codeSpace"),value:this.getChildValue(a)}},ServiceTypeVersion:function(a,b){b.serviceTypeVersion= +this.getChildValue(a)},Fees:function(a,b){b.fees=this.getChildValue(a)},AccessConstraints:function(a,b){b.accessConstraints=this.getChildValue(a)},ServiceProvider:function(a,b){b.serviceProvider={};this.readChildNodes(a,b.serviceProvider)},ProviderName:function(a,b){b.providerName=this.getChildValue(a)},ProviderSite:function(a,b){b.providerSite=this.getAttributeNS(a,this.namespaces.xlink,"href")},ServiceContact:function(a,b){b.serviceContact={};this.readChildNodes(a,b.serviceContact)},IndividualName:function(a, +b){b.individualName=this.getChildValue(a)},PositionName:function(a,b){b.positionName=this.getChildValue(a)},ContactInfo:function(a,b){b.contactInfo={};this.readChildNodes(a,b.contactInfo)},Phone:function(a,b){b.phone={};this.readChildNodes(a,b.phone)},Voice:function(a,b){b.voice=this.getChildValue(a)},Address:function(a,b){b.address={};this.readChildNodes(a,b.address)},DeliveryPoint:function(a,b){b.deliveryPoint=this.getChildValue(a)},City:function(a,b){b.city=this.getChildValue(a)},AdministrativeArea:function(a, +b){b.administrativeArea=this.getChildValue(a)},PostalCode:function(a,b){b.postalCode=this.getChildValue(a)},Country:function(a,b){b.country=this.getChildValue(a)},ElectronicMailAddress:function(a,b){b.electronicMailAddress=this.getChildValue(a)},Role:function(a,b){b.role=this.getChildValue(a)},OperationsMetadata:function(a,b){b.operationsMetadata={};this.readChildNodes(a,b.operationsMetadata)},Operation:function(a,b){var c=a.getAttribute("name");b[c]={};this.readChildNodes(a,b[c])},DCP:function(a, +b){b.dcp={};this.readChildNodes(a,b.dcp)},HTTP:function(a,b){b.http={};this.readChildNodes(a,b.http)},Get:function(a,b){b.get||(b.get=[]);var c={url:this.getAttributeNS(a,this.namespaces.xlink,"href")};this.readChildNodes(a,c);b.get.push(c)},Post:function(a,b){b.post||(b.post=[]);var c={url:this.getAttributeNS(a,this.namespaces.xlink,"href")};this.readChildNodes(a,c);b.post.push(c)},Parameter:function(a,b){b.parameters||(b.parameters={});var c=a.getAttribute("name");b.parameters[c]={};this.readChildNodes(a, +b.parameters[c])},Constraint:function(a,b){b.constraints||(b.constraints={});var c=a.getAttribute("name");b.constraints[c]={};this.readChildNodes(a,b.constraints[c])},Value:function(a,b){b[this.getChildValue(a)]=!0},OutputFormat:function(a,b){b.formats.push({value:this.getChildValue(a)});this.readChildNodes(a,b)},WGS84BoundingBox:function(a,b){var c={};c.crs=a.getAttribute("crs");b.BoundingBox?b.BoundingBox.push(c):(b.projection=c.crs,c=b);this.readChildNodes(a,c)},BoundingBox:function(a,b){this.readers.ows.WGS84BoundingBox.apply(this, +[a,b])},LowerCorner:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),c=c.split(this.regExes.splitSpace);b.left=c[0];b.bottom=c[1]},UpperCorner:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),c=c.split(this.regExes.splitSpace);b.right=c[0];b.top=c[1];b.bounds=new OpenLayers.Bounds(b.left,b.bottom,b.right,b.top);delete b.left;delete b.bottom;delete b.right;delete b.top}, +Language:function(a,b){b.language=this.getChildValue(a)}}},writers:{ows:{BoundingBox:function(a,b){var c=this.createElementNSPlus(b||"ows:BoundingBox",{attributes:{crs:a.projection}});this.writeNode("ows:LowerCorner",a,c);this.writeNode("ows:UpperCorner",a,c);return c},LowerCorner:function(a){return this.createElementNSPlus("ows:LowerCorner",{value:a.bounds.left+" "+a.bounds.bottom})},UpperCorner:function(a){return this.createElementNSPlus("ows:UpperCorner",{value:a.bounds.right+" "+a.bounds.top})}, +Identifier:function(a){return this.createElementNSPlus("ows:Identifier",{value:a})},Title:function(a){return this.createElementNSPlus("ows:Title",{value:a})},Abstract:function(a){return this.createElementNSPlus("ows:Abstract",{value:a})},OutputFormat:function(a){return this.createElementNSPlus("ows:OutputFormat",{value:a})}}},CLASS_NAME:"OpenLayers.Format.OWSCommon.v1"});OpenLayers.Format.OWSCommon.v1_0_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1,{namespaces:{ows:"http://www.opengis.net/ows",xlink:"http://www.w3.org/1999/xlink"},readers:{ows:OpenLayers.Util.applyDefaults({ExceptionReport:function(a,b){b.success=!1;b.exceptionReport={version:a.getAttribute("version"),language:a.getAttribute("language"),exceptions:[]};this.readChildNodes(a,b.exceptionReport)}},OpenLayers.Format.OWSCommon.v1.prototype.readers.ows)},writers:{ows:OpenLayers.Format.OWSCommon.v1.prototype.writers.ows}, +CLASS_NAME:"OpenLayers.Format.OWSCommon.v1_0_0"});OpenLayers.Format.WFST.v1_1_0=OpenLayers.Class(OpenLayers.Format.Filter.v1_1_0,OpenLayers.Format.WFST.v1,{version:"1.1.0",schemaLocations:{wfs:"http://schemas.opengis.net/wfs/1.1.0/wfs.xsd"},initialize:function(a){OpenLayers.Format.Filter.v1_1_0.prototype.initialize.apply(this,[a]);OpenLayers.Format.WFST.v1.prototype.initialize.apply(this,[a])},readNode:function(a,b,c){return OpenLayers.Format.GML.v3.prototype.readNode.apply(this,arguments)},readers:{wfs:OpenLayers.Util.applyDefaults({FeatureCollection:function(a, +b){b.numberOfFeatures=parseInt(a.getAttribute("numberOfFeatures"));OpenLayers.Format.WFST.v1.prototype.readers.wfs.FeatureCollection.apply(this,arguments)},TransactionResponse:function(a,b){b.insertIds=[];b.success=!1;this.readChildNodes(a,b)},TransactionSummary:function(a,b){b.success=!0},InsertResults:function(a,b){this.readChildNodes(a,b)},Feature:function(a,b){var c={fids:[]};this.readChildNodes(a,c);b.insertIds.push(c.fids[0])}},OpenLayers.Format.WFST.v1.prototype.readers.wfs),gml:OpenLayers.Format.GML.v3.prototype.readers.gml, +feature:OpenLayers.Format.GML.v3.prototype.readers.feature,ogc:OpenLayers.Format.Filter.v1_1_0.prototype.readers.ogc,ows:OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers.ows},writers:{wfs:OpenLayers.Util.applyDefaults({GetFeature:function(a){var b=OpenLayers.Format.WFST.v1.prototype.writers.wfs.GetFeature.apply(this,arguments);a&&this.setAttributes(b,{resultType:a.resultType,startIndex:a.startIndex,count:a.count});return b},Query:function(a){a=OpenLayers.Util.extend({featureNS:this.featureNS, +featurePrefix:this.featurePrefix,featureType:this.featureType,srsName:this.srsName},a);var b=a.featurePrefix,c=this.createElementNSPlus("wfs:Query",{attributes:{typeName:(b?b+":":"")+a.featureType,srsName:a.srsName}});a.featureNS&&c.setAttribute("xmlns:"+b,a.featureNS);if(a.propertyNames)for(var b=0,d=a.propertyNames.length;b<d;b++)this.writeNode("wfs:PropertyName",{property:a.propertyNames[b]},c);a.filter&&(OpenLayers.Format.WFST.v1_1_0.prototype.setFilterProperty.call(this,a.filter),this.writeNode("ogc:Filter", +a.filter,c));return c},PropertyName:function(a){return this.createElementNSPlus("wfs:PropertyName",{value:a.property})}},OpenLayers.Format.WFST.v1.prototype.writers.wfs),gml:OpenLayers.Format.GML.v3.prototype.writers.gml,feature:OpenLayers.Format.GML.v3.prototype.writers.feature,ogc:OpenLayers.Format.Filter.v1_1_0.prototype.writers.ogc},CLASS_NAME:"OpenLayers.Format.WFST.v1_1_0"});OpenLayers.Control=OpenLayers.Class({id:null,map:null,div:null,type:null,allowSelection:!1,displayClass:"",title:"",autoActivate:!1,active:null,handlerOptions:null,handler:null,eventListeners:null,events:null,initialize:function(a){this.displayClass=this.CLASS_NAME.replace("OpenLayers.","ol").replace(/\./g,"");OpenLayers.Util.extend(this,a);this.events=new OpenLayers.Events(this);if(this.eventListeners instanceof Object)this.events.on(this.eventListeners);null==this.id&&(this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+ +"_"))},destroy:function(){this.events&&(this.eventListeners&&this.events.un(this.eventListeners),this.events.destroy(),this.events=null);this.eventListeners=null;this.handler&&(this.handler.destroy(),this.handler=null);if(this.handlers){for(var a in this.handlers)this.handlers.hasOwnProperty(a)&&"function"==typeof this.handlers[a].destroy&&this.handlers[a].destroy();this.handlers=null}this.map&&(this.map.removeControl(this),this.map=null);this.div=null},setMap:function(a){this.map=a;this.handler&& +this.handler.setMap(a)},draw:function(a){null==this.div&&(this.div=OpenLayers.Util.createDiv(this.id),this.div.className=this.displayClass,this.allowSelection||(this.div.className+=" olControlNoSelect",this.div.setAttribute("unselectable","on",0),this.div.onselectstart=OpenLayers.Function.False),""!=this.title&&(this.div.title=this.title));null!=a&&(this.position=a.clone());this.moveTo(this.position);return this.div},moveTo:function(a){null!=a&&null!=this.div&&(this.div.style.left=a.x+"px",this.div.style.top= +a.y+"px")},activate:function(){if(this.active)return!1;this.handler&&this.handler.activate();this.active=!0;this.map&&OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active");this.events.triggerEvent("activate");return!0},deactivate:function(){return this.active?(this.handler&&this.handler.deactivate(),this.active=!1,this.map&&OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active"),this.events.triggerEvent("deactivate"), +!0):!1},CLASS_NAME:"OpenLayers.Control"});OpenLayers.Control.TYPE_BUTTON=1;OpenLayers.Control.TYPE_TOGGLE=2;OpenLayers.Control.TYPE_TOOL=3;OpenLayers.Format.WFSDescribeFeatureType=OpenLayers.Class(OpenLayers.Format.XML,{regExes:{trimSpace:/^\s*|\s*$/g},namespaces:{xsd:"http://www.w3.org/2001/XMLSchema"},readers:{xsd:{schema:function(a,b){var c=[],d={},e,f;this.readChildNodes(a,{complexTypes:c,customTypes:d});var g=a.attributes,h,k;e=0;for(f=g.length;e<f;++e)h=g[e],k=h.name,0===k.indexOf("xmlns")?this.setNamespace(k.split(":")[1]||"",h.value):b[k]=h.value;b.featureTypes=c;b.targetPrefix=this.namespaceAlias[b.targetNamespace];e=0;for(f= +c.length;e<f;++e)g=c[e],h=d[g.typeName],d[g.typeName]&&(g.typeName=h.name)},complexType:function(a,b){var c={typeName:a.getAttribute("name")};this.readChildNodes(a,c);b.complexTypes.push(c)},complexContent:function(a,b){this.readChildNodes(a,b)},extension:function(a,b){this.readChildNodes(a,b)},sequence:function(a,b){var c={elements:[]};this.readChildNodes(a,c);b.properties=c.elements},element:function(a,b){var c;if(b.elements){var d={};c=a.attributes;for(var e,f=0,g=c.length;f<g;++f)e=c[f],d[e.name]= +e.value;c=d.type;c||(c={},this.readChildNodes(a,c),d.restriction=c,d.type=c.base);d.localType=(c.base||c).split(":").pop();b.elements.push(d);this.readChildNodes(a,d)}b.complexTypes&&(c=a.getAttribute("type"),d=c.split(":").pop(),b.customTypes[d]={name:a.getAttribute("name"),type:c})},annotation:function(a,b){b.annotation={};this.readChildNodes(a,b.annotation)},appinfo:function(a,b){b.appinfo||(b.appinfo=[]);b.appinfo.push(this.getChildValue(a))},documentation:function(a,b){b.documentation||(b.documentation= +[]);var c=this.getChildValue(a);b.documentation.push({lang:a.getAttribute("xml:lang"),textContent:c.replace(this.regExes.trimSpace,"")})},simpleType:function(a,b){this.readChildNodes(a,b)},restriction:function(a,b){b.base=a.getAttribute("base");this.readRestriction(a,b)}}},readRestriction:function(a,b){for(var c=a.childNodes,d,e,f=0,g=c.length;f<g;++f)d=c[f],1==d.nodeType&&(e=d.nodeName.split(":").pop(),d=d.getAttribute("value"),b[e]?("string"==typeof b[e]&&(b[e]=[b[e]]),b[e].push(d)):b[e]=d)},read:function(a){"string"== +typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};if("ExceptionReport"===a.nodeName.split(":").pop()){var c=new OpenLayers.Format.OGCExceptionReport;b.error=c.read(a)}else this.readNode(a,b);return b},CLASS_NAME:"OpenLayers.Format.WFSDescribeFeatureType"});OpenLayers.Renderer=OpenLayers.Class({container:null,root:null,extent:null,locked:!1,size:null,resolution:null,map:null,featureDx:0,initialize:function(a,b){this.container=OpenLayers.Util.getElement(a);OpenLayers.Util.extend(this,b)},destroy:function(){this.map=this.resolution=this.size=this.extent=this.container=null},supported:function(){return!1},setExtent:function(a,b){this.extent=a.clone();if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){var c=a.getWidth()/this.map.getExtent().getWidth(); +a=a.scale(1/c);this.extent=a.wrapDateLine(this.map.getMaxExtent()).scale(c)}b&&(this.resolution=null);return!0},setSize:function(a){this.size=a.clone();this.resolution=null},getResolution:function(){return this.resolution=this.resolution||this.map.getResolution()},drawFeature:function(a,b){null==b&&(b=a.style);if(a.geometry){var c=a.geometry.getBounds();if(c){var d;this.map.baseLayer&&this.map.baseLayer.wrapDateLine&&(d=this.map.getMaxExtent());c.intersectsBounds(this.extent,{worldBounds:d})?this.calculateFeatureDx(c, +d):b={display:"none"};c=this.drawGeometry(a.geometry,b,a.id);if("none"!=b.display&&b.label&&!1!==c){d=a.geometry.getCentroid();if(b.labelXOffset||b.labelYOffset){var e=isNaN(b.labelXOffset)?0:b.labelXOffset,f=isNaN(b.labelYOffset)?0:b.labelYOffset,g=this.getResolution();d.move(e*g,f*g)}this.drawText(a.id,b,d)}else this.removeText(a.id);return c}}},calculateFeatureDx:function(a,b){this.featureDx=0;if(b){var c=b.getWidth();this.featureDx=Math.round(((a.left+a.right)/2-(this.extent.left+this.extent.right)/ +2)/c)*c}},drawGeometry:function(a,b,c){},drawText:function(a,b,c){},removeText:function(a){},clear:function(){},getFeatureIdFromEvent:function(a){},eraseFeatures:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=0,c=a.length;b<c;++b){var d=a[b];this.eraseGeometry(d.geometry,d.id);this.removeText(d.id)}},eraseGeometry:function(a,b){},moveRoot:function(a){},getRenderLayerId:function(){return this.container.id},applyDefaultSymbolizer:function(a){var b=OpenLayers.Util.extend({},OpenLayers.Renderer.defaultSymbolizer); +!1===a.stroke&&(delete b.strokeWidth,delete b.strokeColor);!1===a.fill&&delete b.fillColor;OpenLayers.Util.extend(b,a);return b},CLASS_NAME:"OpenLayers.Renderer"});OpenLayers.Renderer.defaultSymbolizer={fillColor:"#000000",strokeColor:"#000000",strokeWidth:2,fillOpacity:1,strokeOpacity:1,pointRadius:0,labelAlign:"cm"}; +OpenLayers.Renderer.symbol={star:[350,75,379,161,469,161,397,215,423,301,350,250,277,301,303,215,231,161,321,161,350,75],cross:[4,0,6,0,6,4,10,4,10,6,6,6,6,10,4,10,4,6,0,6,0,4,4,4,4,0],x:[0,0,25,0,50,35,75,0,100,0,65,50,100,100,75,100,50,65,25,100,0,100,35,50,0,0],square:[0,0,0,1,1,1,1,0,0,0],triangle:[0,10,10,10,5,0,0,10]};OpenLayers.Renderer.Canvas=OpenLayers.Class(OpenLayers.Renderer,{hitDetection:!0,hitOverflow:0,canvas:null,features:null,pendingRedraw:!1,cachedSymbolBounds:{},initialize:function(a,b){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.root=document.createElement("canvas");this.container.appendChild(this.root);this.canvas=this.root.getContext("2d");this.features={};this.hitDetection&&(this.hitCanvas=document.createElement("canvas"),this.hitContext=this.hitCanvas.getContext("2d"))}, +setExtent:function(){OpenLayers.Renderer.prototype.setExtent.apply(this,arguments);return!1},eraseGeometry:function(a,b){this.eraseFeatures(this.features[b][0])},supported:function(){return OpenLayers.CANVAS_SUPPORTED},setSize:function(a){this.size=a.clone();var b=this.root;b.style.width=a.w+"px";b.style.height=a.h+"px";b.width=a.w;b.height=a.h;this.resolution=null;this.hitDetection&&(b=this.hitCanvas,b.style.width=a.w+"px",b.style.height=a.h+"px",b.width=a.w,b.height=a.h)},drawFeature:function(a, +b){var c;if(a.geometry){b=this.applyDefaultSymbolizer(b||a.style);c=a.geometry.getBounds();var d;this.map.baseLayer&&this.map.baseLayer.wrapDateLine&&(d=this.map.getMaxExtent());d=c&&c.intersectsBounds(this.extent,{worldBounds:d});(c="none"!==b.display&&!!c&&d)?this.features[a.id]=[a,b]:delete this.features[a.id];this.pendingRedraw=!0}this.pendingRedraw&&!this.locked&&(this.redraw(),this.pendingRedraw=!1);return c},drawGeometry:function(a,b,c){var d=a.CLASS_NAME;if("OpenLayers.Geometry.Collection"== +d||"OpenLayers.Geometry.MultiPoint"==d||"OpenLayers.Geometry.MultiLineString"==d||"OpenLayers.Geometry.MultiPolygon"==d)for(d=0;d<a.components.length;d++)this.drawGeometry(a.components[d],b,c);else switch(a.CLASS_NAME){case "OpenLayers.Geometry.Point":this.drawPoint(a,b,c);break;case "OpenLayers.Geometry.LineString":this.drawLineString(a,b,c);break;case "OpenLayers.Geometry.LinearRing":this.drawLinearRing(a,b,c);break;case "OpenLayers.Geometry.Polygon":this.drawPolygon(a,b,c)}},drawExternalGraphic:function(a, +b,c){var d=new Image,e=b.title||b.graphicTitle;e&&(d.title=e);var f=b.graphicWidth||b.graphicHeight,g=b.graphicHeight||b.graphicWidth,f=f?f:2*b.pointRadius,g=g?g:2*b.pointRadius,h=void 0!=b.graphicXOffset?b.graphicXOffset:-(.5*f),k=void 0!=b.graphicYOffset?b.graphicYOffset:-(.5*g),l=b.graphicOpacity||b.fillOpacity;d.onload=OpenLayers.Function.bind(function(){if(this.features[c]){var b=this.getLocalXY(a),e=b[0],b=b[1];if(!isNaN(e)&&!isNaN(b)){var e=e+h|0,b=b+k|0,n=this.canvas;n.globalAlpha=l;var p= +OpenLayers.Renderer.Canvas.drawImageScaleFactor||(OpenLayers.Renderer.Canvas.drawImageScaleFactor=/android 2.1/.test(navigator.userAgent.toLowerCase())?320/window.screen.width:1);n.drawImage(d,e*p,b*p,f*p,g*p);this.hitDetection&&(this.setHitContextStyle("fill",c),this.hitContext.fillRect(e,b,f,g))}}},this);d.src=b.externalGraphic},drawNamedSymbol:function(a,b,c){var d,e,f,g;f=Math.PI/180;var h=OpenLayers.Renderer.symbol[b.graphicName];if(!h)throw Error(b.graphicName+" is not a valid symbol name"); +if(!(!h.length||2>h.length||(a=this.getLocalXY(a),e=a[0],g=a[1],isNaN(e)||isNaN(g)))){this.canvas.lineCap="round";this.canvas.lineJoin="round";this.hitDetection&&(this.hitContext.lineCap="round",this.hitContext.lineJoin="round");if(b.graphicName in this.cachedSymbolBounds)d=this.cachedSymbolBounds[b.graphicName];else{d=new OpenLayers.Bounds;for(a=0;a<h.length;a+=2)d.extend(new OpenLayers.LonLat(h[a],h[a+1]));this.cachedSymbolBounds[b.graphicName]=d}this.canvas.save();this.hitDetection&&this.hitContext.save(); +this.canvas.translate(e,g);this.hitDetection&&this.hitContext.translate(e,g);a=f*b.rotation;isNaN(a)||(this.canvas.rotate(a),this.hitDetection&&this.hitContext.rotate(a));f=2*b.pointRadius/Math.max(d.getWidth(),d.getHeight());this.canvas.scale(f,f);this.hitDetection&&this.hitContext.scale(f,f);a=d.getCenterLonLat().lon;d=d.getCenterLonLat().lat;this.canvas.translate(-a,-d);this.hitDetection&&this.hitContext.translate(-a,-d);g=b.strokeWidth;b.strokeWidth=g/f;if(!1!==b.fill){this.setCanvasStyle("fill", +b);this.canvas.beginPath();for(a=0;a<h.length;a+=2)d=h[a],e=h[a+1],0==a&&this.canvas.moveTo(d,e),this.canvas.lineTo(d,e);this.canvas.closePath();this.canvas.fill();if(this.hitDetection){this.setHitContextStyle("fill",c,b);this.hitContext.beginPath();for(a=0;a<h.length;a+=2)d=h[a],e=h[a+1],0==a&&this.canvas.moveTo(d,e),this.hitContext.lineTo(d,e);this.hitContext.closePath();this.hitContext.fill()}}if(!1!==b.stroke){this.setCanvasStyle("stroke",b);this.canvas.beginPath();for(a=0;a<h.length;a+=2)d=h[a], +e=h[a+1],0==a&&this.canvas.moveTo(d,e),this.canvas.lineTo(d,e);this.canvas.closePath();this.canvas.stroke();if(this.hitDetection){this.setHitContextStyle("stroke",c,b,f);this.hitContext.beginPath();for(a=0;a<h.length;a+=2)d=h[a],e=h[a+1],0==a&&this.hitContext.moveTo(d,e),this.hitContext.lineTo(d,e);this.hitContext.closePath();this.hitContext.stroke()}}b.strokeWidth=g;this.canvas.restore();this.hitDetection&&this.hitContext.restore();this.setCanvasStyle("reset")}},setCanvasStyle:function(a,b){"fill"=== +a?(this.canvas.globalAlpha=b.fillOpacity,this.canvas.fillStyle=b.fillColor):"stroke"===a?(this.canvas.globalAlpha=b.strokeOpacity,this.canvas.strokeStyle=b.strokeColor,this.canvas.lineWidth=b.strokeWidth):(this.canvas.globalAlpha=0,this.canvas.lineWidth=1)},featureIdToHex:function(a){a=Number(a.split("_").pop())+1;16777216<=a&&(this.hitOverflow=a-16777215,a=a%16777216+1);a="000000"+a.toString(16);var b=a.length;return a="#"+a.substring(b-6,b)},setHitContextStyle:function(a,b,c,d){b=this.featureIdToHex(b); +"fill"==a?(this.hitContext.globalAlpha=1,this.hitContext.fillStyle=b):"stroke"==a?(this.hitContext.globalAlpha=1,this.hitContext.strokeStyle=b,"undefined"===typeof d?this.hitContext.lineWidth=c.strokeWidth+2:isNaN(d)||(this.hitContext.lineWidth=c.strokeWidth+2/d)):(this.hitContext.globalAlpha=0,this.hitContext.lineWidth=1)},drawPoint:function(a,b,c){if(!1!==b.graphic)if(b.externalGraphic)this.drawExternalGraphic(a,b,c);else if(b.graphicName&&"circle"!=b.graphicName)this.drawNamedSymbol(a,b,c);else{var d= +this.getLocalXY(a);a=d[0];d=d[1];if(!isNaN(a)&&!isNaN(d)){var e=2*Math.PI,f=b.pointRadius;!1!==b.fill&&(this.setCanvasStyle("fill",b),this.canvas.beginPath(),this.canvas.arc(a,d,f,0,e,!0),this.canvas.fill(),this.hitDetection&&(this.setHitContextStyle("fill",c,b),this.hitContext.beginPath(),this.hitContext.arc(a,d,f,0,e,!0),this.hitContext.fill()));!1!==b.stroke&&(this.setCanvasStyle("stroke",b),this.canvas.beginPath(),this.canvas.arc(a,d,f,0,e,!0),this.canvas.stroke(),this.hitDetection&&(this.setHitContextStyle("stroke", +c,b),this.hitContext.beginPath(),this.hitContext.arc(a,d,f,0,e,!0),this.hitContext.stroke()),this.setCanvasStyle("reset"))}}},drawLineString:function(a,b,c){b=OpenLayers.Util.applyDefaults({fill:!1},b);this.drawLinearRing(a,b,c)},drawLinearRing:function(a,b,c){!1!==b.fill&&(this.setCanvasStyle("fill",b),this.renderPath(this.canvas,a,b,c,"fill"),this.hitDetection&&(this.setHitContextStyle("fill",c,b),this.renderPath(this.hitContext,a,b,c,"fill")));!1!==b.stroke&&(this.setCanvasStyle("stroke",b),this.renderPath(this.canvas, +a,b,c,"stroke"),this.hitDetection&&(this.setHitContextStyle("stroke",c,b),this.renderPath(this.hitContext,a,b,c,"stroke")));this.setCanvasStyle("reset")},renderPath:function(a,b,c,d,e){b=b.components;c=b.length;a.beginPath();d=this.getLocalXY(b[0]);var f=d[1];if(!isNaN(d[0])&&!isNaN(f)){a.moveTo(d[0],d[1]);for(d=1;d<c;++d)f=this.getLocalXY(b[d]),a.lineTo(f[0],f[1]);"fill"===e?a.fill():a.stroke()}},drawPolygon:function(a,b,c){a=a.components;var d=a.length;this.drawLinearRing(a[0],b,c);for(var e=1;e< +d;++e)this.canvas.globalCompositeOperation="destination-out",this.hitDetection&&(this.hitContext.globalCompositeOperation="destination-out"),this.drawLinearRing(a[e],OpenLayers.Util.applyDefaults({stroke:!1,fillOpacity:1},b),c),this.canvas.globalCompositeOperation="source-over",this.hitDetection&&(this.hitContext.globalCompositeOperation="source-over"),this.drawLinearRing(a[e],OpenLayers.Util.applyDefaults({fill:!1},b),c)},drawText:function(a,b){var c=this.getLocalXY(a);this.setCanvasStyle("reset"); +this.canvas.fillStyle=b.fontColor;this.canvas.globalAlpha=b.fontOpacity||1;var d=[b.fontStyle?b.fontStyle:"normal","normal",b.fontWeight?b.fontWeight:"normal",b.fontSize?b.fontSize:"1em",b.fontFamily?b.fontFamily:"sans-serif"].join(" "),e=b.label.split("\n"),f=e.length;if(this.canvas.fillText){this.canvas.font=d;this.canvas.textAlign=OpenLayers.Renderer.Canvas.LABEL_ALIGN[b.labelAlign[0]]||"center";this.canvas.textBaseline=OpenLayers.Renderer.Canvas.LABEL_ALIGN[b.labelAlign[1]]||"middle";var g=OpenLayers.Renderer.Canvas.LABEL_FACTOR[b.labelAlign[1]]; +null==g&&(g=-.5);d=this.canvas.measureText("Mg").height||this.canvas.measureText("xx").width;c[1]+=d*g*(f-1);for(g=0;g<f;g++)b.labelOutlineWidth&&(this.canvas.save(),this.canvas.globalAlpha=b.labelOutlineOpacity||b.fontOpacity||1,this.canvas.strokeStyle=b.labelOutlineColor,this.canvas.lineWidth=b.labelOutlineWidth,this.canvas.strokeText(e[g],c[0],c[1]+d*g+1),this.canvas.restore()),this.canvas.fillText(e[g],c[0],c[1]+d*g)}else if(this.canvas.mozDrawText){this.canvas.mozTextStyle=d;var h=OpenLayers.Renderer.Canvas.LABEL_FACTOR[b.labelAlign[0]]; +null==h&&(h=-.5);g=OpenLayers.Renderer.Canvas.LABEL_FACTOR[b.labelAlign[1]];null==g&&(g=-.5);d=this.canvas.mozMeasureText("xx");c[1]+=d*(1+g*f);for(g=0;g<f;g++){var k=c[0]+h*this.canvas.mozMeasureText(e[g]),l=c[1]+g*d;this.canvas.translate(k,l);this.canvas.mozDrawText(e[g]);this.canvas.translate(-k,-l)}}this.setCanvasStyle("reset")},getLocalXY:function(a){var b=this.getResolution(),c=this.extent;return[(a.x-this.featureDx)/b+-c.left/b,c.top/b-a.y/b]},clear:function(){var a=this.root.height,b=this.root.width; +this.canvas.clearRect(0,0,b,a);this.features={};this.hitDetection&&this.hitContext.clearRect(0,0,b,a)},getFeatureIdFromEvent:function(a){var b;if(this.hitDetection&&"none"!==this.root.style.display&&!this.map.dragging&&(a=a.xy,a=this.hitContext.getImageData(a.x|0,a.y|0,1,1).data,255===a[3]&&(a=a[2]+256*(a[1]+256*a[0])))){a="OpenLayers_Feature_Vector_"+(a-1+this.hitOverflow);try{b=this.features[a][0]}catch(c){}}return b},eraseFeatures:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=0;b<a.length;++b)delete this.features[a[b].id]; +this.redraw()},redraw:function(){if(!this.locked){var a=this.root.height,b=this.root.width;this.canvas.clearRect(0,0,b,a);this.hitDetection&&this.hitContext.clearRect(0,0,b,a);var a=[],c,d,e=this.map.baseLayer&&this.map.baseLayer.wrapDateLine&&this.map.getMaxExtent(),f;for(f in this.features)this.features.hasOwnProperty(f)&&(b=this.features[f][0],c=b.geometry,this.calculateFeatureDx(c.getBounds(),e),d=this.features[f][1],this.drawGeometry(c,d,b.id),d.label&&a.push([b,d]));b=0;for(c=a.length;b<c;++b)f= +a[b],this.drawText(f[0].geometry.getCentroid(),f[1])}},CLASS_NAME:"OpenLayers.Renderer.Canvas"});OpenLayers.Renderer.Canvas.LABEL_ALIGN={l:"left",r:"right",t:"top",b:"bottom"};OpenLayers.Renderer.Canvas.LABEL_FACTOR={l:0,r:-1,t:0,b:-1};OpenLayers.Renderer.Canvas.drawImageScaleFactor=null;OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:!1,evt:null,touch:!1,initialize:function(a,b,c){OpenLayers.Util.extend(this,c);this.control=a;this.callbacks=b;(a=this.map||a.map)&&this.setMap(a);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},setMap:function(a){this.map=a},checkModifiers:function(a){return null==this.keyMask?!0:((a.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(a.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(a.altKey?OpenLayers.Handler.MOD_ALT: +0)|(a.metaKey?OpenLayers.Handler.MOD_META:0))==this.keyMask},activate:function(){if(this.active)return!1;for(var a=OpenLayers.Events.prototype.BROWSER_EVENTS,b=0,c=a.length;b<c;b++)this[a[b]]&&this.register(a[b],this[a[b]]);return this.active=!0},deactivate:function(){if(!this.active)return!1;for(var a=OpenLayers.Events.prototype.BROWSER_EVENTS,b=0,c=a.length;b<c;b++)this[a[b]]&&this.unregister(a[b],this[a[b]]);this.active=this.touch=!1;return!0},startTouch:function(){if(!this.touch){this.touch=!0; +for(var a="mousedown mouseup mousemove click dblclick mouseout".split(" "),b=0,c=a.length;b<c;b++)this[a[b]]&&this.unregister(a[b],this[a[b]])}},callback:function(a,b){a&&this.callbacks[a]&&this.callbacks[a].apply(this.control,b)},register:function(a,b){this.map.events.registerPriority(a,this,b);this.map.events.registerPriority(a,this,this.setEvent)},unregister:function(a,b){this.map.events.unregister(a,this,b);this.map.events.unregister(a,this,this.setEvent)},setEvent:function(a){this.evt=a;return!0}, +destroy:function(){this.deactivate();this.control=this.map=null},CLASS_NAME:"OpenLayers.Handler"});OpenLayers.Handler.MOD_NONE=0;OpenLayers.Handler.MOD_SHIFT=1;OpenLayers.Handler.MOD_CTRL=2;OpenLayers.Handler.MOD_ALT=4;OpenLayers.Handler.MOD_META=8;OpenLayers.Handler.MouseWheel=OpenLayers.Class(OpenLayers.Handler,{wheelListener:null,interval:0,maxDelta:Number.POSITIVE_INFINITY,delta:0,cumulative:!0,initialize:function(a,b,c){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.wheelListener=OpenLayers.Function.bindAsEventListener(this.onWheelEvent,this)},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.wheelListener=null},onWheelEvent:function(a){if(this.map&&this.checkModifiers(a)){for(var b= +!1,c=!1,d=!1,e=OpenLayers.Event.element(a);null!=e&&!d&&!b;){if(!b)try{var f,b=(f=e.currentStyle?e.currentStyle.overflow:document.defaultView.getComputedStyle(e,null).getPropertyValue("overflow"))&&"auto"==f||"scroll"==f}catch(l){}if(!c&&(c=OpenLayers.Element.hasClass(e,"olScrollable"),!c))for(var d=0,g=this.map.layers.length;d<g;d++){var h=this.map.layers[d];if(e==h.div||e==h.pane){c=!0;break}}d=e==this.map.div;e=e.parentNode}if(!b&&d){if(c)if(b=0,a.wheelDelta?(b=a.wheelDelta,0===b%160&&(b*=.75), +b/=120):a.detail&&(b=-(a.detail/Math.abs(a.detail))),this.delta+=b,window.clearTimeout(this._timeoutId),this.interval&&Math.abs(this.delta)<this.maxDelta){var k=OpenLayers.Util.extend({},a);this._timeoutId=window.setTimeout(OpenLayers.Function.bind(function(){this.wheelZoom(k)},this),this.interval)}else this.wheelZoom(a);OpenLayers.Event.stop(a)}}},wheelZoom:function(a){var b=this.delta;this.delta=0;b&&(a.xy=this.map.events.getMousePosition(a),0>b?this.callback("down",[a,this.cumulative?Math.max(-this.maxDelta, +b):-1]):this.callback("up",[a,this.cumulative?Math.min(this.maxDelta,b):1]))},activate:function(a){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){var b=this.wheelListener;OpenLayers.Event.observe(window,"DOMMouseScroll",b);OpenLayers.Event.observe(window,"mousewheel",b);OpenLayers.Event.observe(document,"mousewheel",b);return!0}return!1},deactivate:function(a){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){var b=this.wheelListener;OpenLayers.Event.stopObserving(window, +"DOMMouseScroll",b);OpenLayers.Event.stopObserving(window,"mousewheel",b);OpenLayers.Event.stopObserving(document,"mousewheel",b);return!0}return!1},CLASS_NAME:"OpenLayers.Handler.MouseWheel"});OpenLayers.Tile=OpenLayers.Class({events:null,eventListeners:null,id:null,layer:null,url:null,bounds:null,size:null,position:null,isLoading:!1,initialize:function(a,b,c,d,e,f){this.layer=a;this.position=b.clone();this.setBounds(c);this.url=d;e&&(this.size=e.clone());this.id=OpenLayers.Util.createUniqueID("Tile_");OpenLayers.Util.extend(this,f);this.events=new OpenLayers.Events(this);if(this.eventListeners instanceof Object)this.events.on(this.eventListeners)},unload:function(){this.isLoading&&(this.isLoading= +!1,this.events.triggerEvent("unload"))},destroy:function(){this.position=this.size=this.bounds=this.layer=null;this.eventListeners&&this.events.un(this.eventListeners);this.events.destroy();this.events=this.eventListeners=null},draw:function(a){a||this.clear();var b=this.shouldDraw();b&&!a&&!1===this.events.triggerEvent("beforedraw")&&(b=null);return b},shouldDraw:function(){var a=!1,b=this.layer.maxExtent;if(b){var c=this.layer.map,c=c.baseLayer.wrapDateLine&&c.getMaxExtent();this.bounds.intersectsBounds(b, +{inclusive:!1,worldBounds:c})&&(a=!0)}return a||this.layer.displayOutsideMaxExtent},setBounds:function(a){a=a.clone();if(this.layer.map.baseLayer.wrapDateLine){var b=this.layer.map.getMaxExtent(),c=this.layer.map.getResolution();a=a.wrapDateLine(b,{leftTolerance:c,rightTolerance:c})}this.bounds=a},moveTo:function(a,b,c){null==c&&(c=!0);this.setBounds(a);this.position=b.clone();c&&this.draw()},clear:function(a){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Util=OpenLayers.Util||{}; +OpenLayers.Util.vendorPrefix=function(){function a(a){return a?a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()}).replace(/^ms-/,"-ms-"):null}function b(a,b){if(void 0===g[b]){var c,e=0,f=d.length,n="undefined"!==typeof a.cssText;for(g[b]=null;e<f;e++)if((c=d[e])?(n||(c=c.toLowerCase()),c=c+b.charAt(0).toUpperCase()+b.slice(1)):c=b,void 0!==a[c]){g[b]=c;break}}return g[b]}function c(a){return b(e,a)}var d=["","O","ms","Moz","Webkit"],e=document.createElement("div").style,f={},g={};return{css:function(b){if(void 0=== +f[b]){var d=b.replace(/(-[\s\S])/g,function(a){return a.charAt(1).toUpperCase()}),d=c(d);f[b]=a(d)}return f[b]},js:b,style:c,cssCache:f,jsCache:g}}();OpenLayers.Animation=function(a){var b=OpenLayers.Util.vendorPrefix.js(a,"requestAnimationFrame"),c=!!b,d=function(){var c=a[b]||function(b,c){a.setTimeout(b,16)};return function(b,d){c.apply(a,[b,d])}}(),e=0,f={};return{isNative:c,requestFrame:d,start:function(a,b,c){b=0<b?b:Number.POSITIVE_INFINITY;var l=++e,m=+new Date;f[l]=function(){f[l]&&+new Date-m<=b?(a(),f[l]&&d(f[l],c)):delete f[l]};d(f[l],c);return l},stop:function(a){delete f[a]}}}(window);OpenLayers.Tile.Image=OpenLayers.Class(OpenLayers.Tile,{url:null,imgDiv:null,frame:null,imageReloadAttempts:null,layerAlphaHack:null,asyncRequestId:null,maxGetUrlLength:null,canvasContext:null,crossOriginKeyword:null,initialize:function(a,b,c,d,e,f){OpenLayers.Tile.prototype.initialize.apply(this,arguments);this.url=d;this.layerAlphaHack=this.layer.alpha&&OpenLayers.Util.alphaHack();if(null!=this.maxGetUrlLength||this.layer.gutter||this.layerAlphaHack)this.frame=document.createElement("div"),this.frame.style.position= +"absolute",this.frame.style.overflow="hidden";null!=this.maxGetUrlLength&&OpenLayers.Util.extend(this,OpenLayers.Tile.Image.IFrame)},destroy:function(){this.imgDiv&&(this.clear(),this.frame=this.imgDiv=null);this.asyncRequestId=null;OpenLayers.Tile.prototype.destroy.apply(this,arguments)},draw:function(){var a=OpenLayers.Tile.prototype.draw.apply(this,arguments);a?(this.layer!=this.layer.map.baseLayer&&this.layer.reproject&&(this.bounds=this.getBoundsFromBaseLayer(this.position)),this.isLoading?this._loadEvent= +"reload":(this.isLoading=!0,this._loadEvent="loadstart"),this.renderTile(),this.positionTile()):!1===a&&this.unload();return a},renderTile:function(){if(this.layer.async){var a=this.asyncRequestId=(this.asyncRequestId||0)+1;this.layer.getURLasync(this.bounds,function(b){a==this.asyncRequestId&&(this.url=b,this.initImage())},this)}else this.url=this.layer.getURL(this.bounds),this.initImage()},positionTile:function(){var a=this.getTile().style,b=this.frame?this.size:this.layer.getImageSize(this.bounds), +c=1;this.layer instanceof OpenLayers.Layer.Grid&&(c=this.layer.getServerResolution()/this.layer.map.getResolution());a.left=this.position.x+"px";a.top=this.position.y+"px";a.width=Math.round(c*b.w)+"px";a.height=Math.round(c*b.h)+"px"},clear:function(){OpenLayers.Tile.prototype.clear.apply(this,arguments);var a=this.imgDiv;if(a){var b=this.getTile();b.parentNode===this.layer.div&&this.layer.div.removeChild(b);this.setImgSrc();!0===this.layerAlphaHack&&(a.style.filter="");OpenLayers.Element.removeClass(a, +"olImageLoadError")}this.canvasContext=null},getImage:function(){if(!this.imgDiv){this.imgDiv=OpenLayers.Tile.Image.IMAGE.cloneNode(!1);var a=this.imgDiv.style;if(this.frame){var b=0,c=0;this.layer.gutter&&(b=this.layer.gutter/this.layer.tileSize.w*100,c=this.layer.gutter/this.layer.tileSize.h*100);a.left=-b+"%";a.top=-c+"%";a.width=2*b+100+"%";a.height=2*c+100+"%"}a.visibility="hidden";a.opacity=0;1>this.layer.opacity&&(a.filter="alpha(opacity="+100*this.layer.opacity+")");a.position="absolute"; +this.layerAlphaHack&&(a.paddingTop=a.height,a.height="0",a.width="100%");this.frame&&this.frame.appendChild(this.imgDiv)}return this.imgDiv},setImage:function(a){this.imgDiv=a},initImage:function(){if(this.url||this.imgDiv){this.events.triggerEvent("beforeload");this.layer.div.appendChild(this.getTile());this.events.triggerEvent(this._loadEvent);var a=this.getImage(),b=a.getAttribute("src")||"";this.url&&OpenLayers.Util.isEquivalentUrl(b,this.url)?this._loadTimeout=window.setTimeout(OpenLayers.Function.bind(this.onImageLoad, +this),0):(this.stopLoading(),this.crossOriginKeyword&&a.removeAttribute("crossorigin"),OpenLayers.Event.observe(a,"load",OpenLayers.Function.bind(this.onImageLoad,this)),OpenLayers.Event.observe(a,"error",OpenLayers.Function.bind(this.onImageError,this)),this.imageReloadAttempts=0,this.setImgSrc(this.url))}else this.isLoading=!1},setImgSrc:function(a){var b=this.imgDiv;a?(b.style.visibility="hidden",b.style.opacity=0,this.crossOriginKeyword&&("data:"!==a.substr(0,5)?b.setAttribute("crossorigin",this.crossOriginKeyword): +b.removeAttribute("crossorigin")),b.src=a):(this.stopLoading(),this.imgDiv=null,b.parentNode&&b.parentNode.removeChild(b))},getTile:function(){return this.frame?this.frame:this.getImage()},createBackBuffer:function(){if(this.imgDiv&&!this.isLoading){var a;this.frame?(a=this.frame.cloneNode(!1),a.appendChild(this.imgDiv)):a=this.imgDiv;this.imgDiv=null;return a}},onImageLoad:function(){var a=this.imgDiv;this.stopLoading();a.style.visibility="inherit";a.style.opacity=this.layer.opacity;this.isLoading= +!1;this.canvasContext=null;this.events.triggerEvent("loadend");!0===this.layerAlphaHack&&(a.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+a.src+"', sizingMethod='scale')")},onImageError:function(){var a=this.imgDiv;null!=a.src&&(this.imageReloadAttempts++,this.imageReloadAttempts<=OpenLayers.IMAGE_RELOAD_ATTEMPTS?this.setImgSrc(this.layer.getURL(this.bounds)):(OpenLayers.Element.addClass(a,"olImageLoadError"),this.events.triggerEvent("loaderror"),this.onImageLoad()))},stopLoading:function(){OpenLayers.Event.stopObservingElement(this.imgDiv); +window.clearTimeout(this._loadTimeout);delete this._loadTimeout},getCanvasContext:function(){if(OpenLayers.CANVAS_SUPPORTED&&this.imgDiv&&!this.isLoading){if(!this.canvasContext){var a=document.createElement("canvas");a.width=this.size.w;a.height=this.size.h;this.canvasContext=a.getContext("2d");this.canvasContext.drawImage(this.imgDiv,0,0)}return this.canvasContext}},CLASS_NAME:"OpenLayers.Tile.Image"}); +OpenLayers.Tile.Image.IMAGE=function(){var a=new Image;a.className="olTileImage";a.galleryImg="no";return a}();OpenLayers.Format.GML.v2=OpenLayers.Class(OpenLayers.Format.GML.Base,{schemaLocation:"http://www.opengis.net/gml http://schemas.opengis.net/gml/2.1.2/feature.xsd",initialize:function(a){OpenLayers.Format.GML.Base.prototype.initialize.apply(this,[a])},readers:{gml:OpenLayers.Util.applyDefaults({outerBoundaryIs:function(a,b){var c={};this.readChildNodes(a,c);b.outer=c.components[0]},innerBoundaryIs:function(a,b){var c={};this.readChildNodes(a,c);b.inner.push(c.components[0])},Box:function(a,b){var c= +{};this.readChildNodes(a,c);b.components||(b.components=[]);var d=c.points[0],c=c.points[1];b.components.push(new OpenLayers.Bounds(d.x,d.y,c.x,c.y))}},OpenLayers.Format.GML.Base.prototype.readers.gml),feature:OpenLayers.Format.GML.Base.prototype.readers.feature,wfs:OpenLayers.Format.GML.Base.prototype.readers.wfs},write:function(a){var b;b=OpenLayers.Util.isArray(a)?"wfs:FeatureCollection":"gml:featureMember";a=this.writeNode(b,a);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation); +return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{gml:OpenLayers.Util.applyDefaults({Point:function(a){var b=this.createElementNSPlus("gml:Point");this.writeNode("coordinates",[a],b);return b},coordinates:function(a){for(var b=a.length,c=Array(b),d,e=0;e<b;++e)d=a[e],c[e]=this.xy?d.x+","+d.y:d.y+","+d.x,void 0!=d.z&&(c[e]+=","+d.z);return this.createElementNSPlus("gml:coordinates",{attributes:{decimal:".",cs:",",ts:" "},value:1==b?c[0]:c.join(" ")})},LineString:function(a){var b= +this.createElementNSPlus("gml:LineString");this.writeNode("coordinates",a.components,b);return b},Polygon:function(a){var b=this.createElementNSPlus("gml:Polygon");this.writeNode("outerBoundaryIs",a.components[0],b);for(var c=1;c<a.components.length;++c)this.writeNode("innerBoundaryIs",a.components[c],b);return b},outerBoundaryIs:function(a){var b=this.createElementNSPlus("gml:outerBoundaryIs");this.writeNode("LinearRing",a,b);return b},innerBoundaryIs:function(a){var b=this.createElementNSPlus("gml:innerBoundaryIs"); +this.writeNode("LinearRing",a,b);return b},LinearRing:function(a){var b=this.createElementNSPlus("gml:LinearRing");this.writeNode("coordinates",a.components,b);return b},Box:function(a){var b=this.createElementNSPlus("gml:Box");this.writeNode("coordinates",[{x:a.left,y:a.bottom},{x:a.right,y:a.top}],b);this.srsName&&b.setAttribute("srsName",this.srsName);return b}},OpenLayers.Format.GML.Base.prototype.writers.gml),feature:OpenLayers.Format.GML.Base.prototype.writers.feature,wfs:OpenLayers.Format.GML.Base.prototype.writers.wfs}, +CLASS_NAME:"OpenLayers.Format.GML.v2"});OpenLayers.Format.Filter.v1_0_0=OpenLayers.Class(OpenLayers.Format.GML.v2,OpenLayers.Format.Filter.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/ogc/filter/1.0.0/filter.xsd",initialize:function(a){OpenLayers.Format.GML.v2.prototype.initialize.apply(this,[a])},readers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsNotEqualTo:function(a, +b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.NOT_EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLike:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LIKE});this.readChildNodes(a,c);var d=a.getAttribute("wildCard"),e=a.getAttribute("singleChar"),f=a.getAttribute("escape");c.value2regex(d,e,f);b.filters.push(c)}},OpenLayers.Format.Filter.v1.prototype.readers.ogc),gml:OpenLayers.Format.GML.v2.prototype.readers.gml, +feature:OpenLayers.Format.GML.v2.prototype.readers.feature},writers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsNotEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsNotEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsLike:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLike", +{attributes:{wildCard:"*",singleChar:".",escape:"!"}});this.writeNode("PropertyName",a,b);this.writeNode("Literal",a.regex2value(),b);return b},BBOX:function(a){var b=this.createElementNSPlus("ogc:BBOX");a.property&&this.writeNode("PropertyName",a,b);var c=this.writeNode("gml:Box",a.value,b);a.projection&&c.setAttribute("srsName",a.projection);return b}},OpenLayers.Format.Filter.v1.prototype.writers.ogc),gml:OpenLayers.Format.GML.v2.prototype.writers.gml,feature:OpenLayers.Format.GML.v2.prototype.writers.feature}, +writeSpatial:function(a,b){var c=this.createElementNSPlus("ogc:"+b);this.writeNode("PropertyName",a,c);if(a.value instanceof OpenLayers.Filter.Function)this.writeNode("Function",a.value,c);else{var d;d=a.value instanceof OpenLayers.Geometry?this.writeNode("feature:_geometry",a.value).firstChild:this.writeNode("gml:Box",a.value);a.projection&&d.setAttribute("srsName",a.projection);c.appendChild(d)}return c},CLASS_NAME:"OpenLayers.Format.Filter.v1_0_0"});OpenLayers.Format.WFST.v1_0_0=OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0,OpenLayers.Format.WFST.v1,{version:"1.0.0",srsNameInQuery:!1,schemaLocations:{wfs:"http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd"},initialize:function(a){OpenLayers.Format.Filter.v1_0_0.prototype.initialize.apply(this,[a]);OpenLayers.Format.WFST.v1.prototype.initialize.apply(this,[a])},readNode:function(a,b,c){return OpenLayers.Format.GML.v2.prototype.readNode.apply(this,arguments)},readers:{wfs:OpenLayers.Util.applyDefaults({WFS_TransactionResponse:function(a, +b){b.insertIds=[];b.success=!1;this.readChildNodes(a,b)},InsertResult:function(a,b){var c={fids:[]};this.readChildNodes(a,c);b.insertIds=b.insertIds.concat(c.fids)},TransactionResult:function(a,b){this.readChildNodes(a,b)},Status:function(a,b){this.readChildNodes(a,b)},SUCCESS:function(a,b){b.success=!0}},OpenLayers.Format.WFST.v1.prototype.readers.wfs),gml:OpenLayers.Format.GML.v2.prototype.readers.gml,feature:OpenLayers.Format.GML.v2.prototype.readers.feature,ogc:OpenLayers.Format.Filter.v1_0_0.prototype.readers.ogc}, +writers:{wfs:OpenLayers.Util.applyDefaults({Query:function(a){a=OpenLayers.Util.extend({featureNS:this.featureNS,featurePrefix:this.featurePrefix,featureType:this.featureType,srsName:this.srsName,srsNameInQuery:this.srsNameInQuery},a);var b=a.featurePrefix,c=this.createElementNSPlus("wfs:Query",{attributes:{typeName:(b?b+":":"")+a.featureType}});a.srsNameInQuery&&a.srsName&&c.setAttribute("srsName",a.srsName);a.featureNS&&c.setAttribute("xmlns:"+b,a.featureNS);if(a.propertyNames)for(var b=0,d=a.propertyNames.length;b< +d;b++)this.writeNode("ogc:PropertyName",{property:a.propertyNames[b]},c);a.filter&&(this.setFilterProperty(a.filter),this.writeNode("ogc:Filter",a.filter,c));return c}},OpenLayers.Format.WFST.v1.prototype.writers.wfs),gml:OpenLayers.Format.GML.v2.prototype.writers.gml,feature:OpenLayers.Format.GML.v2.prototype.writers.feature,ogc:OpenLayers.Format.Filter.v1_0_0.prototype.writers.ogc},CLASS_NAME:"OpenLayers.Format.WFST.v1_0_0"});OpenLayers.ElementsIndexer=OpenLayers.Class({maxZIndex:null,order:null,indices:null,compare:null,initialize:function(a){this.compare=a?OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_Y_ORDER:OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_DRAWING_ORDER;this.clear()},insert:function(a){this.exists(a)&&this.remove(a);var b=a.id;this.determineZIndex(a);for(var c=-1,d=this.order.length,e;1<d-c;)e=parseInt((c+d)/2),0<this.compare(this,a,OpenLayers.Util.getElement(this.order[e]))?c=e:d=e;this.order.splice(d, +0,b);this.indices[b]=this.getZIndex(a);return this.getNextElement(d)},remove:function(a){a=a.id;var b=OpenLayers.Util.indexOf(this.order,a);0<=b&&(this.order.splice(b,1),delete this.indices[a],this.maxZIndex=0<this.order.length?this.indices[this.order[this.order.length-1]]:0)},clear:function(){this.order=[];this.indices={};this.maxZIndex=0},exists:function(a){return null!=this.indices[a.id]},getZIndex:function(a){return a._style.graphicZIndex},determineZIndex:function(a){var b=a._style.graphicZIndex; +null==b?(b=this.maxZIndex,a._style.graphicZIndex=b):b>this.maxZIndex&&(this.maxZIndex=b)},getNextElement:function(a){a+=1;if(a<this.order.length){var b=OpenLayers.Util.getElement(this.order[a]);void 0==b&&(b=this.getNextElement(a));return b}return null},CLASS_NAME:"OpenLayers.ElementsIndexer"}); +OpenLayers.ElementsIndexer.IndexingMethods={Z_ORDER:function(a,b,c){b=a.getZIndex(b);var d=0;c&&(a=a.getZIndex(c),d=b-a);return d},Z_ORDER_DRAWING_ORDER:function(a,b,c){a=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(a,b,c);c&&0==a&&(a=1);return a},Z_ORDER_Y_ORDER:function(a,b,c){a=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(a,b,c);c&&0===a&&(b=c._boundsBottom-b._boundsBottom,a=0===b?1:b);return a}}; +OpenLayers.Renderer.Elements=OpenLayers.Class(OpenLayers.Renderer,{rendererRoot:null,root:null,vectorRoot:null,textRoot:null,xmlns:null,xOffset:0,indexer:null,BACKGROUND_ID_SUFFIX:"_background",LABEL_ID_SUFFIX:"_label",LABEL_OUTLINE_SUFFIX:"_outline",initialize:function(a,b){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.rendererRoot=this.createRenderRoot();this.root=this.createRoot("_root");this.vectorRoot=this.createRoot("_vroot");this.textRoot=this.createRoot("_troot");this.root.appendChild(this.vectorRoot); +this.root.appendChild(this.textRoot);this.rendererRoot.appendChild(this.root);this.container.appendChild(this.rendererRoot);b&&(b.zIndexing||b.yOrdering)&&(this.indexer=new OpenLayers.ElementsIndexer(b.yOrdering))},destroy:function(){this.clear();this.xmlns=this.root=this.rendererRoot=null;OpenLayers.Renderer.prototype.destroy.apply(this,arguments)},clear:function(){var a,b=this.vectorRoot;if(b)for(;a=b.firstChild;)b.removeChild(a);if(b=this.textRoot)for(;a=b.firstChild;)b.removeChild(a);this.indexer&& +this.indexer.clear()},setExtent:function(a,b){var c=OpenLayers.Renderer.prototype.setExtent.apply(this,arguments),d=this.getResolution();if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){var e,f=a.getWidth()/this.map.getExtent().getWidth();a=a.scale(1/f);f=this.map.getMaxExtent();f.right>a.left&&f.right<a.right?e=!0:f.left>a.left&&f.left<a.right&&(e=!1);if(e!==this.rightOfDateLine||b)c=!1,this.xOffset=!0===e?f.getWidth()/d:0;this.rightOfDateLine=e}return c},getNodeType:function(a,b){},drawGeometry:function(a, +b,c){var d=a.CLASS_NAME,e=!0;if("OpenLayers.Geometry.Collection"==d||"OpenLayers.Geometry.MultiPoint"==d||"OpenLayers.Geometry.MultiLineString"==d||"OpenLayers.Geometry.MultiPolygon"==d){for(var d=0,f=a.components.length;d<f;d++)e=this.drawGeometry(a.components[d],b,c)&&e;return e}d=e=!1;"none"!=b.display&&(b.backgroundGraphic?this.redrawBackgroundNode(a.id,a,b,c):d=!0,e=this.redrawNode(a.id,a,b,c));0==e&&(b=document.getElementById(a.id))&&(b._style.backgroundGraphic&&(d=!0),b.parentNode.removeChild(b)); +d&&(b=document.getElementById(a.id+this.BACKGROUND_ID_SUFFIX))&&b.parentNode.removeChild(b);return e},redrawNode:function(a,b,c,d){c=this.applyDefaultSymbolizer(c);a=this.nodeFactory(a,this.getNodeType(b,c));a._featureId=d;a._boundsBottom=b.getBounds().bottom;a._geometryClass=b.CLASS_NAME;a._style=c;b=this.drawGeometryNode(a,b,c);if(!1===b)return!1;a=b.node;this.indexer?(c=this.indexer.insert(a))?this.vectorRoot.insertBefore(a,c):this.vectorRoot.appendChild(a):a.parentNode!==this.vectorRoot&&this.vectorRoot.appendChild(a); +this.postDraw(a);return b.complete},redrawBackgroundNode:function(a,b,c,d){c=OpenLayers.Util.extend({},c);c.externalGraphic=c.backgroundGraphic;c.graphicXOffset=c.backgroundXOffset;c.graphicYOffset=c.backgroundYOffset;c.graphicZIndex=c.backgroundGraphicZIndex;c.graphicWidth=c.backgroundWidth||c.graphicWidth;c.graphicHeight=c.backgroundHeight||c.graphicHeight;c.backgroundGraphic=null;c.backgroundXOffset=null;c.backgroundYOffset=null;c.backgroundGraphicZIndex=null;return this.redrawNode(a+this.BACKGROUND_ID_SUFFIX, +b,c,null)},drawGeometryNode:function(a,b,c){c=c||a._style;var d={isFilled:void 0===c.fill?!0:c.fill,isStroked:void 0===c.stroke?!!c.strokeWidth:c.stroke},e;switch(b.CLASS_NAME){case "OpenLayers.Geometry.Point":!1===c.graphic&&(d.isFilled=!1,d.isStroked=!1);e=this.drawPoint(a,b);break;case "OpenLayers.Geometry.LineString":d.isFilled=!1;e=this.drawLineString(a,b);break;case "OpenLayers.Geometry.LinearRing":e=this.drawLinearRing(a,b);break;case "OpenLayers.Geometry.Polygon":e=this.drawPolygon(a,b);break; +case "OpenLayers.Geometry.Rectangle":e=this.drawRectangle(a,b)}a._options=d;return 0!=e?{node:this.setStyle(a,c,d,b),complete:e}:!1},postDraw:function(a){},drawPoint:function(a,b){},drawLineString:function(a,b){},drawLinearRing:function(a,b){},drawPolygon:function(a,b){},drawRectangle:function(a,b){},drawCircle:function(a,b){},removeText:function(a){var b=document.getElementById(a+this.LABEL_ID_SUFFIX);b&&this.textRoot.removeChild(b);(a=document.getElementById(a+this.LABEL_OUTLINE_SUFFIX))&&this.textRoot.removeChild(a)}, +getFeatureIdFromEvent:function(a){var b=a.target,c=b&&b.correspondingUseElement;return(c?c:b||a.srcElement)._featureId},eraseGeometry:function(a,b){if("OpenLayers.Geometry.MultiPoint"==a.CLASS_NAME||"OpenLayers.Geometry.MultiLineString"==a.CLASS_NAME||"OpenLayers.Geometry.MultiPolygon"==a.CLASS_NAME||"OpenLayers.Geometry.Collection"==a.CLASS_NAME)for(var c=0,d=a.components.length;c<d;c++)this.eraseGeometry(a.components[c],b);else(c=OpenLayers.Util.getElement(a.id))&&c.parentNode&&(c.geometry&&(c.geometry.destroy(), +c.geometry=null),c.parentNode.removeChild(c),this.indexer&&this.indexer.remove(c),c._style.backgroundGraphic&&(c=OpenLayers.Util.getElement(a.id+this.BACKGROUND_ID_SUFFIX))&&c.parentNode&&c.parentNode.removeChild(c))},nodeFactory:function(a,b){var c=OpenLayers.Util.getElement(a);c?this.nodeTypeCompare(c,b)||(c.parentNode.removeChild(c),c=this.nodeFactory(a,b)):c=this.createNode(b,a);return c},nodeTypeCompare:function(a,b){},createNode:function(a,b){},moveRoot:function(a){var b=this.root;a.root.parentNode== +this.rendererRoot&&(b=a.root);b.parentNode.removeChild(b);a.rendererRoot.appendChild(b)},getRenderLayerId:function(){return this.root.parentNode.parentNode.id},isComplexSymbol:function(a){return"circle"!=a&&!!a},CLASS_NAME:"OpenLayers.Renderer.Elements"});OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,getParameters:function(a){a=a||window.location.href;var b=OpenLayers.Util.getParameters(a),c=a.indexOf("#");0<c&&(a="?"+a.substring(c+1,a.length),OpenLayers.Util.extend(b,OpenLayers.Util.getParameters(a)));return b},setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var b=0,c=this.map.controls.length;b<c;b++){var d=this.map.controls[b];if(d!=this&& +"OpenLayers.Control.ArgParser"==d.CLASS_NAME){d.displayProjection!=this.displayProjection&&(this.displayProjection=d.displayProjection);break}}b==this.map.controls.length&&(b=this.getParameters(),b.layers&&(this.layers=b.layers,this.map.events.register("addlayer",this,this.configureLayers),this.configureLayers()),b.lat&&b.lon&&(this.center=new OpenLayers.LonLat(parseFloat(b.lon),parseFloat(b.lat)),b.zoom&&(this.zoom=parseFloat(b.zoom)),this.map.events.register("changebaselayer",this,this.setCenter), +this.setCenter()))},setCenter:function(){this.map.baseLayer&&(this.map.events.unregister("changebaselayer",this,this.setCenter),this.displayProjection&&this.center.transform(this.displayProjection,this.map.getProjectionObject()),this.map.setCenter(this.center,this.zoom))},configureLayers:function(){if(this.layers.length==this.map.layers.length){this.map.events.unregister("addlayer",this,this.configureLayers);for(var a=0,b=this.layers.length;a<b;a++){var c=this.map.layers[a],d=this.layers.charAt(a); +"B"==d?this.map.setBaseLayer(c):"T"!=d&&"F"!=d||c.setVisibility("T"==d)}}},CLASS_NAME:"OpenLayers.Control.ArgParser"});OpenLayers.Control.Permalink=OpenLayers.Class(OpenLayers.Control,{argParserClass:OpenLayers.Control.ArgParser,element:null,anchor:!1,base:"",displayProjection:null,initialize:function(a,b,c){null===a||"object"!=typeof a||OpenLayers.Util.isElement(a)?(OpenLayers.Control.prototype.initialize.apply(this,[c]),this.element=OpenLayers.Util.getElement(a),this.base=b||document.location.href):(this.base=document.location.href,OpenLayers.Control.prototype.initialize.apply(this,[a]),null!=this.element&&(this.element= +OpenLayers.Util.getElement(this.element)))},destroy:function(){this.element&&this.element.parentNode==this.div&&(this.div.removeChild(this.element),this.element=null);this.map&&this.map.events.unregister("moveend",this,this.updateLink);OpenLayers.Control.prototype.destroy.apply(this,arguments)},setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var b=0,c=this.map.controls.length;b<c;b++){var d=this.map.controls[b];if(d.CLASS_NAME==this.argParserClass.CLASS_NAME){d.displayProjection!= +this.displayProjection&&(this.displayProjection=d.displayProjection);break}}b==this.map.controls.length&&this.map.addControl(new this.argParserClass({displayProjection:this.displayProjection}))},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.element||this.anchor||(this.element=document.createElement("a"),this.element.innerHTML=OpenLayers.i18n("Permalink"),this.element.href="",this.div.appendChild(this.element));this.map.events.on({moveend:this.updateLink,changelayer:this.updateLink, +changebaselayer:this.updateLink,scope:this});this.updateLink();return this.div},updateLink:function(){var a=this.anchor?"#":"?",b=this.base,c=null;-1!=b.indexOf("#")&&0==this.anchor&&(c=b.substring(b.indexOf("#"),b.length));-1!=b.indexOf(a)&&(b=b.substring(0,b.indexOf(a)));b=b.split("#")[0]+a+OpenLayers.Util.getParameterString(this.createParams());c&&(b+=c);this.anchor&&!this.element?window.location.href=b:this.element.href=b},createParams:function(a,b,c){a=a||this.map.getCenter();var d=OpenLayers.Util.getParameters(this.base); +if(a)for(d.zoom=b||this.map.getZoom(),b=a.lat,a=a.lon,this.displayProjection&&(b=OpenLayers.Projection.transform({x:a,y:b},this.map.getProjectionObject(),this.displayProjection),a=b.x,b=b.y),d.lat=Math.round(1E5*b)/1E5,d.lon=Math.round(1E5*a)/1E5,c=c||this.map.layers,d.layers="",a=0,b=c.length;a<b;a++){var e=c[a];d.layers=e.isBaseLayer?d.layers+(e==this.map.baseLayer?"B":"0"):d.layers+(e.getVisibility()?"T":"F")}return d},CLASS_NAME:"OpenLayers.Control.Permalink"});OpenLayers.Strategy=OpenLayers.Class({layer:null,options:null,active:null,autoActivate:!0,autoDestroy:!0,initialize:function(a){OpenLayers.Util.extend(this,a);this.options=a;this.active=!1},destroy:function(){this.deactivate();this.options=this.layer=null},setLayer:function(a){this.layer=a},activate:function(){return this.active?!1:this.active=!0},deactivate:function(){return this.active?(this.active=!1,!0):!1},CLASS_NAME:"OpenLayers.Strategy"});OpenLayers.Strategy.Fixed=OpenLayers.Class(OpenLayers.Strategy,{preload:!1,activate:function(){var a=OpenLayers.Strategy.prototype.activate.apply(this,arguments);if(a)if(this.layer.events.on({refresh:this.load,scope:this}),1==this.layer.visibility||this.preload)this.load();else this.layer.events.on({visibilitychanged:this.load,scope:this});return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&this.layer.events.un({refresh:this.load,visibilitychanged:this.load, +scope:this});return a},load:function(a){var b=this.layer;b.events.triggerEvent("loadstart",{filter:b.filter});b.protocol.read(OpenLayers.Util.applyDefaults({callback:this.merge,filter:b.filter,scope:this},a));b.events.un({visibilitychanged:this.load,scope:this})},merge:function(a){var b=this.layer;b.destroyFeatures();var c=a.features;if(c&&0<c.length){var d=b.projection,e=b.map.getProjectionObject();if(!e.equals(d))for(var f,g=0,h=c.length;g<h;++g)(f=c[g].geometry)&&f.transform(d,e);b.addFeatures(c)}b.events.triggerEvent("loadend", +{response:a})},CLASS_NAME:"OpenLayers.Strategy.Fixed"});OpenLayers.Format.WFSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.0",CLASS_NAME:"OpenLayers.Format.WFSCapabilities"});OpenLayers.Format.WFSCapabilities.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{wfs:"http://www.opengis.net/wfs",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",ows:"http://www.opengis.net/ows"},errorProperty:"featureTypeList",defaultPrefix:"wfs",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},readers:{wfs:{WFS_Capabilities:function(a, +b){this.readChildNodes(a,b)},FeatureTypeList:function(a,b){b.featureTypeList={featureTypes:[]};this.readChildNodes(a,b.featureTypeList)},FeatureType:function(a,b){var c={};this.readChildNodes(a,c);b.featureTypes.push(c)},Name:function(a,b){var c=this.getChildValue(a);c&&(c=c.split(":"),b.name=c.pop(),0<c.length&&(b.featureNS=this.lookupNamespaceURI(a,c[0])))},Title:function(a,b){var c=this.getChildValue(a);c&&(b.title=c)},Abstract:function(a,b){var c=this.getChildValue(a);c&&(b["abstract"]=c)}}}, +CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1"});OpenLayers.Format.WFSCapabilities.v1_1_0=OpenLayers.Class(OpenLayers.Format.WFSCapabilities.v1,{regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},readers:{wfs:OpenLayers.Util.applyDefaults({DefaultSRS:function(a,b){var c=this.getChildValue(a);c&&(b.srs=c)}},OpenLayers.Format.WFSCapabilities.v1.prototype.readers.wfs),ows:OpenLayers.Format.OWSCommon.v1.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1_1_0"});OpenLayers.Protocol=OpenLayers.Class({format:null,options:null,autoDestroy:!0,defaultFilter:null,initialize:function(a){a=a||{};OpenLayers.Util.extend(this,a);this.options=a},mergeWithDefaultFilter:function(a){return a&&this.defaultFilter?new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,filters:[this.defaultFilter,a]}):a||this.defaultFilter||void 0},destroy:function(){this.format=this.options=null},read:function(a){a=a||{};a.filter=this.mergeWithDefaultFilter(a.filter)},create:function(){}, +update:function(){},"delete":function(){},commit:function(){},abort:function(a){},createCallback:function(a,b,c){return OpenLayers.Function.bind(function(){a.apply(this,[b,c])},this)},CLASS_NAME:"OpenLayers.Protocol"});OpenLayers.Protocol.Response=OpenLayers.Class({code:null,requestType:null,last:!0,features:null,data:null,reqFeatures:null,priv:null,error:null,initialize:function(a){OpenLayers.Util.extend(this,a)},success:function(){return 0<this.code},CLASS_NAME:"OpenLayers.Protocol.Response"}); +OpenLayers.Protocol.Response.SUCCESS=1;OpenLayers.Protocol.Response.FAILURE=0;OpenLayers.Protocol.WFS=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Protocol.WFS.DEFAULTS);var b=OpenLayers.Protocol.WFS["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported WFS version: "+a.version;return new b(a)}; +OpenLayers.Protocol.WFS.fromWMSLayer=function(a,b){var c,d;c=a.params.LAYERS;c=(OpenLayers.Util.isArray(c)?c[0]:c).split(":");1<c.length&&(d=c[0]);c=c.pop();d={url:a.url,featureType:c,featurePrefix:d,srsName:a.projection&&a.projection.getCode()||a.map&&a.map.getProjectionObject().getCode(),version:"1.1.0"};return new OpenLayers.Protocol.WFS(OpenLayers.Util.applyDefaults(b,d))};OpenLayers.Protocol.WFS.DEFAULTS={version:"1.0.0"};OpenLayers.ProxyHost="";OpenLayers.Request||(OpenLayers.Request={}); +OpenLayers.Util.extend(OpenLayers.Request,{DEFAULT_CONFIG:{method:"GET",url:window.location.href,async:!0,user:void 0,password:void 0,params:null,proxy:OpenLayers.ProxyHost,headers:{},data:null,callback:function(){},success:null,failure:null,scope:null},URL_SPLIT_REGEX:/([^:]*:)\/\/([^:]*:?[^@]*@)?([^:\/\?]*):?([^\/\?]*)/,events:new OpenLayers.Events(this),makeSameOrigin:function(a,b){var c=0!==a.indexOf("http"),d=!c&&a.match(this.URL_SPLIT_REGEX);if(d){var e=window.location,c=d[1]==e.protocol&&d[3]== +e.hostname,d=d[4],e=e.port;if(80!=d&&""!=d||"80"!=e&&""!=e)c=c&&d==e}c||b&&(a="function"==typeof b?b(a):b+encodeURIComponent(a));return a},issue:function(a){var b=OpenLayers.Util.extend(this.DEFAULT_CONFIG,{proxy:OpenLayers.ProxyHost});a=a||{};a.headers=a.headers||{};a=OpenLayers.Util.applyDefaults(a,b);a.headers=OpenLayers.Util.applyDefaults(a.headers,b.headers);var b=!1,c;for(c in a.headers)a.headers.hasOwnProperty(c)&&"x-requested-with"===c.toLowerCase()&&(b=!0);!1===b&&(a.headers["X-Requested-With"]= +"XMLHttpRequest");var d=new OpenLayers.Request.XMLHttpRequest,e=OpenLayers.Util.urlAppend(a.url,OpenLayers.Util.getParameterString(a.params||{})),e=OpenLayers.Request.makeSameOrigin(e,a.proxy);d.open(a.method,e,a.async,a.user,a.password);for(var f in a.headers)d.setRequestHeader(f,a.headers[f]);var g=this.events,h=this;d.onreadystatechange=function(){d.readyState==OpenLayers.Request.XMLHttpRequest.DONE&&!1!==g.triggerEvent("complete",{request:d,config:a,requestUrl:e})&&h.runCallbacks({request:d,config:a, +requestUrl:e})};!1===a.async?d.send(a.data):window.setTimeout(function(){0!==d.readyState&&d.send(a.data)},0);return d},runCallbacks:function(a){var b=a.request,c=a.config,d=c.scope?OpenLayers.Function.bind(c.callback,c.scope):c.callback,e;c.success&&(e=c.scope?OpenLayers.Function.bind(c.success,c.scope):c.success);var f;c.failure&&(f=c.scope?OpenLayers.Function.bind(c.failure,c.scope):c.failure);"file:"==OpenLayers.Util.createUrlObject(c.url).protocol&&b.responseText&&(b.status=200);d(b);if(!b.status|| +200<=b.status&&300>b.status)this.events.triggerEvent("success",a),e&&e(b);b.status&&(200>b.status||300<=b.status)&&(this.events.triggerEvent("failure",a),f&&f(b))},GET:function(a){a=OpenLayers.Util.extend(a,{method:"GET"});return OpenLayers.Request.issue(a)},POST:function(a){a=OpenLayers.Util.extend(a,{method:"POST"});a.headers=a.headers?a.headers:{};"CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(a.headers)||(a.headers["Content-Type"]="application/xml");return OpenLayers.Request.issue(a)},PUT:function(a){a= +OpenLayers.Util.extend(a,{method:"PUT"});a.headers=a.headers?a.headers:{};"CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(a.headers)||(a.headers["Content-Type"]="application/xml");return OpenLayers.Request.issue(a)},DELETE:function(a){a=OpenLayers.Util.extend(a,{method:"DELETE"});return OpenLayers.Request.issue(a)},HEAD:function(a){a=OpenLayers.Util.extend(a,{method:"HEAD"});return OpenLayers.Request.issue(a)},OPTIONS:function(a){a=OpenLayers.Util.extend(a,{method:"OPTIONS"});return OpenLayers.Request.issue(a)}});(function(){function a(){this._object=f&&!k?new f:new window.ActiveXObject("Microsoft.XMLHTTP");this._listeners=[]}function b(){return new a}function c(a){b.onreadystatechange&&b.onreadystatechange.apply(a);a.dispatchEvent({type:"readystatechange",bubbles:!1,cancelable:!1,timeStamp:new Date+0})}function d(a){try{a.responseText=a._object.responseText}catch(b){}try{var c;var d=a._object,e=d.responseXML,f=d.responseText;h&&f&&e&&!e.documentElement&&d.getResponseHeader("Content-Type").match(/[^\/]+\/[^\+]+\+xml/)&& +(e=new window.ActiveXObject("Microsoft.XMLDOM"),e.async=!1,e.validateOnParse=!1,e.loadXML(f));c=e&&(h&&0!=e.parseError||!e.documentElement||e.documentElement&&"parsererror"==e.documentElement.tagName)?null:e;a.responseXML=c}catch(b){}try{a.status=a._object.status}catch(b){}try{a.statusText=a._object.statusText}catch(b){}}function e(a){a._object.onreadystatechange=new window.Function}var f=window.XMLHttpRequest,g=!!window.controllers,h=window.document.all&&!window.opera,k=h&&window.navigator.userAgent.match(/MSIE 7.0/); +b.prototype=a.prototype;g&&f.wrapped&&(b.wrapped=f.wrapped);b.UNSENT=0;b.OPENED=1;b.HEADERS_RECEIVED=2;b.LOADING=3;b.DONE=4;b.prototype.readyState=b.UNSENT;b.prototype.responseText="";b.prototype.responseXML=null;b.prototype.status=0;b.prototype.statusText="";b.prototype.priority="NORMAL";b.prototype.onreadystatechange=null;b.onreadystatechange=null;b.onopen=null;b.onsend=null;b.onabort=null;b.prototype.open=function(a,f,k,n,p){delete this._headers;3>arguments.length&&(k=!0);this._async=k;var r=this, +t=this.readyState,u;h&&k&&(u=function(){t!=b.DONE&&(e(r),r.abort())},window.attachEvent("onunload",u));b.onopen&&b.onopen.apply(this,arguments);4<arguments.length?this._object.open(a,f,k,n,p):3<arguments.length?this._object.open(a,f,k,n):this._object.open(a,f,k);this.readyState=b.OPENED;c(this);this._object.onreadystatechange=function(){if(!g||k)r.readyState=r._object.readyState,d(r),r._aborted?r.readyState=b.UNSENT:(r.readyState==b.DONE&&(delete r._data,e(r),h&&k&&window.detachEvent("onunload",u)), +t!=r.readyState&&c(r),t=r.readyState)}};b.prototype.send=function(a){b.onsend&&b.onsend.apply(this,arguments);arguments.length||(a=null);a&&a.nodeType&&(a=window.XMLSerializer?(new window.XMLSerializer).serializeToString(a):a.xml,this._headers["Content-Type"]||this._object.setRequestHeader("Content-Type","application/xml"));this._data=a;a:if(this._object.send(this._data),g&&!this._async)for(this.readyState=b.OPENED,d(this);this.readyState<b.DONE;)if(this.readyState++,c(this),this._aborted)break a}; +b.prototype.abort=function(){b.onabort&&b.onabort.apply(this,arguments);this.readyState>b.UNSENT&&(this._aborted=!0);this._object.abort();e(this);this.readyState=b.UNSENT;delete this._data};b.prototype.getAllResponseHeaders=function(){return this._object.getAllResponseHeaders()};b.prototype.getResponseHeader=function(a){return this._object.getResponseHeader(a)};b.prototype.setRequestHeader=function(a,b){this._headers||(this._headers={});this._headers[a]=b;return this._object.setRequestHeader(a,b)}; +b.prototype.addEventListener=function(a,b,c){for(var d=0,e;e=this._listeners[d];d++)if(e[0]==a&&e[1]==b&&e[2]==c)return;this._listeners.push([a,b,c])};b.prototype.removeEventListener=function(a,b,c){for(var d=0,e;(e=this._listeners[d])&&(e[0]!=a||e[1]!=b||e[2]!=c);d++);e&&this._listeners.splice(d,1)};b.prototype.dispatchEvent=function(a){a={type:a.type,target:this,currentTarget:this,eventPhase:2,bubbles:a.bubbles,cancelable:a.cancelable,timeStamp:a.timeStamp,stopPropagation:function(){},preventDefault:function(){}, +initEvent:function(){}};"readystatechange"==a.type&&this.onreadystatechange&&(this.onreadystatechange.handleEvent||this.onreadystatechange).apply(this,[a]);for(var b=0,c;c=this._listeners[b];b++)c[0]!=a.type||c[2]||(c[1].handleEvent||c[1]).apply(this,[a])};b.prototype.toString=function(){return"[object XMLHttpRequest]"};b.toString=function(){return"[XMLHttpRequest]"};window.Function.prototype.apply||(window.Function.prototype.apply=function(a,b){b||(b=[]);a.__func=this;a.__func(b[0],b[1],b[2],b[3], +b[4]);delete a.__func});OpenLayers.Request||(OpenLayers.Request={});OpenLayers.Request.XMLHttpRequest=b})();OpenLayers.Projection=OpenLayers.Class({proj:null,projCode:null,titleRegEx:/\+title=[^\+]*/,initialize:function(a,b){OpenLayers.Util.extend(this,b);this.projCode=a;"object"==typeof Proj4js&&(this.proj=new Proj4js.Proj(a))},getCode:function(){return this.proj?this.proj.srsCode:this.projCode},getUnits:function(){return this.proj?this.proj.units:null},toString:function(){return this.getCode()},equals:function(a){var b=!1;a&&(a instanceof OpenLayers.Projection||(a=new OpenLayers.Projection(a)),"object"== +typeof Proj4js&&this.proj.defData&&a.proj.defData?b=this.proj.defData.replace(this.titleRegEx,"")==a.proj.defData.replace(this.titleRegEx,""):a.getCode&&(b=this.getCode(),a=a.getCode(),b=b==a||!!OpenLayers.Projection.transforms[b]&&OpenLayers.Projection.transforms[b][a]===OpenLayers.Projection.nullTransform));return b},destroy:function(){delete this.proj;delete this.projCode},CLASS_NAME:"OpenLayers.Projection"});OpenLayers.Projection.transforms={}; +OpenLayers.Projection.defaults={"EPSG:4326":{units:"degrees",maxExtent:[-180,-90,180,90],yx:!0},"CRS:84":{units:"degrees",maxExtent:[-180,-90,180,90]},"EPSG:900913":{units:"m",maxExtent:[-2.003750834E7,-2.003750834E7,2.003750834E7,2.003750834E7]}}; +OpenLayers.Projection.addTransform=function(a,b,c){if(c===OpenLayers.Projection.nullTransform){var d=OpenLayers.Projection.defaults[a];d&&!OpenLayers.Projection.defaults[b]&&(OpenLayers.Projection.defaults[b]=d)}OpenLayers.Projection.transforms[a]||(OpenLayers.Projection.transforms[a]={});OpenLayers.Projection.transforms[a][b]=c}; +OpenLayers.Projection.transform=function(a,b,c){if(b&&c)if(b instanceof OpenLayers.Projection||(b=new OpenLayers.Projection(b)),c instanceof OpenLayers.Projection||(c=new OpenLayers.Projection(c)),b.proj&&c.proj)a=Proj4js.transform(b.proj,c.proj,a);else{b=b.getCode();c=c.getCode();var d=OpenLayers.Projection.transforms;if(d[b]&&d[b][c])d[b][c](a)}return a};OpenLayers.Projection.nullTransform=function(a){return a}; +(function(){function a(a){a.x=180*a.x/2.003750834E7;a.y=180/Math.PI*(2*Math.atan(Math.exp(a.y/2.003750834E7*Math.PI))-Math.PI/2);return a}function b(a){a.x=2.003750834E7*a.x/180;a.y=Math.max(-2.003750834E7,Math.min(Math.log(Math.tan((90+a.y)*Math.PI/360))/Math.PI*2.003750834E7,2.003750834E7));return a}function c(c,d){var e=OpenLayers.Projection.addTransform,f=OpenLayers.Projection.nullTransform,m,q,n,p,r;m=0;for(q=d.length;m<q;++m)for(n=d[m],e(c,n,b),e(n,c,a),r=m+1;r<q;++r)p=d[r],e(n,p,f),e(p,n,f)} +var d=["EPSG:900913","EPSG:3857","EPSG:102113","EPSG:102100"],e=["CRS:84","urn:ogc:def:crs:EPSG:6.6:4326","EPSG:4326"],f;for(f=d.length-1;0<=f;--f)c(d[f],e);for(f=e.length-1;0<=f;--f)c(e[f],d)})();OpenLayers.Format.KML=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{kml:"http://www.opengis.net/kml/2.2",gx:"http://www.google.com/kml/ext/2.2"},kmlns:"http://earth.google.com/kml/2.0",placemarksDesc:"No description available",foldersName:"OpenLayers export",foldersDesc:"Exported on "+new Date,extractAttributes:!0,kvpAttributes:!1,extractStyles:!1,extractTracks:!1,trackAttributes:null,internalns:null,features:null,styles:null,styleBaseUrl:"",fetched:null,maxDepth:0,initialize:function(a){this.regExes= +{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g,kmlColor:/(\w{2})(\w{2})(\w{2})(\w{2})/,kmlIconPalette:/root:\/\/icons\/palette-(\d+)(\.\w+)/,straightBracket:/\$\[(.*?)\]/g};this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){this.features=[];this.styles={};this.fetched={};return this.parseData(a,{depth:0,styleBaseUrl:this.styleBaseUrl})},parseData:function(a,b){"string"==typeof a&& +(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));for(var c=["Link","NetworkLink","Style","StyleMap","Placemark"],d=0,e=c.length;d<e;++d){var f=c[d],g=this.getElementsByTagNameNS(a,"*",f);if(0!=g.length)switch(f.toLowerCase()){case "link":case "networklink":this.parseLinks(g,b);break;case "style":this.extractStyles&&this.parseStyles(g,b);break;case "stylemap":this.extractStyles&&this.parseStyleMaps(g,b);break;case "placemark":this.parseFeatures(g,b)}}return this.features},parseLinks:function(a, +b){if(b.depth>=this.maxDepth)return!1;var c=OpenLayers.Util.extend({},b);c.depth++;for(var d=0,e=a.length;d<e;d++){var f=this.parseProperty(a[d],"*","href");f&&!this.fetched[f]&&(this.fetched[f]=!0,(f=this.fetchLink(f))&&this.parseData(f,c))}},fetchLink:function(a){if(a=OpenLayers.Request.GET({url:a,async:!1}))return a.responseText},parseStyles:function(a,b){for(var c=0,d=a.length;c<d;c++){var e=this.parseStyle(a[c]);e&&(this.styles[(b.styleBaseUrl||"")+"#"+e.id]=e)}},parseKmlColor:function(a){var b= +null;a&&(a=a.match(this.regExes.kmlColor))&&(b={color:"#"+a[4]+a[3]+a[2],opacity:parseInt(a[1],16)/255});return b},parseStyle:function(a){for(var b={},c=["LineStyle","PolyStyle","IconStyle","BalloonStyle","LabelStyle"],d,e,f=0,g=c.length;f<g;++f)if(d=c[f],e=this.getElementsByTagNameNS(a,"*",d)[0])switch(d.toLowerCase()){case "linestyle":d=this.parseProperty(e,"*","color");if(d=this.parseKmlColor(d))b.strokeColor=d.color,b.strokeOpacity=d.opacity;(d=this.parseProperty(e,"*","width"))&&(b.strokeWidth= +d);break;case "polystyle":d=this.parseProperty(e,"*","color");if(d=this.parseKmlColor(d))b.fillOpacity=d.opacity,b.fillColor=d.color;"0"==this.parseProperty(e,"*","fill")&&(b.fillColor="none");"0"==this.parseProperty(e,"*","outline")&&(b.strokeWidth="0");break;case "iconstyle":var h=parseFloat(this.parseProperty(e,"*","scale")||1);d=32*h;var k=32*h,l=this.getElementsByTagNameNS(e,"*","Icon")[0];if(l){var m=this.parseProperty(l,"*","href");if(m){var q=this.parseProperty(l,"*","w"),n=this.parseProperty(l, +"*","h");!OpenLayers.String.startsWith(m,"http://maps.google.com/mapfiles/kml")||q||n||(n=q=64,h/=2);q=q||n;n=n||q;q&&(d=parseInt(q)*h);n&&(k=parseInt(n)*h);if(n=m.match(this.regExes.kmlIconPalette))q=n[1],n=n[2],m=this.parseProperty(l,"*","x"),l=this.parseProperty(l,"*","y"),m="http://maps.google.com/mapfiles/kml/pal"+q+"/icon"+(8*(l?7-l/32:7)+(m?m/32:0))+n;b.graphicOpacity=1;b.externalGraphic=m}}if(e=this.getElementsByTagNameNS(e,"*","hotSpot")[0])m=parseFloat(e.getAttribute("x")),l=parseFloat(e.getAttribute("y")), +q=e.getAttribute("xunits"),"pixels"==q?b.graphicXOffset=-m*h:"insetPixels"==q?b.graphicXOffset=-d+m*h:"fraction"==q&&(b.graphicXOffset=-d*m),e=e.getAttribute("yunits"),"pixels"==e?b.graphicYOffset=-k+l*h+1:"insetPixels"==e?b.graphicYOffset=-(l*h)+1:"fraction"==e&&(b.graphicYOffset=-k*(1-l)+1);b.graphicWidth=d;b.graphicHeight=k;break;case "balloonstyle":(e=OpenLayers.Util.getXmlNodeValue(e))&&(b.balloonStyle=e.replace(this.regExes.straightBracket,"${$1}"));break;case "labelstyle":if(d=this.parseProperty(e, +"*","color"),d=this.parseKmlColor(d))b.fontColor=d.color,b.fontOpacity=d.opacity}!b.strokeColor&&b.fillColor&&(b.strokeColor=b.fillColor);(a=a.getAttribute("id"))&&b&&(b.id=a);return b},parseStyleMaps:function(a,b){for(var c=0,d=a.length;c<d;c++)for(var e=a[c],f=this.getElementsByTagNameNS(e,"*","Pair"),e=e.getAttribute("id"),g=0,h=f.length;g<h;g++){var k=f[g],l=this.parseProperty(k,"*","key");(k=this.parseProperty(k,"*","styleUrl"))&&"normal"==l&&(this.styles[(b.styleBaseUrl||"")+"#"+e]=this.styles[(b.styleBaseUrl|| +"")+k])}},parseFeatures:function(a,b){for(var c=[],d=0,e=a.length;d<e;d++){var f=a[d],g=this.parseFeature.apply(this,[f]);if(g){this.extractStyles&&g.attributes&&g.attributes.styleUrl&&(g.style=this.getStyle(g.attributes.styleUrl,b));if(this.extractStyles){var h=this.getElementsByTagNameNS(f,"*","Style")[0];h&&(h=this.parseStyle(h))&&(g.style=OpenLayers.Util.extend(g.style,h))}this.extractTracks?(f=this.getElementsByTagNameNS(f,this.namespaces.gx,"Track"))&&0<f.length&&(g={features:[],feature:g}, +this.readNode(f[0],g),0<g.features.length&&c.push.apply(c,g.features)):c.push(g)}else throw"Bad Placemark: "+d;}this.features=this.features.concat(c)},readers:{kml:{when:function(a,b){b.whens.push(OpenLayers.Date.parse(this.getChildValue(a)))},_trackPointAttribute:function(a,b){var c=a.nodeName.split(":").pop();b.attributes[c].push(this.getChildValue(a))}},gx:{Track:function(a,b){var c={whens:[],points:[],angles:[]};if(this.trackAttributes){var d;c.attributes={};for(var e=0,f=this.trackAttributes.length;e< +f;++e)d=this.trackAttributes[e],c.attributes[d]=[],d in this.readers.kml||(this.readers.kml[d]=this.readers.kml._trackPointAttribute)}this.readChildNodes(a,c);if(c.whens.length!==c.points.length)throw Error("gx:Track with unequal number of when ("+c.whens.length+") and gx:coord ("+c.points.length+") elements.");var g=0<c.angles.length;if(g&&c.whens.length!==c.angles.length)throw Error("gx:Track with unequal number of when ("+c.whens.length+") and gx:angles ("+c.angles.length+") elements.");for(var h, +e=0,f=c.whens.length;e<f;++e){h=b.feature.clone();h.fid=b.feature.fid||b.feature.id;d=c.points[e];h.geometry=d;"z"in d&&(h.attributes.altitude=d.z);this.internalProjection&&this.externalProjection&&h.geometry.transform(this.externalProjection,this.internalProjection);if(this.trackAttributes)for(var k=0,l=this.trackAttributes.length;k<l;++k)d=this.trackAttributes[k],h.attributes[d]=c.attributes[d][e];h.attributes.when=c.whens[e];h.attributes.trackId=b.feature.id;g&&(d=c.angles[e],h.attributes.heading= +parseFloat(d[0]),h.attributes.tilt=parseFloat(d[1]),h.attributes.roll=parseFloat(d[2]));b.features.push(h)}},coord:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(/\s+/),d=new OpenLayers.Geometry.Point(c[0],c[1]);2<c.length&&(d.z=parseFloat(c[2]));b.points.push(d)},angles:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(/\s+/);b.angles.push(c)}}},parseFeature:function(a){for(var b=["MultiGeometry","Polygon","LineString","Point"], +c,d,e,f=0,g=b.length;f<g;++f)if(c=b[f],this.internalns=a.namespaceURI?a.namespaceURI:this.kmlns,d=this.getElementsByTagNameNS(a,this.internalns,c),0<d.length){if(b=this.parseGeometry[c.toLowerCase()])e=b.apply(this,[d[0]]),this.internalProjection&&this.externalProjection&&e.transform(this.externalProjection,this.internalProjection);else throw new TypeError("Unsupported geometry type: "+c);break}var h;this.extractAttributes&&(h=this.parseAttributes(a));c=new OpenLayers.Feature.Vector(e,h);a=a.getAttribute("id")|| +a.getAttribute("name");null!=a&&(c.fid=a);return c},getStyle:function(a,b){var c=OpenLayers.Util.removeTail(a),d=OpenLayers.Util.extend({},b);d.depth++;d.styleBaseUrl=c;!this.styles[a]&&!OpenLayers.String.startsWith(a,"#")&&d.depth<=this.maxDepth&&!this.fetched[c]&&(c=this.fetchLink(c))&&this.parseData(c,d);return OpenLayers.Util.extend({},this.styles[a])},parseGeometry:{point:function(a){var b=this.getElementsByTagNameNS(a,this.internalns,"coordinates");a=[];if(0<b.length){var c=b[0].firstChild.nodeValue, +c=c.replace(this.regExes.removeSpace,"");a=c.split(",")}b=null;if(1<a.length)2==a.length&&(a[2]=null),b=new OpenLayers.Geometry.Point(a[0],a[1],a[2]);else throw"Bad coordinate string: "+c;return b},linestring:function(a,b){var c=this.getElementsByTagNameNS(a,this.internalns,"coordinates"),d=null;if(0<c.length){for(var c=this.getChildValue(c[0]),c=c.replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),d=c.split(this.regExes.splitSpace),e=d.length,f=Array(e),g,h,k=0;k<e;++k)if(g= +d[k].split(","),h=g.length,1<h)2==g.length&&(g[2]=null),f[k]=new OpenLayers.Geometry.Point(g[0],g[1],g[2]);else throw"Bad LineString point coordinates: "+d[k];if(e)d=b?new OpenLayers.Geometry.LinearRing(f):new OpenLayers.Geometry.LineString(f);else throw"Bad LineString coordinates: "+c;}return d},polygon:function(a){a=this.getElementsByTagNameNS(a,this.internalns,"LinearRing");var b=a.length,c=Array(b);if(0<b)for(var d=0,e=a.length;d<e;++d)if(b=this.parseGeometry.linestring.apply(this,[a[d],!0]))c[d]= +b;else throw"Bad LinearRing geometry: "+d;return new OpenLayers.Geometry.Polygon(c)},multigeometry:function(a){for(var b,c=[],d=a.childNodes,e=0,f=d.length;e<f;++e)a=d[e],1==a.nodeType&&(b=a.prefix?a.nodeName.split(":")[1]:a.nodeName,(b=this.parseGeometry[b.toLowerCase()])&&c.push(b.apply(this,[a])));return new OpenLayers.Geometry.Collection(c)}},parseAttributes:function(a){var b={},c=a.getElementsByTagName("ExtendedData");c.length&&(b=this.parseExtendedData(c[0]));var d,e,f;a=a.childNodes;for(var c= +0,g=a.length;c<g;++c)if(d=a[c],1==d.nodeType&&(e=d.childNodes,1<=e.length&&3>=e.length)){switch(e.length){case 1:f=e[0];break;case 2:f=e[0];e=e[1];f=3==f.nodeType||4==f.nodeType?f:e;break;default:f=e[1]}if(3==f.nodeType||4==f.nodeType)if(d=d.prefix?d.nodeName.split(":")[1]:d.nodeName,f=OpenLayers.Util.getXmlNodeValue(f))f=f.replace(this.regExes.trimSpace,""),b[d]=f}return b},parseExtendedData:function(a){var b={},c,d,e,f,g=a.getElementsByTagName("Data");c=0;for(d=g.length;c<d;c++){e=g[c];f=e.getAttribute("name"); +var h={},k=e.getElementsByTagName("value");k.length&&(h.value=this.getChildValue(k[0]));this.kvpAttributes?b[f]=h.value:(e=e.getElementsByTagName("displayName"),e.length&&(h.displayName=this.getChildValue(e[0])),b[f]=h)}a=a.getElementsByTagName("SimpleData");c=0;for(d=a.length;c<d;c++)h={},e=a[c],f=e.getAttribute("name"),h.value=this.getChildValue(e),this.kvpAttributes?b[f]=h.value:(h.displayName=f,b[f]=h);return b},parseProperty:function(a,b,c){var d;a=this.getElementsByTagNameNS(a,b,c);try{d=OpenLayers.Util.getXmlNodeValue(a[0])}catch(e){d= +null}return d},write:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=this.createElementNS(this.kmlns,"kml"),c=this.createFolderXML(),d=0,e=a.length;d<e;++d)c.appendChild(this.createPlacemarkXML(a[d]));b.appendChild(c);return OpenLayers.Format.XML.prototype.write.apply(this,[b])},createFolderXML:function(){var a=this.createElementNS(this.kmlns,"Folder");if(this.foldersName){var b=this.createElementNS(this.kmlns,"name"),c=this.createTextNode(this.foldersName);b.appendChild(c);a.appendChild(b)}this.foldersDesc&& +(b=this.createElementNS(this.kmlns,"description"),c=this.createTextNode(this.foldersDesc),b.appendChild(c),a.appendChild(b));return a},createPlacemarkXML:function(a){var b=this.createElementNS(this.kmlns,"name"),c=a.style&&a.style.label?a.style.label:a.id;b.appendChild(this.createTextNode(a.attributes.name||c));var d=this.createElementNS(this.kmlns,"description");d.appendChild(this.createTextNode(a.attributes.description||this.placemarksDesc));c=this.createElementNS(this.kmlns,"Placemark");null!= +a.fid&&c.setAttribute("id",a.fid);c.appendChild(b);c.appendChild(d);b=this.buildGeometryNode(a.geometry);c.appendChild(b);a.attributes&&(a=this.buildExtendedData(a.attributes))&&c.appendChild(a);return c},buildGeometryNode:function(a){var b=a.CLASS_NAME,b=b.substring(b.lastIndexOf(".")+1),b=this.buildGeometry[b.toLowerCase()],c=null;b&&(c=b.apply(this,[a]));return c},buildGeometry:{point:function(a){var b=this.createElementNS(this.kmlns,"Point");b.appendChild(this.buildCoordinatesNode(a));return b}, +multipoint:function(a){return this.buildGeometry.collection.apply(this,[a])},linestring:function(a){var b=this.createElementNS(this.kmlns,"LineString");b.appendChild(this.buildCoordinatesNode(a));return b},multilinestring:function(a){return this.buildGeometry.collection.apply(this,[a])},linearring:function(a){var b=this.createElementNS(this.kmlns,"LinearRing");b.appendChild(this.buildCoordinatesNode(a));return b},polygon:function(a){var b=this.createElementNS(this.kmlns,"Polygon");a=a.components; +for(var c,d,e=0,f=a.length;e<f;++e)c=0==e?"outerBoundaryIs":"innerBoundaryIs",c=this.createElementNS(this.kmlns,c),d=this.buildGeometry.linearring.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},multipolygon:function(a){return this.buildGeometry.collection.apply(this,[a])},collection:function(a){for(var b=this.createElementNS(this.kmlns,"MultiGeometry"),c,d=0,e=a.components.length;d<e;++d)(c=this.buildGeometryNode.apply(this,[a.components[d]]))&&b.appendChild(c);return b}},buildCoordinatesNode:function(a){var b= +this.createElementNS(this.kmlns,"coordinates"),c;if(c=a.components){for(var d=c.length,e=Array(d),f=0;f<d;++f)a=c[f],e[f]=this.buildCoordinates(a);c=e.join(" ")}else c=this.buildCoordinates(a);c=this.createTextNode(c);b.appendChild(c);return b},buildCoordinates:function(a){this.internalProjection&&this.externalProjection&&(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));return a.x+","+a.y},buildExtendedData:function(a){var b=this.createElementNS(this.kmlns,"ExtendedData"), +c;for(c in a)if(a[c]&&"name"!=c&&"description"!=c&&"styleUrl"!=c){var d=this.createElementNS(this.kmlns,"Data");d.setAttribute("name",c);var e=this.createElementNS(this.kmlns,"value");if("object"==typeof a[c]){if(a[c].value&&e.appendChild(this.createTextNode(a[c].value)),a[c].displayName){var f=this.createElementNS(this.kmlns,"displayName");f.appendChild(this.getXMLDoc().createCDATASection(a[c].displayName));d.appendChild(f)}}else e.appendChild(this.createTextNode(a[c]));d.appendChild(e);b.appendChild(d)}return this.isSimpleContent(b)? +null:b},CLASS_NAME:"OpenLayers.Format.KML"});OpenLayers.Protocol.WFS.v1=OpenLayers.Class(OpenLayers.Protocol,{version:null,srsName:"EPSG:4326",featureType:null,featureNS:null,geometryName:"the_geom",schema:null,featurePrefix:"feature",formatOptions:null,readFormat:null,readOptions:null,initialize:function(a){OpenLayers.Protocol.prototype.initialize.apply(this,[a]);a.format||(this.format=OpenLayers.Format.WFST(OpenLayers.Util.extend({version:this.version,featureType:this.featureType,featureNS:this.featureNS,featurePrefix:this.featurePrefix,geometryName:this.geometryName, +srsName:this.srsName,schema:this.schema},this.formatOptions)));!a.geometryName&&1<parseFloat(this.format.version)&&this.setGeometryName(null)},destroy:function(){this.options&&!this.options.format&&this.format.destroy();this.format=null;OpenLayers.Protocol.prototype.destroy.apply(this)},read:function(a){OpenLayers.Protocol.prototype.read.apply(this,arguments);a=OpenLayers.Util.extend({},a);OpenLayers.Util.applyDefaults(a,this.options||{});var b=new OpenLayers.Protocol.Response({requestType:"read"}), +c=OpenLayers.Format.XML.prototype.write.apply(this.format,[this.format.writeNode("wfs:GetFeature",a)]);b.priv=OpenLayers.Request.POST({url:a.url,callback:this.createCallback(this.handleRead,b,a),params:a.params,headers:a.headers,data:c});return b},setFeatureType:function(a){this.featureType=a;this.format.featureType=a},setGeometryName:function(a){this.geometryName=a;this.format.geometryName=a},handleRead:function(a,b){b=OpenLayers.Util.extend({},b);OpenLayers.Util.applyDefaults(b,this.options);if(b.callback){var c= +a.priv;200<=c.status&&300>c.status?(c=this.parseResponse(c,b.readOptions))&&!1!==c.success?(b.readOptions&&"object"==b.readOptions.output?OpenLayers.Util.extend(a,c):a.features=c,a.code=OpenLayers.Protocol.Response.SUCCESS):(a.code=OpenLayers.Protocol.Response.FAILURE,a.error=c):a.code=OpenLayers.Protocol.Response.FAILURE;b.callback.call(b.scope,a)}},parseResponse:function(a,b){var c=a.responseXML;c&&c.documentElement||(c=a.responseText);if(!c||0>=c.length)return null;c=null!==this.readFormat?this.readFormat.read(c): +this.format.read(c,b);if(!this.featureNS){var d=this.readFormat||this.format;this.featureNS=d.featureNS;d.autoConfig=!1;this.geometryName||this.setGeometryName(d.geometryName)}return c},commit:function(a,b){b=OpenLayers.Util.extend({},b);OpenLayers.Util.applyDefaults(b,this.options);var c=new OpenLayers.Protocol.Response({requestType:"commit",reqFeatures:a});c.priv=OpenLayers.Request.POST({url:b.url,headers:b.headers,data:this.format.write(a,b),callback:this.createCallback(this.handleCommit,c,b)}); +return c},handleCommit:function(a,b){if(b.callback){var c=a.priv,d=c.responseXML;d&&d.documentElement||(d=c.responseText);c=this.format.read(d)||{};a.insertIds=c.insertIds||[];c.success?a.code=OpenLayers.Protocol.Response.SUCCESS:(a.code=OpenLayers.Protocol.Response.FAILURE,a.error=c);b.callback.call(b.scope,a)}},filterDelete:function(a,b){b=OpenLayers.Util.extend({},b);OpenLayers.Util.applyDefaults(b,this.options);new OpenLayers.Protocol.Response({requestType:"commit"});var c=this.format.createElementNSPlus("wfs:Transaction", +{attributes:{service:"WFS",version:this.version}}),d=this.format.createElementNSPlus("wfs:Delete",{attributes:{typeName:(b.featureNS?this.featurePrefix+":":"")+b.featureType}});b.featureNS&&d.setAttribute("xmlns:"+this.featurePrefix,b.featureNS);var e=this.format.writeNode("ogc:Filter",a);d.appendChild(e);c.appendChild(d);c=OpenLayers.Format.XML.prototype.write.apply(this.format,[c]);return OpenLayers.Request.POST({url:this.url,callback:b.callback||function(){},data:c})},abort:function(a){a&&a.priv.abort()}, +CLASS_NAME:"OpenLayers.Protocol.WFS.v1"});OpenLayers.Handler.Feature=OpenLayers.Class(OpenLayers.Handler,{EVENTMAP:{click:{"in":"click",out:"clickout"},mousemove:{"in":"over",out:"out"},dblclick:{"in":"dblclick",out:null},mousedown:{"in":null,out:null},mouseup:{"in":null,out:null},touchstart:{"in":"click",out:"clickout"}},feature:null,lastFeature:null,down:null,up:null,clickTolerance:4,geometryTypes:null,stopClick:!0,stopDown:!0,stopUp:!1,initialize:function(a,b,c,d){OpenLayers.Handler.prototype.initialize.apply(this,[a,c,d]);this.layer= +b},touchstart:function(a){this.startTouch();return OpenLayers.Event.isMultiTouch(a)?!0:this.mousedown(a)},touchmove:function(a){OpenLayers.Event.preventDefault(a)},mousedown:function(a){if(OpenLayers.Event.isLeftClick(a)||OpenLayers.Event.isSingleTouch(a))this.down=a.xy;return this.handle(a)?!this.stopDown:!0},mouseup:function(a){this.up=a.xy;return this.handle(a)?!this.stopUp:!0},click:function(a){return this.handle(a)?!this.stopClick:!0},mousemove:function(a){if(!this.callbacks.over&&!this.callbacks.out)return!0; +this.handle(a);return!0},dblclick:function(a){return!this.handle(a)},geometryTypeMatches:function(a){return null==this.geometryTypes||-1<OpenLayers.Util.indexOf(this.geometryTypes,a.geometry.CLASS_NAME)},handle:function(a){this.feature&&!this.feature.layer&&(this.feature=null);var b=a.type,c=!1,d=!!this.feature,e="click"==b||"dblclick"==b||"touchstart"==b;(this.feature=this.layer.getFeatureFromEvent(a))&&!this.feature.layer&&(this.feature=null);this.lastFeature&&!this.lastFeature.layer&&(this.lastFeature= +null);this.feature?("touchstart"===b&&OpenLayers.Event.preventDefault(a),a=this.feature!=this.lastFeature,this.geometryTypeMatches(this.feature)?(d&&a?(this.lastFeature&&this.triggerCallback(b,"out",[this.lastFeature]),this.triggerCallback(b,"in",[this.feature])):d&&!e||this.triggerCallback(b,"in",[this.feature]),this.lastFeature=this.feature,c=!0):(this.lastFeature&&(d&&a||e)&&this.triggerCallback(b,"out",[this.lastFeature]),this.feature=null)):this.lastFeature&&(d||e)&&this.triggerCallback(b,"out", +[this.lastFeature]);return c},triggerCallback:function(a,b,c){if(b=this.EVENTMAP[a][b])"click"==a&&this.up&&this.down?(Math.sqrt(Math.pow(this.up.x-this.down.x,2)+Math.pow(this.up.y-this.down.y,2))<=this.clickTolerance&&this.callback(b,c),this.up=this.down=null):this.callback(b,c)},activate:function(){var a=!1;OpenLayers.Handler.prototype.activate.apply(this,arguments)&&(this.moveLayerToTop(),this.map.events.on({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this}),a=!0); +return a},deactivate:function(){var a=!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.moveLayerBack(),this.up=this.down=this.lastFeature=this.feature=null,this.map.events.un({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this}),a=!0);return a},handleMapEvents:function(a){"removelayer"!=a.type&&"order"!=a.property||this.moveLayerToTop()},moveLayerToTop:function(){var a=Math.max(this.map.Z_INDEX_BASE.Feature-1,this.layer.getZIndex())+1;this.layer.setZIndex(a)}, +moveLayerBack:function(){var a=this.layer.getZIndex()-1;a>=this.map.Z_INDEX_BASE.Feature?this.layer.setZIndex(a):this.map.setLayerZIndex(this.layer,this.map.getLayerIndex(this.layer))},CLASS_NAME:"OpenLayers.Handler.Feature"});OpenLayers.Tween=OpenLayers.Class({easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,minFrameRate:null,startTime:null,animationId:null,playing:!1,initialize:function(a){this.easing=a?a:OpenLayers.Easing.Expo.easeOut},start:function(a,b,c,d){this.playing=!0;this.begin=a;this.finish=b;this.duration=c;this.callbacks=d.callbacks;this.minFrameRate=d.minFrameRate||30;this.time=0;this.startTime=(new Date).getTime();OpenLayers.Animation.stop(this.animationId);this.animationId=null; +this.callbacks&&this.callbacks.start&&this.callbacks.start.call(this,this.begin);this.animationId=OpenLayers.Animation.start(OpenLayers.Function.bind(this.play,this))},stop:function(){this.playing&&(this.callbacks&&this.callbacks.done&&this.callbacks.done.call(this,this.finish),OpenLayers.Animation.stop(this.animationId),this.animationId=null,this.playing=!1)},play:function(){var a={},b;for(b in this.begin){var c=this.begin[b],d=this.finish[b];if(null==c||null==d||isNaN(c)||isNaN(d))throw new TypeError("invalid value for Tween"); +a[b]=this.easing.apply(this,[this.time,c,d-c,this.duration])}this.time++;this.callbacks&&this.callbacks.eachStep&&((new Date).getTime()-this.startTime)/this.time<=1E3/this.minFrameRate&&this.callbacks.eachStep.call(this,a);this.time>this.duration&&this.stop()},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(a,b,c,d){return c*a/d+b},easeOut:function(a,b,c,d){return c*a/d+b},easeInOut:function(a,b,c,d){return c*a/d+b},CLASS_NAME:"OpenLayers.Easing.Linear"}; +OpenLayers.Easing.Expo={easeIn:function(a,b,c,d){return 0==a?b:c*Math.pow(2,10*(a/d-1))+b},easeOut:function(a,b,c,d){return a==d?b+c:c*(-Math.pow(2,-10*a/d)+1)+b},easeInOut:function(a,b,c,d){return 0==a?b:a==d?b+c:1>(a/=d/2)?c/2*Math.pow(2,10*(a-1))+b:c/2*(-Math.pow(2,-10*--a)+2)+b},CLASS_NAME:"OpenLayers.Easing.Expo"}; +OpenLayers.Easing.Quad={easeIn:function(a,b,c,d){return c*(a/=d)*a+b},easeOut:function(a,b,c,d){return-c*(a/=d)*(a-2)+b},easeInOut:function(a,b,c,d){return 1>(a/=d/2)?c/2*a*a+b:-c/2*(--a*(a-2)-1)+b},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Map=OpenLayers.Class({Z_INDEX_BASE:{BaseLayer:100,Overlay:325,Feature:725,Popup:750,Control:1E3},id:null,fractionalZoom:!1,events:null,allOverlays:!1,div:null,dragging:!1,size:null,viewPortDiv:null,layerContainerOrigin:null,layerContainerDiv:null,layers:null,controls:null,popups:null,baseLayer:null,center:null,resolution:null,zoom:0,panRatio:1.5,options:null,tileSize:null,projection:"EPSG:4326",units:null,resolutions:null,maxResolution:null,minResolution:null,maxScale:null,minScale:null, +maxExtent:null,minExtent:null,restrictedExtent:null,numZoomLevels:16,theme:null,displayProjection:null,fallThrough:!1,autoUpdateSize:!0,eventListeners:null,panTween:null,panMethod:OpenLayers.Easing.Expo.easeOut,panDuration:50,zoomTween:null,zoomMethod:OpenLayers.Easing.Quad.easeOut,zoomDuration:20,paddingForPopups:null,layerContainerOriginPx:null,minPx:null,maxPx:null,initialize:function(a,b){1===arguments.length&&"object"===typeof a&&(a=(b=a)&&b.div);this.tileSize=new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH, +OpenLayers.Map.TILE_HEIGHT);this.paddingForPopups=new OpenLayers.Bounds(15,15,15,15);this.theme=OpenLayers._getScriptLocation()+"theme/default/style.css";this.options=OpenLayers.Util.extend({},b);OpenLayers.Util.extend(this,b);OpenLayers.Util.applyDefaults(this,OpenLayers.Projection.defaults[this.projection instanceof OpenLayers.Projection?this.projection.projCode:this.projection]);!this.maxExtent||this.maxExtent instanceof OpenLayers.Bounds||(this.maxExtent=new OpenLayers.Bounds(this.maxExtent)); +!this.minExtent||this.minExtent instanceof OpenLayers.Bounds||(this.minExtent=new OpenLayers.Bounds(this.minExtent));!this.restrictedExtent||this.restrictedExtent instanceof OpenLayers.Bounds||(this.restrictedExtent=new OpenLayers.Bounds(this.restrictedExtent));!this.center||this.center instanceof OpenLayers.LonLat||(this.center=new OpenLayers.LonLat(this.center));this.layers=[];this.id=OpenLayers.Util.createUniqueID("OpenLayers.Map_");this.div=OpenLayers.Util.getElement(a);this.div||(this.div=document.createElement("div"), +this.div.style.height="1px",this.div.style.width="1px");OpenLayers.Element.addClass(this.div,"olMap");var c=this.id+"_OpenLayers_ViewPort";this.viewPortDiv=OpenLayers.Util.createDiv(c,null,null,null,"relative",null,"hidden");this.viewPortDiv.style.width="100%";this.viewPortDiv.style.height="100%";this.viewPortDiv.className="olMapViewport";this.div.appendChild(this.viewPortDiv);this.events=new OpenLayers.Events(this,this.viewPortDiv,null,this.fallThrough,{includeXY:!0});OpenLayers.TileManager&&null!== +this.tileManager&&(this.tileManager instanceof OpenLayers.TileManager||(this.tileManager=new OpenLayers.TileManager(this.tileManager)),this.tileManager.addMap(this));c=this.id+"_OpenLayers_Container";this.layerContainerDiv=OpenLayers.Util.createDiv(c);this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE.Popup-1;this.layerContainerOriginPx={x:0,y:0};this.applyTransform();this.viewPortDiv.appendChild(this.layerContainerDiv);this.updateSize();if(this.eventListeners instanceof Object)this.events.on(this.eventListeners); +!0===this.autoUpdateSize&&(this.updateSizeDestroy=OpenLayers.Function.bind(this.updateSize,this),OpenLayers.Event.observe(window,"resize",this.updateSizeDestroy));if(this.theme){for(var c=!0,d=document.getElementsByTagName("link"),e=0,f=d.length;e<f;++e)if(OpenLayers.Util.isEquivalentUrl(d.item(e).href,this.theme)){c=!1;break}c&&(c=document.createElement("link"),c.setAttribute("rel","stylesheet"),c.setAttribute("type","text/css"),c.setAttribute("href",this.theme),document.getElementsByTagName("head")[0].appendChild(c))}null== +this.controls&&(this.controls=[],null!=OpenLayers.Control&&(OpenLayers.Control.Navigation?this.controls.push(new OpenLayers.Control.Navigation):OpenLayers.Control.TouchNavigation&&this.controls.push(new OpenLayers.Control.TouchNavigation),OpenLayers.Control.Zoom?this.controls.push(new OpenLayers.Control.Zoom):OpenLayers.Control.PanZoom&&this.controls.push(new OpenLayers.Control.PanZoom),OpenLayers.Control.ArgParser&&this.controls.push(new OpenLayers.Control.ArgParser),OpenLayers.Control.Attribution&& +this.controls.push(new OpenLayers.Control.Attribution)));e=0;for(f=this.controls.length;e<f;e++)this.addControlToMap(this.controls[e]);this.popups=[];this.unloadDestroy=OpenLayers.Function.bind(this.destroy,this);OpenLayers.Event.observe(window,"unload",this.unloadDestroy);b&&b.layers&&(delete this.center,delete this.zoom,this.addLayers(b.layers),b.center&&!this.getCenter()&&this.setCenter(b.center,b.zoom));this.panMethod&&(this.panTween=new OpenLayers.Tween(this.panMethod));this.zoomMethod&&this.applyTransform.transform&& +(this.zoomTween=new OpenLayers.Tween(this.zoomMethod))},getViewport:function(){return this.viewPortDiv},render:function(a){this.div=OpenLayers.Util.getElement(a);OpenLayers.Element.addClass(this.div,"olMap");this.viewPortDiv.parentNode.removeChild(this.viewPortDiv);this.div.appendChild(this.viewPortDiv);this.updateSize()},unloadDestroy:null,updateSizeDestroy:null,destroy:function(){if(!this.unloadDestroy)return!1;this.panTween&&(this.panTween.stop(),this.panTween=null);this.zoomTween&&(this.zoomTween.stop(), +this.zoomTween=null);OpenLayers.Event.stopObserving(window,"unload",this.unloadDestroy);this.unloadDestroy=null;this.updateSizeDestroy&&OpenLayers.Event.stopObserving(window,"resize",this.updateSizeDestroy);this.paddingForPopups=null;if(null!=this.controls){for(var a=this.controls.length-1;0<=a;--a)this.controls[a].destroy();this.controls=null}if(null!=this.layers){for(a=this.layers.length-1;0<=a;--a)this.layers[a].destroy(!1);this.layers=null}this.viewPortDiv&&this.viewPortDiv.parentNode&&this.viewPortDiv.parentNode.removeChild(this.viewPortDiv); +this.viewPortDiv=null;this.tileManager&&(this.tileManager.removeMap(this),this.tileManager=null);this.eventListeners&&(this.events.un(this.eventListeners),this.eventListeners=null);this.events.destroy();this.options=this.events=null},setOptions:function(a){var b=this.minPx&&a.restrictedExtent!=this.restrictedExtent;OpenLayers.Util.extend(this,a);b&&this.moveTo(this.getCachedCenter(),this.zoom,{forceZoomChange:!0})},getTileSize:function(){return this.tileSize},getBy:function(a,b,c){var d="function"== +typeof c.test;return OpenLayers.Array.filter(this[a],function(a){return a[b]==c||d&&c.test(a[b])})},getLayersBy:function(a,b){return this.getBy("layers",a,b)},getLayersByName:function(a){return this.getLayersBy("name",a)},getLayersByClass:function(a){return this.getLayersBy("CLASS_NAME",a)},getControlsBy:function(a,b){return this.getBy("controls",a,b)},getControlsByClass:function(a){return this.getControlsBy("CLASS_NAME",a)},getLayer:function(a){for(var b=null,c=0,d=this.layers.length;c<d;c++){var e= +this.layers[c];if(e.id==a){b=e;break}}return b},setLayerZIndex:function(a,b){a.setZIndex(this.Z_INDEX_BASE[a.isBaseLayer?"BaseLayer":"Overlay"]+5*b)},resetLayersZIndex:function(){for(var a=0,b=this.layers.length;a<b;a++)this.setLayerZIndex(this.layers[a],a)},addLayer:function(a){for(var b=0,c=this.layers.length;b<c;b++)if(this.layers[b]==a)return!1;if(!1===this.events.triggerEvent("preaddlayer",{layer:a}))return!1;this.allOverlays&&(a.isBaseLayer=!1);a.div.className="olLayerDiv";a.div.style.overflow= +"";this.setLayerZIndex(a,this.layers.length);a.isFixed?this.viewPortDiv.appendChild(a.div):this.layerContainerDiv.appendChild(a.div);this.layers.push(a);a.setMap(this);a.isBaseLayer||this.allOverlays&&!this.baseLayer?null==this.baseLayer?this.setBaseLayer(a):a.setVisibility(!1):a.redraw();this.events.triggerEvent("addlayer",{layer:a});a.events.triggerEvent("added",{map:this,layer:a});a.afterAdd();return!0},addLayers:function(a){for(var b=0,c=a.length;b<c;b++)this.addLayer(a[b])},removeLayer:function(a, +b){if(!1!==this.events.triggerEvent("preremovelayer",{layer:a})){null==b&&(b=!0);a.isFixed?this.viewPortDiv.removeChild(a.div):this.layerContainerDiv.removeChild(a.div);OpenLayers.Util.removeItem(this.layers,a);a.removeMap(this);a.map=null;if(this.baseLayer==a&&(this.baseLayer=null,b))for(var c=0,d=this.layers.length;c<d;c++){var e=this.layers[c];if(e.isBaseLayer||this.allOverlays){this.setBaseLayer(e);break}}this.resetLayersZIndex();this.events.triggerEvent("removelayer",{layer:a});a.events.triggerEvent("removed", +{map:this,layer:a})}},getNumLayers:function(){return this.layers.length},getLayerIndex:function(a){return OpenLayers.Util.indexOf(this.layers,a)},setLayerIndex:function(a,b){var c=this.getLayerIndex(a);0>b?b=0:b>this.layers.length&&(b=this.layers.length);if(c!=b){this.layers.splice(c,1);this.layers.splice(b,0,a);for(var c=0,d=this.layers.length;c<d;c++)this.setLayerZIndex(this.layers[c],c);this.events.triggerEvent("changelayer",{layer:a,property:"order"});this.allOverlays&&(0===b?this.setBaseLayer(a): +this.baseLayer!==this.layers[0]&&this.setBaseLayer(this.layers[0]))}},raiseLayer:function(a,b){var c=this.getLayerIndex(a)+b;this.setLayerIndex(a,c)},setBaseLayer:function(a){if(a!=this.baseLayer&&-1!=OpenLayers.Util.indexOf(this.layers,a)){var b=this.getCachedCenter(),c=OpenLayers.Util.getResolutionFromScale(this.getScale(),a.units);null==this.baseLayer||this.allOverlays||this.baseLayer.setVisibility(!1);this.baseLayer=a;if(!this.allOverlays||this.baseLayer.visibility)this.baseLayer.setVisibility(!0), +!1===this.baseLayer.inRange&&this.baseLayer.redraw();null!=b&&(a=this.getZoomForResolution(c||this.resolution,!0),this.setCenter(b,a,!1,!0));this.events.triggerEvent("changebaselayer",{layer:this.baseLayer})}},addControl:function(a,b){this.controls.push(a);this.addControlToMap(a,b)},addControls:function(a,b){for(var c=1===arguments.length?[]:b,d=0,e=a.length;d<e;d++)this.addControl(a[d],c[d]?c[d]:null)},addControlToMap:function(a,b){a.outsideViewport=null!=a.div;this.displayProjection&&!a.displayProjection&& +(a.displayProjection=this.displayProjection);a.setMap(this);var c=a.draw(b);c&&!a.outsideViewport&&(c.style.zIndex=this.Z_INDEX_BASE.Control+this.controls.length,this.viewPortDiv.appendChild(c));a.autoActivate&&a.activate()},getControl:function(a){for(var b=null,c=0,d=this.controls.length;c<d;c++){var e=this.controls[c];if(e.id==a){b=e;break}}return b},removeControl:function(a){a&&a==this.getControl(a.id)&&(a.div&&a.div.parentNode==this.viewPortDiv&&this.viewPortDiv.removeChild(a.div),OpenLayers.Util.removeItem(this.controls, +a))},addPopup:function(a,b){if(b)for(var c=this.popups.length-1;0<=c;--c)this.removePopup(this.popups[c]);a.map=this;this.popups.push(a);if(c=a.draw())c.style.zIndex=this.Z_INDEX_BASE.Popup+this.popups.length,this.layerContainerDiv.appendChild(c)},removePopup:function(a){OpenLayers.Util.removeItem(this.popups,a);if(a.div)try{this.layerContainerDiv.removeChild(a.div)}catch(b){}a.map=null},getSize:function(){var a=null;null!=this.size&&(a=this.size.clone());return a},updateSize:function(){var a=this.getCurrentSize(); +if(a&&!isNaN(a.h)&&!isNaN(a.w)){this.events.clearMouseCache();var b=this.getSize();null==b&&(this.size=b=a);if(!a.equals(b)){this.size=a;a=0;for(b=this.layers.length;a<b;a++)this.layers[a].onMapResize();a=this.getCachedCenter();null!=this.baseLayer&&null!=a&&(b=this.getZoom(),this.zoom=null,this.setCenter(a,b))}}this.events.triggerEvent("updatesize")},getCurrentSize:function(){var a=new OpenLayers.Size(this.div.clientWidth,this.div.clientHeight);if(0==a.w&&0==a.h||isNaN(a.w)&&isNaN(a.h))a.w=this.div.offsetWidth, +a.h=this.div.offsetHeight;if(0==a.w&&0==a.h||isNaN(a.w)&&isNaN(a.h))a.w=parseInt(this.div.style.width),a.h=parseInt(this.div.style.height);return a},calculateBounds:function(a,b){var c=null;null==a&&(a=this.getCachedCenter());null==b&&(b=this.getResolution());if(null!=a&&null!=b)var c=this.size.w*b/2,d=this.size.h*b/2,c=new OpenLayers.Bounds(a.lon-c,a.lat-d,a.lon+c,a.lat+d);return c},getCenter:function(){var a=null,b=this.getCachedCenter();b&&(a=b.clone());return a},getCachedCenter:function(){!this.center&& +this.size&&(this.center=this.getLonLatFromViewPortPx({x:this.size.w/2,y:this.size.h/2}));return this.center},getZoom:function(){return this.zoom},pan:function(a,b,c){c=OpenLayers.Util.applyDefaults(c,{animate:!0,dragging:!1});if(c.dragging)0==a&&0==b||this.moveByPx(a,b);else{var d=this.getViewPortPxFromLonLat(this.getCachedCenter());a=d.add(a,b);if(this.dragging||!a.equals(d))d=this.getLonLatFromViewPortPx(a),c.animate?this.panTo(d):(this.moveTo(d),this.dragging&&(this.dragging=!1,this.events.triggerEvent("moveend")))}}, +panTo:function(a){if(this.panTween&&this.getExtent().scale(this.panRatio).containsLonLat(a)){var b=this.getCachedCenter();if(!a.equals(b)){var b=this.getPixelFromLonLat(b),c=this.getPixelFromLonLat(a),d=0,e=0;this.panTween.start({x:0,y:0},{x:c.x-b.x,y:c.y-b.y},this.panDuration,{callbacks:{eachStep:OpenLayers.Function.bind(function(a){this.moveByPx(a.x-d,a.y-e);d=Math.round(a.x);e=Math.round(a.y)},this),done:OpenLayers.Function.bind(function(b){this.moveTo(a);this.dragging=!1;this.events.triggerEvent("moveend")}, +this)}})}}else this.setCenter(a)},setCenter:function(a,b,c,d){this.panTween&&this.panTween.stop();this.zoomTween&&this.zoomTween.stop();this.moveTo(a,b,{dragging:c,forceZoomChange:d})},moveByPx:function(a,b){var c=this.size.w/2,d=this.size.h/2,e=c+a,f=d+b,g=this.baseLayer.wrapDateLine,h=0,k=0;this.restrictedExtent&&(h=c,k=d,g=!1);a=g||e<=this.maxPx.x-h&&e>=this.minPx.x+h?Math.round(a):0;b=f<=this.maxPx.y-k&&f>=this.minPx.y+k?Math.round(b):0;if(a||b){this.dragging||(this.dragging=!0,this.events.triggerEvent("movestart")); +this.center=null;a&&(this.layerContainerOriginPx.x-=a,this.minPx.x-=a,this.maxPx.x-=a);b&&(this.layerContainerOriginPx.y-=b,this.minPx.y-=b,this.maxPx.y-=b);this.applyTransform();d=0;for(e=this.layers.length;d<e;++d)c=this.layers[d],c.visibility&&(c===this.baseLayer||c.inRange)&&(c.moveByPx(a,b),c.events.triggerEvent("move"));this.events.triggerEvent("move")}},adjustZoom:function(a){if(this.baseLayer&&this.baseLayer.wrapDateLine){var b=this.baseLayer.resolutions,c=this.getMaxExtent().getWidth()/this.size.w; +if(this.getResolutionForZoom(a)>c)if(this.fractionalZoom)a=this.getZoomForResolution(c);else for(var d=a|0,e=b.length;d<e;++d)if(b[d]<=c){a=d;break}}return a},getMinZoom:function(){return this.adjustZoom(0)},moveTo:function(a,b,c){null==a||a instanceof OpenLayers.LonLat||(a=new OpenLayers.LonLat(a));c||(c={});null!=b&&(b=parseFloat(b),this.fractionalZoom||(b=Math.round(b)));var d=b;b=this.adjustZoom(b);b!==d&&(a=this.getCenter());var d=c.dragging||this.dragging,e=c.forceZoomChange;this.getCachedCenter()|| +this.isValidLonLat(a)||(a=this.maxExtent.getCenterLonLat(),this.center=a.clone());if(null!=this.restrictedExtent){null==a&&(a=this.center);null==b&&(b=this.getZoom());var f=this.getResolutionForZoom(b),f=this.calculateBounds(a,f);if(!this.restrictedExtent.containsBounds(f)){var g=this.restrictedExtent.getCenterLonLat();f.getWidth()>this.restrictedExtent.getWidth()?a=new OpenLayers.LonLat(g.lon,a.lat):f.left<this.restrictedExtent.left?a=a.add(this.restrictedExtent.left-f.left,0):f.right>this.restrictedExtent.right&& +(a=a.add(this.restrictedExtent.right-f.right,0));f.getHeight()>this.restrictedExtent.getHeight()?a=new OpenLayers.LonLat(a.lon,g.lat):f.bottom<this.restrictedExtent.bottom?a=a.add(0,this.restrictedExtent.bottom-f.bottom):f.top>this.restrictedExtent.top&&(a=a.add(0,this.restrictedExtent.top-f.top))}}e=e||this.isValidZoomLevel(b)&&b!=this.getZoom();f=this.isValidLonLat(a)&&!a.equals(this.center);if(e||f||d){d||this.events.triggerEvent("movestart",{zoomChanged:e});f&&(!e&&this.center&&this.centerLayerContainer(a), +this.center=a.clone());a=e?this.getResolutionForZoom(b):this.getResolution();if(e||null==this.layerContainerOrigin){this.layerContainerOrigin=this.getCachedCenter();this.layerContainerOriginPx.x=0;this.layerContainerOriginPx.y=0;this.applyTransform();var f=this.getMaxExtent({restricted:!0}),h=f.getCenterLonLat(),g=this.center.lon-h.lon,h=h.lat-this.center.lat,k=Math.round(f.getWidth()/a),l=Math.round(f.getHeight()/a);this.minPx={x:(this.size.w-k)/2-g/a,y:(this.size.h-l)/2-h/a};this.maxPx={x:this.minPx.x+ +Math.round(f.getWidth()/a),y:this.minPx.y+Math.round(f.getHeight()/a)}}e&&(this.zoom=b,this.resolution=a);a=this.getExtent();this.baseLayer.visibility&&(this.baseLayer.moveTo(a,e,c.dragging),c.dragging||this.baseLayer.events.triggerEvent("moveend",{zoomChanged:e}));a=this.baseLayer.getExtent();for(b=this.layers.length-1;0<=b;--b)f=this.layers[b],f===this.baseLayer||f.isBaseLayer||(g=f.calculateInRange(),f.inRange!=g&&((f.inRange=g)||f.display(!1),this.events.triggerEvent("changelayer",{layer:f,property:"visibility"})), +g&&f.visibility&&(f.moveTo(a,e,c.dragging),c.dragging||f.events.triggerEvent("moveend",{zoomChanged:e})));this.events.triggerEvent("move");d||this.events.triggerEvent("moveend");if(e){b=0;for(c=this.popups.length;b<c;b++)this.popups[b].updatePosition();this.events.triggerEvent("zoomend")}}},centerLayerContainer:function(a){var b=this.getViewPortPxFromLonLat(this.layerContainerOrigin),c=this.getViewPortPxFromLonLat(a);if(null!=b&&null!=c){var d=this.layerContainerOriginPx.x;a=this.layerContainerOriginPx.y; +var e=Math.round(b.x-c.x),b=Math.round(b.y-c.y);this.applyTransform(this.layerContainerOriginPx.x=e,this.layerContainerOriginPx.y=b);d-=e;a-=b;this.minPx.x-=d;this.maxPx.x-=d;this.minPx.y-=a;this.maxPx.y-=a}},isValidZoomLevel:function(a){return null!=a&&0<=a&&a<this.getNumZoomLevels()},isValidLonLat:function(a){var b=!1;null!=a&&(b=this.getMaxExtent(),b=b.containsLonLat(a,{worldBounds:this.baseLayer.wrapDateLine&&b}));return b},getProjection:function(){var a=this.getProjectionObject();return a?a.getCode(): +null},getProjectionObject:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.projection);return a},getMaxResolution:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.maxResolution);return a},getMaxExtent:function(a){var b=null;a&&a.restricted&&this.restrictedExtent?b=this.restrictedExtent:null!=this.baseLayer&&(b=this.baseLayer.maxExtent);return b},getNumZoomLevels:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.numZoomLevels);return a},getExtent:function(){var a= +null;null!=this.baseLayer&&(a=this.baseLayer.getExtent());return a},getResolution:function(){var a=null;null!=this.baseLayer?a=this.baseLayer.getResolution():!0===this.allOverlays&&0<this.layers.length&&(a=this.layers[0].getResolution());return a},getUnits:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.units);return a},getScale:function(){var a=null;null!=this.baseLayer&&(a=this.getResolution(),a=OpenLayers.Util.getScaleFromResolution(a,this.baseLayer.units));return a},getZoomForExtent:function(a, +b){var c=null;null!=this.baseLayer&&(c=this.baseLayer.getZoomForExtent(a,b));return c},getResolutionForZoom:function(a){var b=null;this.baseLayer&&(b=this.baseLayer.getResolutionForZoom(a));return b},getZoomForResolution:function(a,b){var c=null;null!=this.baseLayer&&(c=this.baseLayer.getZoomForResolution(a,b));return c},zoomTo:function(a,b){var c=this;if(c.isValidZoomLevel(a))if(c.baseLayer.wrapDateLine&&(a=c.adjustZoom(a)),c.zoomTween){var d=c.getResolution(),e=c.getResolutionForZoom(a),f={scale:1}, +d={scale:d/e};c.zoomTween.playing&&c.zoomTween.duration<3*c.zoomDuration?c.zoomTween.finish={scale:c.zoomTween.finish.scale*d.scale}:(b||(e=c.getSize(),b={x:e.w/2,y:e.h/2}),c.zoomTween.start(f,d,c.zoomDuration,{minFrameRate:50,callbacks:{eachStep:function(a){var d=c.layerContainerOriginPx;a=a.scale;c.applyTransform(d.x+((a-1)*(d.x-b.x)|0),d.y+((a-1)*(d.y-b.y)|0),a)},done:function(a){c.applyTransform();a=c.getResolution()/a.scale;var d=c.getZoomForResolution(a,!0);c.moveTo(c.getZoomTargetCenter(b, +a),d,!0)}}}))}else f=b?c.getZoomTargetCenter(b,c.getResolutionForZoom(a)):null,c.setCenter(f,a)},zoomIn:function(){this.zoomTo(this.getZoom()+1)},zoomOut:function(){this.zoomTo(this.getZoom()-1)},zoomToExtent:function(a,b){a instanceof OpenLayers.Bounds||(a=new OpenLayers.Bounds(a));var c=a.getCenterLonLat();if(this.baseLayer.wrapDateLine){c=this.getMaxExtent();for(a=a.clone();a.right<a.left;)a.right+=c.getWidth();c=a.getCenterLonLat().wrapDateLine(c)}this.setCenter(c,this.getZoomForExtent(a,b))}, +zoomToMaxExtent:function(a){a=this.getMaxExtent({restricted:a?a.restricted:!0});this.zoomToExtent(a)},zoomToScale:function(a,b){var c=OpenLayers.Util.getResolutionFromScale(a,this.baseLayer.units),d=this.size.w*c/2,c=this.size.h*c/2,e=this.getCachedCenter(),d=new OpenLayers.Bounds(e.lon-d,e.lat-c,e.lon+d,e.lat+c);this.zoomToExtent(d,b)},getLonLatFromViewPortPx:function(a){var b=null;null!=this.baseLayer&&(b=this.baseLayer.getLonLatFromViewPortPx(a));return b},getViewPortPxFromLonLat:function(a){var b= +null;null!=this.baseLayer&&(b=this.baseLayer.getViewPortPxFromLonLat(a));return b},getZoomTargetCenter:function(a,b){var c=null,d=this.getSize(),e=d.w/2-a.x,d=a.y-d.h/2,f=this.getLonLatFromPixel(a);f&&(c=new OpenLayers.LonLat(f.lon+e*b,f.lat+d*b));return c},getLonLatFromPixel:function(a){return this.getLonLatFromViewPortPx(a)},getPixelFromLonLat:function(a){a=this.getViewPortPxFromLonLat(a);a.x=Math.round(a.x);a.y=Math.round(a.y);return a},getGeodesicPixelSize:function(a){var b=a?this.getLonLatFromPixel(a): +this.getCachedCenter()||new OpenLayers.LonLat(0,0),c=this.getResolution();a=b.add(-c/2,0);var d=b.add(c/2,0),e=b.add(0,-c/2),b=b.add(0,c/2),c=new OpenLayers.Projection("EPSG:4326"),f=this.getProjectionObject()||c;f.equals(c)||(a.transform(f,c),d.transform(f,c),e.transform(f,c),b.transform(f,c));return new OpenLayers.Size(OpenLayers.Util.distVincenty(a,d),OpenLayers.Util.distVincenty(e,b))},getViewPortPxFromLayerPx:function(a){var b=null;null!=a&&(b=a.add(this.layerContainerOriginPx.x,this.layerContainerOriginPx.y)); +return b},getLayerPxFromViewPortPx:function(a){var b=null;null!=a&&(b=a.add(-this.layerContainerOriginPx.x,-this.layerContainerOriginPx.y),isNaN(b.x)||isNaN(b.y))&&(b=null);return b},getLonLatFromLayerPx:function(a){a=this.getViewPortPxFromLayerPx(a);return this.getLonLatFromViewPortPx(a)},getLayerPxFromLonLat:function(a){a=this.getPixelFromLonLat(a);return this.getLayerPxFromViewPortPx(a)},applyTransform:function(a,b,c){c=c||1;var d=this.layerContainerOriginPx,e=1!==c;a=a||d.x;b=b||d.y;var f=this.layerContainerDiv.style, +g=this.applyTransform.transform,h=this.applyTransform.template;if(void 0===g&&(g=OpenLayers.Util.vendorPrefix.style("transform"),this.applyTransform.transform=g)){var k=OpenLayers.Element.getStyle(this.viewPortDiv,OpenLayers.Util.vendorPrefix.css("transform"));k&&"none"===k||(h=["translate3d(",",0) ","scale3d(",",1)"],f[g]=[h[0],"0,0",h[1]].join(""));h&&~f[g].indexOf(h[0])||(h=["translate(",") ","scale(",")"]);this.applyTransform.template=h}null===g||"translate3d("!==h[0]&&!0!==e?(f.left=a+"px",f.top= +b+"px",null!==g&&(f[g]="")):(!0===e&&"translate("===h[0]&&(a-=d.x,b-=d.y,f.left=d.x+"px",f.top=d.y+"px"),f[g]=[h[0],a,"px,",b,"px",h[1],h[2],c,",",c,h[3]].join(""))},CLASS_NAME:"OpenLayers.Map"});OpenLayers.Map.TILE_WIDTH=256;OpenLayers.Map.TILE_HEIGHT=256;OpenLayers.Layer=OpenLayers.Class({id:null,name:null,div:null,opacity:1,alwaysInRange:null,RESOLUTION_PROPERTIES:"scales resolutions maxScale minScale maxResolution minResolution numZoomLevels maxZoomLevel".split(" "),events:null,map:null,isBaseLayer:!1,alpha:!1,displayInLayerSwitcher:!0,visibility:!0,attribution:null,inRange:!1,imageSize:null,options:null,eventListeners:null,gutter:0,projection:null,units:null,scales:null,resolutions:null,maxExtent:null,minExtent:null,maxResolution:null,minResolution:null, +numZoomLevels:null,minScale:null,maxScale:null,displayOutsideMaxExtent:!1,wrapDateLine:!1,metadata:null,initialize:function(a,b){this.metadata={};b=OpenLayers.Util.extend({},b);null!=this.alwaysInRange&&(b.alwaysInRange=this.alwaysInRange);this.addOptions(b);this.name=a;if(null==this.id&&(this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_"),this.div=OpenLayers.Util.createDiv(this.id),this.div.style.width="100%",this.div.style.height="100%",this.div.dir="ltr",this.events=new OpenLayers.Events(this, +this.div),this.eventListeners instanceof Object))this.events.on(this.eventListeners)},destroy:function(a){null==a&&(a=!0);null!=this.map&&this.map.removeLayer(this,a);this.options=this.div=this.name=this.map=this.projection=null;this.events&&(this.eventListeners&&this.events.un(this.eventListeners),this.events.destroy());this.events=this.eventListeners=null},clone:function(a){null==a&&(a=new OpenLayers.Layer(this.name,this.getOptions()));OpenLayers.Util.applyDefaults(a,this);a.map=null;return a}, +getOptions:function(){var a={},b;for(b in this.options)a[b]=this[b];return a},setName:function(a){a!=this.name&&(this.name=a,null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"name"}))},addOptions:function(a,b){null==this.options&&(this.options={});a&&("string"==typeof a.projection&&(a.projection=new OpenLayers.Projection(a.projection)),a.projection&&OpenLayers.Util.applyDefaults(a,OpenLayers.Projection.defaults[a.projection.getCode()]),!a.maxExtent||a.maxExtent instanceof +OpenLayers.Bounds||(a.maxExtent=new OpenLayers.Bounds(a.maxExtent)),!a.minExtent||a.minExtent instanceof OpenLayers.Bounds||(a.minExtent=new OpenLayers.Bounds(a.minExtent)));OpenLayers.Util.extend(this.options,a);OpenLayers.Util.extend(this,a);this.projection&&this.projection.getUnits()&&(this.units=this.projection.getUnits());if(this.map){var c=this.map.getResolution(),d=this.RESOLUTION_PROPERTIES.concat(["projection","units","minExtent","maxExtent"]),e;for(e in a)if(a.hasOwnProperty(e)&&0<=OpenLayers.Util.indexOf(d, +e)){this.initResolutions();b&&this.map.baseLayer===this&&(this.map.setCenter(this.map.getCenter(),this.map.getZoomForResolution(c),!1,!0),this.map.events.triggerEvent("changebaselayer",{layer:this}));break}}},onMapResize:function(){},redraw:function(){var a=!1;if(this.map){this.inRange=this.calculateInRange();var b=this.getExtent();b&&this.inRange&&this.visibility&&(this.moveTo(b,!0,!1),this.events.triggerEvent("moveend",{zoomChanged:!0}),a=!0)}return a},moveTo:function(a,b,c){a=this.visibility;this.isBaseLayer|| +(a=a&&this.inRange);this.display(a)},moveByPx:function(a,b){},setMap:function(a){null==this.map&&(this.map=a,this.maxExtent=this.maxExtent||this.map.maxExtent,this.minExtent=this.minExtent||this.map.minExtent,this.projection=this.projection||this.map.projection,"string"==typeof this.projection&&(this.projection=new OpenLayers.Projection(this.projection)),this.units=this.projection.getUnits()||this.units||this.map.units,this.initResolutions(),this.isBaseLayer||(this.inRange=this.calculateInRange(), +this.div.style.display=this.visibility&&this.inRange?"":"none"),this.setTileSize())},afterAdd:function(){},removeMap:function(a){},getImageSize:function(a){return this.imageSize||this.tileSize},setTileSize:function(a){this.tileSize=a=a?a:this.tileSize?this.tileSize:this.map.getTileSize();this.gutter&&(this.imageSize=new OpenLayers.Size(a.w+2*this.gutter,a.h+2*this.gutter))},getVisibility:function(){return this.visibility},setVisibility:function(a){a!=this.visibility&&(this.visibility=a,this.display(a), +this.redraw(),null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"}),this.events.triggerEvent("visibilitychanged"))},display:function(a){a!=("none"!=this.div.style.display)&&(this.div.style.display=a&&this.calculateInRange()?"block":"none")},calculateInRange:function(){var a=!1;this.alwaysInRange?a=!0:this.map&&(a=this.map.getResolution(),a=a>=this.minResolution&&a<=this.maxResolution);return a},setIsBaseLayer:function(a){a!=this.isBaseLayer&&(this.isBaseLayer= +a,null!=this.map&&this.map.events.triggerEvent("changebaselayer",{layer:this}))},initResolutions:function(){var a,b,c,d={},e=!0;a=0;for(b=this.RESOLUTION_PROPERTIES.length;a<b;a++)c=this.RESOLUTION_PROPERTIES[a],d[c]=this.options[c],e&&this.options[c]&&(e=!1);null==this.options.alwaysInRange&&(this.alwaysInRange=e);null==d.resolutions&&(d.resolutions=this.resolutionsFromScales(d.scales));null==d.resolutions&&(d.resolutions=this.calculateResolutions(d));if(null==d.resolutions){a=0;for(b=this.RESOLUTION_PROPERTIES.length;a< +b;a++)c=this.RESOLUTION_PROPERTIES[a],d[c]=null!=this.options[c]?this.options[c]:this.map[c];null==d.resolutions&&(d.resolutions=this.resolutionsFromScales(d.scales));null==d.resolutions&&(d.resolutions=this.calculateResolutions(d))}var f;this.options.maxResolution&&"auto"!==this.options.maxResolution&&(f=this.options.maxResolution);this.options.minScale&&(f=OpenLayers.Util.getResolutionFromScale(this.options.minScale,this.units));var g;this.options.minResolution&&"auto"!==this.options.minResolution&& +(g=this.options.minResolution);this.options.maxScale&&(g=OpenLayers.Util.getResolutionFromScale(this.options.maxScale,this.units));d.resolutions&&(d.resolutions.sort(function(a,b){return b-a}),f||(f=d.resolutions[0]),g||(g=d.resolutions[d.resolutions.length-1]));if(this.resolutions=d.resolutions){b=this.resolutions.length;this.scales=Array(b);for(a=0;a<b;a++)this.scales[a]=OpenLayers.Util.getScaleFromResolution(this.resolutions[a],this.units);this.numZoomLevels=b}if(this.minResolution=g)this.maxScale= +OpenLayers.Util.getScaleFromResolution(g,this.units);if(this.maxResolution=f)this.minScale=OpenLayers.Util.getScaleFromResolution(f,this.units)},resolutionsFromScales:function(a){if(null!=a){var b,c,d;d=a.length;b=Array(d);for(c=0;c<d;c++)b[c]=OpenLayers.Util.getResolutionFromScale(a[c],this.units);return b}},calculateResolutions:function(a){var b,c,d=a.maxResolution;null!=a.minScale?d=OpenLayers.Util.getResolutionFromScale(a.minScale,this.units):"auto"==d&&null!=this.maxExtent&&(b=this.map.getSize(), +c=this.maxExtent.getWidth()/b.w,b=this.maxExtent.getHeight()/b.h,d=Math.max(c,b));c=a.minResolution;null!=a.maxScale?c=OpenLayers.Util.getResolutionFromScale(a.maxScale,this.units):"auto"==a.minResolution&&null!=this.minExtent&&(b=this.map.getSize(),c=this.minExtent.getWidth()/b.w,b=this.minExtent.getHeight()/b.h,c=Math.max(c,b));"number"!==typeof d&&"number"!==typeof c&&null!=this.maxExtent&&(d=this.map.getTileSize(),d=Math.max(this.maxExtent.getWidth()/d.w,this.maxExtent.getHeight()/d.h));b=a.maxZoomLevel; +a=a.numZoomLevels;"number"===typeof c&&"number"===typeof d&&void 0===a?a=Math.floor(Math.log(d/c)/Math.log(2))+1:void 0===a&&null!=b&&(a=b+1);if(!("number"!==typeof a||0>=a||"number"!==typeof d&&"number"!==typeof c)){b=Array(a);var e=2;"number"==typeof c&&"number"==typeof d&&(e=Math.pow(d/c,1/(a-1)));var f;if("number"===typeof d)for(f=0;f<a;f++)b[f]=d/Math.pow(e,f);else for(f=0;f<a;f++)b[a-1-f]=c*Math.pow(e,f);return b}},getResolution:function(){var a=this.map.getZoom();return this.getResolutionForZoom(a)}, +getExtent:function(){return this.map.calculateBounds()},getZoomForExtent:function(a,b){var c=this.map.getSize(),c=Math.max(a.getWidth()/c.w,a.getHeight()/c.h);return this.getZoomForResolution(c,b)},getDataExtent:function(){},getResolutionForZoom:function(a){a=Math.max(0,Math.min(a,this.resolutions.length-1));if(this.map.fractionalZoom){var b=Math.floor(a);a=this.resolutions[b]-(a-b)*(this.resolutions[b]-this.resolutions[Math.ceil(a)])}else a=this.resolutions[Math.round(a)];return a},getZoomForResolution:function(a, +b){var c,d;if(this.map.fractionalZoom){var e=0,f=this.resolutions[e],g=this.resolutions[this.resolutions.length-1],h;c=0;for(d=this.resolutions.length;c<d;++c)if(h=this.resolutions[c],h>=a&&(f=h,e=c),h<=a){g=h;break}c=f-g;c=0<c?e+(f-a)/c:e}else{f=Number.POSITIVE_INFINITY;c=0;for(d=this.resolutions.length;c<d;c++)if(b){e=Math.abs(this.resolutions[c]-a);if(e>f)break;f=e}else if(this.resolutions[c]<a)break;c=Math.max(0,c-1)}return c},getLonLatFromViewPortPx:function(a){var b=null,c=this.map;if(null!= +a&&c.minPx){var b=c.getResolution(),d=c.getMaxExtent({restricted:!0}),b=new OpenLayers.LonLat((a.x-c.minPx.x)*b+d.left,(c.minPx.y-a.y)*b+d.top);this.wrapDateLine&&(b=b.wrapDateLine(this.maxExtent))}return b},getViewPortPxFromLonLat:function(a,b){var c=null;null!=a&&(b=b||this.map.getResolution(),c=this.map.calculateBounds(null,b),c=new OpenLayers.Pixel(1/b*(a.lon-c.left),1/b*(c.top-a.lat)));return c},setOpacity:function(a){if(a!=this.opacity){this.opacity=a;for(var b=this.div.childNodes,c=0,d=b.length;c< +d;++c){var e=b[c].firstChild||b[c],f=b[c].lastChild;f&&"iframe"===f.nodeName.toLowerCase()&&(e=f.parentNode);OpenLayers.Util.modifyDOMElement(e,null,null,null,null,null,null,a)}null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"opacity"})}},getZIndex:function(){return this.div.style.zIndex},setZIndex:function(a){this.div.style.zIndex=a},adjustBounds:function(a){if(this.gutter){var b=this.gutter*this.map.getResolution();a=new OpenLayers.Bounds(a.left-b,a.bottom-b,a.right+ +b,a.top+b)}this.wrapDateLine&&(b={rightTolerance:this.getResolution(),leftTolerance:this.getResolution()},a=a.wrapDateLine(this.maxExtent,b));return a},CLASS_NAME:"OpenLayers.Layer"});OpenLayers.StyleMap=OpenLayers.Class({styles:null,extendDefault:!0,initialize:function(a,b){this.styles={"default":new OpenLayers.Style(OpenLayers.Feature.Vector.style["default"]),select:new OpenLayers.Style(OpenLayers.Feature.Vector.style.select),temporary:new OpenLayers.Style(OpenLayers.Feature.Vector.style.temporary),"delete":new OpenLayers.Style(OpenLayers.Feature.Vector.style["delete"])};if(a instanceof OpenLayers.Style)this.styles["default"]=a,this.styles.select=a,this.styles.temporary=a,this.styles["delete"]= +a;else if("object"==typeof a)for(var c in a)if(a[c]instanceof OpenLayers.Style)this.styles[c]=a[c];else if("object"==typeof a[c])this.styles[c]=new OpenLayers.Style(a[c]);else{this.styles["default"]=new OpenLayers.Style(a);this.styles.select=new OpenLayers.Style(a);this.styles.temporary=new OpenLayers.Style(a);this.styles["delete"]=new OpenLayers.Style(a);break}OpenLayers.Util.extend(this,b)},destroy:function(){for(var a in this.styles)this.styles[a].destroy();this.styles=null},createSymbolizer:function(a, +b){a||(a=new OpenLayers.Feature.Vector);this.styles[b]||(b="default");a.renderIntent=b;var c={};this.extendDefault&&"default"!=b&&(c=this.styles["default"].createSymbolizer(a));return OpenLayers.Util.extend(c,this.styles[b].createSymbolizer(a))},addUniqueValueRules:function(a,b,c,d){var e=[],f;for(f in c)e.push(new OpenLayers.Rule({symbolizer:c[f],context:d,filter:new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO,property:b,value:f})}));this.styles[a].addRules(e)},CLASS_NAME:"OpenLayers.StyleMap"});OpenLayers.Layer.Vector=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:!1,isFixed:!1,features:null,filter:null,selectedFeatures:null,unrenderedFeatures:null,reportError:!0,style:null,styleMap:null,strategies:null,protocol:null,renderers:["SVG","VML","Canvas"],renderer:null,rendererOptions:null,geometryType:null,drawn:!1,ratio:1,initialize:function(a,b){OpenLayers.Layer.prototype.initialize.apply(this,arguments);this.renderer&&this.renderer.supported()||this.assignRenderer();this.renderer&&this.renderer.supported()|| +(this.renderer=null,this.displayError());this.styleMap||(this.styleMap=new OpenLayers.StyleMap);this.features=[];this.selectedFeatures=[];this.unrenderedFeatures={};if(this.strategies)for(var c=0,d=this.strategies.length;c<d;c++)this.strategies[c].setLayer(this)},destroy:function(){if(this.strategies){var a,b,c;b=0;for(c=this.strategies.length;b<c;b++)a=this.strategies[b],a.autoDestroy&&a.destroy();this.strategies=null}this.protocol&&(this.protocol.autoDestroy&&this.protocol.destroy(),this.protocol= +null);this.destroyFeatures();this.unrenderedFeatures=this.selectedFeatures=this.features=null;this.renderer&&this.renderer.destroy();this.drawn=this.geometryType=this.renderer=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},clone:function(a){null==a&&(a=new OpenLayers.Layer.Vector(this.name,this.getOptions()));a=OpenLayers.Layer.prototype.clone.apply(this,[a]);for(var b=this.features,c=b.length,d=Array(c),e=0;e<c;++e)d[e]=b[e].clone();a.features=d;return a},refresh:function(a){this.calculateInRange()&& +this.visibility&&this.events.triggerEvent("refresh",a)},assignRenderer:function(){for(var a=0,b=this.renderers.length;a<b;a++){var c=this.renderers[a];if((c="function"==typeof c?c:OpenLayers.Renderer[c])&&c.prototype.supported()){this.renderer=new c(this.div,this.rendererOptions);break}}},displayError:function(){this.reportError&&OpenLayers.Console.userError(OpenLayers.i18n("browserNotSupported",{renderers:this.renderers.join("\n")}))},setMap:function(a){OpenLayers.Layer.prototype.setMap.apply(this, +arguments);if(this.renderer){this.renderer.map=this.map;var b=this.map.getSize();b.w*=this.ratio;b.h*=this.ratio;this.renderer.setSize(b)}else this.map.removeLayer(this)},afterAdd:function(){if(this.strategies){var a,b,c;b=0;for(c=this.strategies.length;b<c;b++)a=this.strategies[b],a.autoActivate&&a.activate()}},removeMap:function(a){this.drawn=!1;if(this.strategies){var b,c;b=0;for(c=this.strategies.length;b<c;b++)a=this.strategies[b],a.autoActivate&&a.deactivate()}},onMapResize:function(){OpenLayers.Layer.prototype.onMapResize.apply(this, +arguments);var a=this.map.getSize();a.w*=this.ratio;a.h*=this.ratio;this.renderer.setSize(a)},moveTo:function(a,b,c){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);var d=!0;if(!c){this.renderer.root.style.visibility="hidden";var d=this.map.getSize(),e=d.w,d=d.h,e=e/2*this.ratio-e/2,d=d/2*this.ratio-d/2,e=e+this.map.layerContainerOriginPx.x,e=-Math.round(e),d=d+this.map.layerContainerOriginPx.y,d=-Math.round(d);this.div.style.left=e+"px";this.div.style.top=d+"px";e=this.map.getExtent().scale(this.ratio); +d=this.renderer.setExtent(e,b);this.renderer.root.style.visibility="visible";!0===OpenLayers.IS_GECKO&&(this.div.scrollLeft=this.div.scrollLeft);if(!b&&d)for(var f in this.unrenderedFeatures)e=this.unrenderedFeatures[f],this.drawFeature(e)}if(!this.drawn||b||!d)for(this.drawn=!0,f=0,d=this.features.length;f<d;f++)this.renderer.locked=f!==d-1,e=this.features[f],this.drawFeature(e)},display:function(a){OpenLayers.Layer.prototype.display.apply(this,arguments);var b=this.div.style.display;b!=this.renderer.root.style.display&& +(this.renderer.root.style.display=b)},addFeatures:function(a,b){OpenLayers.Util.isArray(a)||(a=[a]);var c=!b||!b.silent;if(c){var d={features:a};if(!1===this.events.triggerEvent("beforefeaturesadded",d))return;a=d.features}for(var d=[],e=0,f=a.length;e<f;e++){this.renderer.locked=e!=a.length-1?!0:!1;var g=a[e];if(this.geometryType&&!(g.geometry instanceof this.geometryType))throw new TypeError("addFeatures: component should be an "+this.geometryType.prototype.CLASS_NAME);g.layer=this;!g.style&&this.style&& +(g.style=OpenLayers.Util.extend({},this.style));if(c){if(!1===this.events.triggerEvent("beforefeatureadded",{feature:g}))continue;this.preFeatureInsert(g)}d.push(g);this.features.push(g);this.drawFeature(g);c&&(this.events.triggerEvent("featureadded",{feature:g}),this.onFeatureInsert(g))}c&&this.events.triggerEvent("featuresadded",{features:d})},removeFeatures:function(a,b){if(a&&0!==a.length){if(a===this.features)return this.removeAllFeatures(b);OpenLayers.Util.isArray(a)||(a=[a]);a===this.selectedFeatures&& +(a=a.slice());var c=!b||!b.silent;c&&this.events.triggerEvent("beforefeaturesremoved",{features:a});for(var d=a.length-1;0<=d;d--){this.renderer.locked=0!=d&&a[d-1].geometry?!0:!1;var e=a[d];delete this.unrenderedFeatures[e.id];c&&this.events.triggerEvent("beforefeatureremoved",{feature:e});this.features=OpenLayers.Util.removeItem(this.features,e);e.layer=null;e.geometry&&this.renderer.eraseFeatures(e);-1!=OpenLayers.Util.indexOf(this.selectedFeatures,e)&&OpenLayers.Util.removeItem(this.selectedFeatures, +e);c&&this.events.triggerEvent("featureremoved",{feature:e})}c&&this.events.triggerEvent("featuresremoved",{features:a})}},removeAllFeatures:function(a){a=!a||!a.silent;var b=this.features;a&&this.events.triggerEvent("beforefeaturesremoved",{features:b});for(var c,d=b.length-1;0<=d;d--)c=b[d],a&&this.events.triggerEvent("beforefeatureremoved",{feature:c}),c.layer=null,a&&this.events.triggerEvent("featureremoved",{feature:c});this.renderer.clear();this.features=[];this.unrenderedFeatures={};this.selectedFeatures= +[];a&&this.events.triggerEvent("featuresremoved",{features:b})},destroyFeatures:function(a,b){void 0==a&&(a=this.features);if(a){this.removeFeatures(a,b);for(var c=a.length-1;0<=c;c--)a[c].destroy()}},drawFeature:function(a,b){if(this.drawn){if("object"!=typeof b){b||a.state!==OpenLayers.State.DELETE||(b="delete");var c=b||a.renderIntent;(b=a.style||this.style)||(b=this.styleMap.createSymbolizer(a,c))}c=this.renderer.drawFeature(a,b);!1===c||null===c?this.unrenderedFeatures[a.id]=a:delete this.unrenderedFeatures[a.id]}}, +eraseFeatures:function(a){this.renderer.eraseFeatures(a)},getFeatureFromEvent:function(a){if(!this.renderer)throw Error("getFeatureFromEvent called on layer with no renderer. This usually means you destroyed a layer, but not some handler which is associated with it.");var b=null;(a=this.renderer.getFeatureIdFromEvent(a))&&(b="string"===typeof a?this.getFeatureById(a):a);return b},getFeatureBy:function(a,b){for(var c=null,d=0,e=this.features.length;d<e;++d)if(this.features[d][a]==b){c=this.features[d]; +break}return c},getFeatureById:function(a){return this.getFeatureBy("id",a)},getFeatureByFid:function(a){return this.getFeatureBy("fid",a)},getFeaturesByAttribute:function(a,b){var c,d,e=this.features.length,f=[];for(c=0;c<e;c++)(d=this.features[c])&&d.attributes&&d.attributes[a]===b&&f.push(d);return f},onFeatureInsert:function(a){},preFeatureInsert:function(a){},getDataExtent:function(){var a=null,b=this.features;if(b&&0<b.length)for(var c=null,d=0,e=b.length;d<e;d++)if(c=b[d].geometry)null===a&& +(a=new OpenLayers.Bounds),a.extend(c.getBounds());return a},CLASS_NAME:"OpenLayers.Layer.Vector"});OpenLayers.Layer.Vector.RootContainer=OpenLayers.Class(OpenLayers.Layer.Vector,{displayInLayerSwitcher:!1,layers:null,display:function(){},getFeatureFromEvent:function(a){for(var b=this.layers,c,d=0;d<b.length;d++)if(c=b[d].getFeatureFromEvent(a))return c},setMap:function(a){OpenLayers.Layer.Vector.prototype.setMap.apply(this,arguments);this.collectRoots();a.events.register("changelayer",this,this.handleChangeLayer)},removeMap:function(a){a.events.unregister("changelayer",this,this.handleChangeLayer); +this.resetRoots();OpenLayers.Layer.Vector.prototype.removeMap.apply(this,arguments)},collectRoots:function(){for(var a,b=0;b<this.map.layers.length;++b)a=this.map.layers[b],-1!=OpenLayers.Util.indexOf(this.layers,a)&&a.renderer.moveRoot(this.renderer)},resetRoots:function(){for(var a,b=0;b<this.layers.length;++b)a=this.layers[b],this.renderer&&a.renderer.getRenderLayerId()==this.id&&this.renderer.moveRoot(a.renderer)},handleChangeLayer:function(a){var b=a.layer;"order"==a.property&&-1!=OpenLayers.Util.indexOf(this.layers, +b)&&(this.resetRoots(),this.collectRoots())},CLASS_NAME:"OpenLayers.Layer.Vector.RootContainer"});OpenLayers.Control.SelectFeature=OpenLayers.Class(OpenLayers.Control,{multipleKey:null,toggleKey:null,multiple:!1,clickout:!0,toggle:!1,hover:!1,highlightOnly:!1,box:!1,onBeforeSelect:function(){},onSelect:function(){},onUnselect:function(){},scope:null,geometryTypes:null,layer:null,layers:null,callbacks:null,selectStyle:null,renderIntent:"select",handlers:null,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);null===this.scope&&(this.scope=this);this.initLayer(a);var c= +{click:this.clickFeature,clickout:this.clickoutFeature};this.hover&&(c.over=this.overFeature,c.out=this.outFeature);this.callbacks=OpenLayers.Util.extend(c,this.callbacks);this.handlers={feature:new OpenLayers.Handler.Feature(this,this.layer,this.callbacks,{geometryTypes:this.geometryTypes})};this.box&&(this.handlers.box=new OpenLayers.Handler.Box(this,{done:this.selectBox},{boxDivClassName:"olHandlerBoxSelectFeature"}))},initLayer:function(a){OpenLayers.Util.isArray(a)?(this.layers=a,this.layer= +new OpenLayers.Layer.Vector.RootContainer(this.id+"_container",{layers:a})):this.layer=a},destroy:function(){this.active&&this.layers&&this.map.removeLayer(this.layer);OpenLayers.Control.prototype.destroy.apply(this,arguments);this.layers&&this.layer.destroy()},activate:function(){this.active||(this.layers&&this.map.addLayer(this.layer),this.handlers.feature.activate(),this.box&&this.handlers.box&&this.handlers.box.activate());return OpenLayers.Control.prototype.activate.apply(this,arguments)},deactivate:function(){this.active&& +(this.handlers.feature.deactivate(),this.handlers.box&&this.handlers.box.deactivate(),this.layers&&this.map.removeLayer(this.layer));return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},unselectAll:function(a){var b=this.layers||[this.layer],c,d,e,f;for(e=0;e<b.length;++e)if(c=b[e],f=0,null!=c.selectedFeatures)for(;c.selectedFeatures.length>f;)d=c.selectedFeatures[f],a&&a.except==d?++f:this.unselect(d)},clickFeature:function(a){this.hover||(-1<OpenLayers.Util.indexOf(a.layer.selectedFeatures, +a)?this.toggleSelect()?this.unselect(a):this.multipleSelect()||this.unselectAll({except:a}):(this.multipleSelect()||this.unselectAll({except:a}),this.select(a)))},multipleSelect:function(){return this.multiple||this.handlers.feature.evt&&this.handlers.feature.evt[this.multipleKey]},toggleSelect:function(){return this.toggle||this.handlers.feature.evt&&this.handlers.feature.evt[this.toggleKey]},clickoutFeature:function(a){!this.hover&&this.clickout&&this.unselectAll()},overFeature:function(a){var b= +a.layer;this.hover&&(this.highlightOnly?this.highlight(a):-1==OpenLayers.Util.indexOf(b.selectedFeatures,a)&&this.select(a))},outFeature:function(a){if(this.hover)if(this.highlightOnly){if(a._lastHighlighter==this.id)if(a._prevHighlighter&&a._prevHighlighter!=this.id){delete a._lastHighlighter;var b=this.map.getControl(a._prevHighlighter);b&&b.highlight(a)}else this.unhighlight(a)}else this.unselect(a)},highlight:function(a){var b=a.layer;!1!==this.events.triggerEvent("beforefeaturehighlighted",{feature:a})&& +(a._prevHighlighter=a._lastHighlighter,a._lastHighlighter=this.id,b.drawFeature(a,this.selectStyle||this.renderIntent),this.events.triggerEvent("featurehighlighted",{feature:a}))},unhighlight:function(a){var b=a.layer;void 0==a._prevHighlighter?delete a._lastHighlighter:(a._prevHighlighter!=this.id&&(a._lastHighlighter=a._prevHighlighter),delete a._prevHighlighter);b.drawFeature(a,a.style||a.layer.style||"default");this.events.triggerEvent("featureunhighlighted",{feature:a})},select:function(a){var b= +this.onBeforeSelect.call(this.scope,a),c=a.layer;!1!==b&&(b=c.events.triggerEvent("beforefeatureselected",{feature:a}),!1!==b&&(c.selectedFeatures.push(a),this.highlight(a),this.handlers.feature.lastFeature||(this.handlers.feature.lastFeature=c.selectedFeatures[0]),c.events.triggerEvent("featureselected",{feature:a}),this.onSelect.call(this.scope,a)))},unselect:function(a){var b=a.layer;this.unhighlight(a);OpenLayers.Util.removeItem(b.selectedFeatures,a);b.events.triggerEvent("featureunselected", +{feature:a});this.onUnselect.call(this.scope,a)},selectBox:function(a){if(a instanceof OpenLayers.Bounds){var b=this.map.getLonLatFromPixel({x:a.left,y:a.bottom});a=this.map.getLonLatFromPixel({x:a.right,y:a.top});b=new OpenLayers.Bounds(b.lon,b.lat,a.lon,a.lat);this.multipleSelect()||this.unselectAll();a=this.multiple;this.multiple=!0;var c=this.layers||[this.layer];this.events.triggerEvent("boxselectionstart",{layers:c});for(var d,e=0;e<c.length;++e){d=c[e];for(var f=0,g=d.features.length;f<g;++f){var h= +d.features[f];h.getVisibility()&&(null==this.geometryTypes||-1<OpenLayers.Util.indexOf(this.geometryTypes,h.geometry.CLASS_NAME))&&b.toGeometry().intersects(h.geometry)&&-1==OpenLayers.Util.indexOf(d.selectedFeatures,h)&&this.select(h)}}this.multiple=a;this.events.triggerEvent("boxselectionend",{layers:c})}},setMap:function(a){this.handlers.feature.setMap(a);this.box&&this.handlers.box.setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},setLayer:function(a){var b=this.active;this.unselectAll(); +this.deactivate();this.layers&&(this.layer.destroy(),this.layers=null);this.initLayer(a);this.handlers.feature.layer=this.layer;b&&this.activate()},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Control.Attribution=OpenLayers.Class(OpenLayers.Control,{separator:", ",template:"${layers}",destroy:function(){this.map.events.un({removelayer:this.updateAttribution,addlayer:this.updateAttribution,changelayer:this.updateAttribution,changebaselayer:this.updateAttribution,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments)},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.map.events.on({changebaselayer:this.updateAttribution,changelayer:this.updateAttribution, +addlayer:this.updateAttribution,removelayer:this.updateAttribution,scope:this});this.updateAttribution();return this.div},updateAttribution:function(){var a=[];if(this.map&&this.map.layers){for(var b=0,c=this.map.layers.length;b<c;b++){var d=this.map.layers[b];d.attribution&&d.getVisibility()&&-1===OpenLayers.Util.indexOf(a,d.attribution)&&a.push(d.attribution)}this.div.innerHTML=OpenLayers.String.format(this.template,{layers:a.join(this.separator)})}},CLASS_NAME:"OpenLayers.Control.Attribution"});OpenLayers.Handler.Drag=OpenLayers.Class(OpenLayers.Handler,{started:!1,stopDown:!0,dragging:!1,last:null,start:null,lastMoveEvt:null,oldOnselectstart:null,interval:0,timeoutId:null,documentDrag:!1,documentEvents:null,initialize:function(a,b,c){OpenLayers.Handler.prototype.initialize.apply(this,arguments);if(!0===this.documentDrag){var d=this;this._docMove=function(a){d.mousemove({xy:{x:a.clientX,y:a.clientY},element:document})};this._docUp=function(a){d.mouseup({xy:{x:a.clientX,y:a.clientY}})}}}, +dragstart:function(a){var b=!0;this.dragging=!1;this.checkModifiers(a)&&(OpenLayers.Event.isLeftClick(a)||OpenLayers.Event.isSingleTouch(a))?(this.started=!0,this.last=this.start=a.xy,OpenLayers.Element.addClass(this.map.viewPortDiv,"olDragDown"),this.down(a),this.callback("down",[a.xy]),OpenLayers.Event.preventDefault(a),this.oldOnselectstart||(this.oldOnselectstart=document.onselectstart?document.onselectstart:OpenLayers.Function.True),document.onselectstart=OpenLayers.Function.False,b=!this.stopDown): +(this.started=!1,this.last=this.start=null);return b},dragmove:function(a){this.lastMoveEvt=a;!this.started||this.timeoutId||a.xy.x==this.last.x&&a.xy.y==this.last.y||(!0===this.documentDrag&&this.documentEvents&&(a.element===document?(this.adjustXY(a),this.setEvent(a)):this.removeDocumentEvents()),0<this.interval&&(this.timeoutId=setTimeout(OpenLayers.Function.bind(this.removeTimeout,this),this.interval)),this.dragging=!0,this.move(a),this.callback("move",[a.xy]),this.oldOnselectstart||(this.oldOnselectstart= +document.onselectstart,document.onselectstart=OpenLayers.Function.False),this.last=a.xy);return!0},dragend:function(a){if(this.started){!0===this.documentDrag&&this.documentEvents&&(this.adjustXY(a),this.removeDocumentEvents());var b=this.start!=this.last;this.dragging=this.started=!1;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.up(a);this.callback("up",[a.xy]);b&&this.callback("done",[a.xy]);document.onselectstart=this.oldOnselectstart}return!0},down:function(a){},move:function(a){}, +up:function(a){},out:function(a){},mousedown:function(a){return this.dragstart(a)},touchstart:function(a){this.startTouch();return this.dragstart(a)},mousemove:function(a){return this.dragmove(a)},touchmove:function(a){return this.dragmove(a)},removeTimeout:function(){this.timeoutId=null;this.dragging&&this.mousemove(this.lastMoveEvt)},mouseup:function(a){return this.dragend(a)},touchend:function(a){a.xy=this.last;return this.dragend(a)},mouseout:function(a){if(this.started&&OpenLayers.Util.mouseLeft(a, +this.map.viewPortDiv))if(!0===this.documentDrag)this.addDocumentEvents();else{var b=this.start!=this.last;this.dragging=this.started=!1;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.out(a);this.callback("out",[]);b&&this.callback("done",[a.xy]);document.onselectstart&&(document.onselectstart=this.oldOnselectstart)}return!0},click:function(a){return this.start==this.last},activate:function(){var a=!1;OpenLayers.Handler.prototype.activate.apply(this,arguments)&&(this.dragging= +!1,a=!0);return a},deactivate:function(){var a=!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.dragging=this.started=!1,this.last=this.start=null,a=!0,OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown"));return a},adjustXY:function(a){var b=OpenLayers.Util.pagePosition(this.map.viewPortDiv);a.xy.x-=b[0];a.xy.y-=b[1]},addDocumentEvents:function(){OpenLayers.Element.addClass(document.body,"olDragDown");this.documentEvents=!0;OpenLayers.Event.observe(document,"mousemove", +this._docMove);OpenLayers.Event.observe(document,"mouseup",this._docUp)},removeDocumentEvents:function(){OpenLayers.Element.removeClass(document.body,"olDragDown");this.documentEvents=!1;OpenLayers.Event.stopObserving(document,"mousemove",this._docMove);OpenLayers.Event.stopObserving(document,"mouseup",this._docUp)},CLASS_NAME:"OpenLayers.Handler.Drag"});OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:"olHandlerBoxZoomBox",boxOffsets:null,initialize:function(a,b,c){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.dragHandler=new OpenLayers.Handler.Drag(this,{down:this.startBox,move:this.moveBox,out:this.removeBox,up:this.endBox},{keyMask:this.keyMask})},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.dragHandler&&(this.dragHandler.destroy(),this.dragHandler= +null)},setMap:function(a){OpenLayers.Handler.prototype.setMap.apply(this,arguments);this.dragHandler&&this.dragHandler.setMap(a)},startBox:function(a){this.callback("start",[]);this.zoomBox=OpenLayers.Util.createDiv("zoomBox",{x:-9999,y:-9999});this.zoomBox.className=this.boxDivClassName;this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE.Popup-1;this.map.viewPortDiv.appendChild(this.zoomBox);OpenLayers.Element.addClass(this.map.viewPortDiv,"olDrawBox")},moveBox:function(a){var b=this.dragHandler.start.x, +c=this.dragHandler.start.y,d=Math.abs(b-a.x),e=Math.abs(c-a.y),f=this.getBoxOffsets();this.zoomBox.style.width=d+f.width+1+"px";this.zoomBox.style.height=e+f.height+1+"px";this.zoomBox.style.left=(a.x<b?b-d-f.left:b-f.left)+"px";this.zoomBox.style.top=(a.y<c?c-e-f.top:c-f.top)+"px"},endBox:function(a){if(5<Math.abs(this.dragHandler.start.x-a.x)||5<Math.abs(this.dragHandler.start.y-a.y)){var b=this.dragHandler.start;a=new OpenLayers.Bounds(Math.min(b.x,a.x),Math.max(b.y,a.y),Math.max(b.x,a.x),Math.min(b.y, +a.y))}else a=this.dragHandler.start.clone();this.removeBox();this.callback("done",[a])},removeBox:function(){this.map.viewPortDiv.removeChild(this.zoomBox);this.boxOffsets=this.zoomBox=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDrawBox")},activate:function(){return OpenLayers.Handler.prototype.activate.apply(this,arguments)?(this.dragHandler.activate(),!0):!1},deactivate:function(){return OpenLayers.Handler.prototype.deactivate.apply(this,arguments)?(this.dragHandler.deactivate()&& +this.zoomBox&&this.removeBox(),!0):!1},getBoxOffsets:function(){if(!this.boxOffsets){var a=document.createElement("div");a.style.position="absolute";a.style.border="1px solid black";a.style.width="3px";document.body.appendChild(a);var b=3==a.clientWidth;document.body.removeChild(a);var a=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-left-width")),c=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-right-width")),d=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-top-width")), +e=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-bottom-width"));this.boxOffsets={left:a,right:c,top:d,bottom:e,width:!1===b?a+c:0,height:!1===b?d+e:0}}return this.boxOffsets},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Control.ZoomBox=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,out:!1,keyMask:null,alwaysZoom:!1,zoomOnClick:!0,draw:function(){this.handler=new OpenLayers.Handler.Box(this,{done:this.zoomBox},{keyMask:this.keyMask})},zoomBox:function(a){if(a instanceof OpenLayers.Bounds){var b,c=a.getCenterPixel();if(this.out){b=Math.min(this.map.size.h/(a.bottom-a.top),this.map.size.w/(a.right-a.left));var d=this.map.getExtent(),e=this.map.getLonLatFromPixel(c),f=e.lon-d.getWidth()/ +2*b;a=e.lon+d.getWidth()/2*b;var g=e.lat-d.getHeight()/2*b;b=e.lat+d.getHeight()/2*b;b=new OpenLayers.Bounds(f,g,a,b)}else f=this.map.getLonLatFromPixel({x:a.left,y:a.bottom}),a=this.map.getLonLatFromPixel({x:a.right,y:a.top}),b=new OpenLayers.Bounds(f.lon,f.lat,a.lon,a.lat);f=this.map.getZoom();g=this.map.getSize();a=g.w/2;g=g.h/2;b=this.map.getZoomForExtent(b);d=this.map.getResolution();e=this.map.getResolutionForZoom(b);d==e?this.map.setCenter(this.map.getLonLatFromPixel(c)):this.map.zoomTo(b, +{x:(d*c.x-e*a)/(d-e),y:(d*c.y-e*g)/(d-e)});f==this.map.getZoom()&&1==this.alwaysZoom&&this.map.zoomTo(f+(this.out?-1:1))}else this.zoomOnClick&&(this.out?this.map.zoomTo(this.map.getZoom()-1,a):this.map.zoomTo(this.map.getZoom()+1,a))},CLASS_NAME:"OpenLayers.Control.ZoomBox"});OpenLayers.Control.DragPan=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,panned:!1,interval:0,documentDrag:!1,kinetic:null,enableKinetic:!0,kineticInterval:10,draw:function(){if(this.enableKinetic&&OpenLayers.Kinetic){var a={interval:this.kineticInterval};"object"===typeof this.enableKinetic&&(a=OpenLayers.Util.extend(a,this.enableKinetic));this.kinetic=new OpenLayers.Kinetic(a)}this.handler=new OpenLayers.Handler.Drag(this,{move:this.panMap,done:this.panMapDone,down:this.panMapStart}, +{interval:this.interval,documentDrag:this.documentDrag})},panMapStart:function(){this.kinetic&&this.kinetic.begin()},panMap:function(a){this.kinetic&&this.kinetic.update(a);this.panned=!0;this.map.pan(this.handler.last.x-a.x,this.handler.last.y-a.y,{dragging:!0,animate:!1})},panMapDone:function(a){if(this.panned){var b=null;this.kinetic&&(b=this.kinetic.end(a));this.map.pan(this.handler.last.x-a.x,this.handler.last.y-a.y,{dragging:!!b,animate:!1});if(b){var c=this;this.kinetic.move(b,function(a,b, +f){c.map.pan(a,b,{dragging:!f,animate:!1})})}this.panned=!1}},CLASS_NAME:"OpenLayers.Control.DragPan"});OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:!0,"double":!1,pixelTolerance:0,dblclickTolerance:13,stopSingle:!1,stopDouble:!1,timerId:null,down:null,last:null,first:null,rightclickTimerId:null,touchstart:function(a){this.startTouch();this.down=this.getEventInfo(a);this.last=this.getEventInfo(a);return!0},touchmove:function(a){this.last=this.getEventInfo(a);return!0},touchend:function(a){this.down&&(a.xy=this.last.xy,a.lastTouches=this.last.touches,this.handleSingle(a), +this.down=null);return!0},mousedown:function(a){this.down=this.getEventInfo(a);this.last=this.getEventInfo(a);return!0},mouseup:function(a){var b=!0;this.checkModifiers(a)&&this.control.handleRightClicks&&OpenLayers.Event.isRightClick(a)&&(b=this.rightclick(a));return b},rightclick:function(a){if(this.passesTolerance(a)){if(null!=this.rightclickTimerId)return this.clearTimer(),this.callback("dblrightclick",[a]),!this.stopDouble;a=this["double"]?OpenLayers.Util.extend({},a):this.callback("rightclick", +[a]);a=OpenLayers.Function.bind(this.delayedRightCall,this,a);this.rightclickTimerId=window.setTimeout(a,this.delay)}return!this.stopSingle},delayedRightCall:function(a){this.rightclickTimerId=null;a&&this.callback("rightclick",[a])},click:function(a){this.last||(this.last=this.getEventInfo(a));this.handleSingle(a);return!this.stopSingle},dblclick:function(a){this.handleDouble(a);return!this.stopDouble},handleDouble:function(a){this.passesDblclickTolerance(a)&&(this["double"]&&this.callback("dblclick", +[a]),this.clearTimer())},handleSingle:function(a){this.passesTolerance(a)&&(null!=this.timerId?(this.last.touches&&1===this.last.touches.length&&(this["double"]&&OpenLayers.Event.preventDefault(a),this.handleDouble(a)),this.last.touches&&2===this.last.touches.length||this.clearTimer()):(this.first=this.getEventInfo(a),a=this.single?OpenLayers.Util.extend({},a):null,this.queuePotentialClick(a)))},queuePotentialClick:function(a){this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall, +this,a),this.delay)},passesTolerance:function(a){var b=!0;if(null!=this.pixelTolerance&&this.down&&this.down.xy&&(b=this.pixelTolerance>=this.down.xy.distanceTo(a.xy))&&this.touch&&this.down.touches.length===this.last.touches.length){a=0;for(var c=this.down.touches.length;a<c;++a)if(this.getTouchDistance(this.down.touches[a],this.last.touches[a])>this.pixelTolerance){b=!1;break}}return b},getTouchDistance:function(a,b){return Math.sqrt(Math.pow(a.clientX-b.clientX,2)+Math.pow(a.clientY-b.clientY, +2))},passesDblclickTolerance:function(a){a=!0;this.down&&this.first&&(a=this.down.xy.distanceTo(this.first.xy)<=this.dblclickTolerance);return a},clearTimer:function(){null!=this.timerId&&(window.clearTimeout(this.timerId),this.timerId=null);null!=this.rightclickTimerId&&(window.clearTimeout(this.rightclickTimerId),this.rightclickTimerId=null)},delayedCall:function(a){this.timerId=null;a&&this.callback("click",[a])},getEventInfo:function(a){var b;if(a.touches){var c=a.touches.length;b=Array(c);for(var d, +e=0;e<c;e++)d=a.touches[e],b[e]={clientX:d.olClientX,clientY:d.olClientY}}return{xy:a.xy,touches:b}},deactivate:function(){var a=!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.clearTimer(),this.last=this.first=this.down=null,a=!0);return a},CLASS_NAME:"OpenLayers.Handler.Click"});OpenLayers.Control.Navigation=OpenLayers.Class(OpenLayers.Control,{dragPan:null,dragPanOptions:null,pinchZoom:null,pinchZoomOptions:null,documentDrag:!1,zoomBox:null,zoomBoxEnabled:!0,zoomWheelEnabled:!0,mouseWheelOptions:null,handleRightClicks:!1,zoomBoxKeyMask:OpenLayers.Handler.MOD_SHIFT,autoActivate:!0,initialize:function(a){this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,arguments)},destroy:function(){this.deactivate();this.dragPan&&this.dragPan.destroy();this.dragPan=null; +this.zoomBox&&this.zoomBox.destroy();this.zoomBox=null;this.pinchZoom&&this.pinchZoom.destroy();this.pinchZoom=null;OpenLayers.Control.prototype.destroy.apply(this,arguments)},activate:function(){this.dragPan.activate();this.zoomWheelEnabled&&this.handlers.wheel.activate();this.handlers.click.activate();this.zoomBoxEnabled&&this.zoomBox.activate();this.pinchZoom&&this.pinchZoom.activate();return OpenLayers.Control.prototype.activate.apply(this,arguments)},deactivate:function(){this.pinchZoom&&this.pinchZoom.deactivate(); +this.zoomBox.deactivate();this.dragPan.deactivate();this.handlers.click.deactivate();this.handlers.wheel.deactivate();return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},draw:function(){this.handleRightClicks&&(this.map.viewPortDiv.oncontextmenu=OpenLayers.Function.False);this.handlers.click=new OpenLayers.Handler.Click(this,{click:this.defaultClick,dblclick:this.defaultDblClick,dblrightclick:this.defaultDblRightClick},{"double":!0,stopDouble:!0});this.dragPan=new OpenLayers.Control.DragPan(OpenLayers.Util.extend({map:this.map, +documentDrag:this.documentDrag},this.dragPanOptions));this.zoomBox=new OpenLayers.Control.ZoomBox({map:this.map,keyMask:this.zoomBoxKeyMask});this.dragPan.draw();this.zoomBox.draw();this.handlers.wheel=new OpenLayers.Handler.MouseWheel(this,{up:this.wheelUp,down:this.wheelDown},OpenLayers.Util.extend(this.map.fractionalZoom?{}:{cumulative:!1,interval:50,maxDelta:6},this.mouseWheelOptions));OpenLayers.Control.PinchZoom&&(this.pinchZoom=new OpenLayers.Control.PinchZoom(OpenLayers.Util.extend({map:this.map}, +this.pinchZoomOptions)))},defaultClick:function(a){a.lastTouches&&2==a.lastTouches.length&&this.map.zoomOut()},defaultDblClick:function(a){this.map.zoomTo(this.map.zoom+1,a.xy)},defaultDblRightClick:function(a){this.map.zoomTo(this.map.zoom-1,a.xy)},wheelChange:function(a,b){this.map.fractionalZoom||(b=Math.round(b));var c=this.map.getZoom(),d;d=Math.max(c+b,0);d=Math.min(d,this.map.getNumZoomLevels());d!==c&&this.map.zoomTo(d,a.xy)},wheelUp:function(a,b){this.wheelChange(a,b||1)},wheelDown:function(a, +b){this.wheelChange(a,b||-1)},disableZoomBox:function(){this.zoomBoxEnabled=!1;this.zoomBox.deactivate()},enableZoomBox:function(){this.zoomBoxEnabled=!0;this.active&&this.zoomBox.activate()},disableZoomWheel:function(){this.zoomWheelEnabled=!1;this.handlers.wheel.deactivate()},enableZoomWheel:function(){this.zoomWheelEnabled=!0;this.active&&this.handlers.wheel.activate()},CLASS_NAME:"OpenLayers.Control.Navigation"});OpenLayers.Layer.HTTPRequest=OpenLayers.Class(OpenLayers.Layer,{URL_HASH_FACTOR:(Math.sqrt(5)-1)/2,url:null,params:null,reproject:!1,initialize:function(a,b,c,d){OpenLayers.Layer.prototype.initialize.apply(this,[a,d]);this.url=b;this.params||(this.params=OpenLayers.Util.extend({},c))},destroy:function(){this.params=this.url=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},clone:function(a){null==a&&(a=new OpenLayers.Layer.HTTPRequest(this.name,this.url,this.params,this.getOptions())); +return a=OpenLayers.Layer.prototype.clone.apply(this,[a])},setUrl:function(a){this.url=a},mergeNewParams:function(a){this.params=OpenLayers.Util.extend(this.params,a);a=this.redraw();null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"params"});return a},redraw:function(a){return a?this.mergeNewParams({_olSalt:Math.random()}):OpenLayers.Layer.prototype.redraw.apply(this,[])},selectUrl:function(a,b){for(var c=1,d=0,e=a.length;d<e;d++)c=c*a.charCodeAt(d)*this.URL_HASH_FACTOR, +c-=Math.floor(c);return b[Math.floor(c*b.length)]},getFullRequestString:function(a,b){var c=b||this.url,d=OpenLayers.Util.extend({},this.params),d=OpenLayers.Util.extend(d,a),e=OpenLayers.Util.getParameterString(d);OpenLayers.Util.isArray(c)&&(c=this.selectUrl(e,c));var e=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(c)),f;for(f in d)f.toUpperCase()in e&&delete d[f];e=OpenLayers.Util.getParameterString(d);return OpenLayers.Util.urlAppend(c,e)},CLASS_NAME:"OpenLayers.Layer.HTTPRequest"});OpenLayers.Layer.Grid=OpenLayers.Class(OpenLayers.Layer.HTTPRequest,{tileSize:null,tileOriginCorner:"bl",tileOrigin:null,tileOptions:null,tileClass:OpenLayers.Tile.Image,grid:null,singleTile:!1,ratio:1.5,buffer:0,transitionEffect:"resize",numLoadingTiles:0,serverResolutions:null,loading:!1,backBuffer:null,gridResolution:null,backBufferResolution:null,backBufferLonLat:null,backBufferTimerId:null,removeBackBufferDelay:null,className:null,gridLayout:null,rowSign:null,transitionendEvents:["transitionend", +"webkitTransitionEnd","otransitionend","oTransitionEnd"],initialize:function(a,b,c,d){OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this,arguments);this.grid=[];this._removeBackBuffer=OpenLayers.Function.bind(this.removeBackBuffer,this);this.initProperties();this.rowSign="t"===this.tileOriginCorner.substr(0,1)?1:-1},initProperties:function(){void 0===this.options.removeBackBufferDelay&&(this.removeBackBufferDelay=this.singleTile?0:2500);void 0===this.options.className&&(this.className=this.singleTile? +"olLayerGridSingleTile":"olLayerGrid")},setMap:function(a){OpenLayers.Layer.HTTPRequest.prototype.setMap.call(this,a);OpenLayers.Element.addClass(this.div,this.className)},removeMap:function(a){this.removeBackBuffer()},destroy:function(){this.removeBackBuffer();this.clearGrid();this.tileSize=this.grid=null;OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this,arguments)},clearGrid:function(){if(this.grid){for(var a=0,b=this.grid.length;a<b;a++)for(var c=this.grid[a],d=0,e=c.length;d<e;d++)this.destroyTile(c[d]); +this.grid=[];this.gridLayout=this.gridResolution=null}},addOptions:function(a,b){var c=void 0!==a.singleTile&&a.singleTile!==this.singleTile;OpenLayers.Layer.HTTPRequest.prototype.addOptions.apply(this,arguments);this.map&&c&&(this.initProperties(),this.clearGrid(),this.tileSize=this.options.tileSize,this.setTileSize(),this.moveTo(null,!0))},clone:function(a){null==a&&(a=new OpenLayers.Layer.Grid(this.name,this.url,this.params,this.getOptions()));a=OpenLayers.Layer.HTTPRequest.prototype.clone.apply(this, +[a]);null!=this.tileSize&&(a.tileSize=this.tileSize.clone());a.grid=[];a.gridResolution=null;a.backBuffer=null;a.backBufferTimerId=null;a.loading=!1;a.numLoadingTiles=0;return a},moveTo:function(a,b,c){OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);a=a||this.map.getExtent();if(null!=a){var d=!this.grid.length||b,e=this.getTilesBounds(),f=this.map.getResolution();this.getServerResolution(f);if(this.singleTile){if(d||!c&&!e.containsBounds(a))b&&"resize"!==this.transitionEffect&& +this.removeBackBuffer(),b&&"resize"!==this.transitionEffect||this.applyBackBuffer(f),this.initSingleTile(a)}else(d=d||!e.intersectsBounds(a,{worldBounds:this.map.baseLayer.wrapDateLine&&this.map.getMaxExtent()}))?(!b||"resize"!==this.transitionEffect&&this.gridResolution!==f||this.applyBackBuffer(f),this.initGriddedTiles(a)):this.moveGriddedTiles()}},getTileData:function(a){var b=null,c=a.lon,d=a.lat,e=this.grid.length;if(this.map&&e){var f=this.map.getResolution();a=this.tileSize.w;var g=this.tileSize.h, +h=this.grid[0][0].bounds,k=h.left,h=h.top;if(c<k&&this.map.baseLayer.wrapDateLine)var l=this.map.getMaxExtent().getWidth(),c=c+l*Math.ceil((k-c)/l);c=(c-k)/(f*a);d=(h-d)/(f*g);f=Math.floor(c);k=Math.floor(d);0<=k&&k<e&&(e=this.grid[k][f])&&(b={tile:e,i:Math.floor((c-f)*a),j:Math.floor((d-k)*g)})}return b},destroyTile:function(a){this.removeTileMonitoringHooks(a);a.destroy()},getServerResolution:function(a){var b=Number.POSITIVE_INFINITY;a=a||this.map.getResolution();if(this.serverResolutions&&-1=== +OpenLayers.Util.indexOf(this.serverResolutions,a)){var c,d,e,f;for(c=this.serverResolutions.length-1;0<=c;c--){e=this.serverResolutions[c];d=Math.abs(e-a);if(d>b)break;b=d;f=e}a=f}return a},getServerZoom:function(){var a=this.getServerResolution();return this.serverResolutions?OpenLayers.Util.indexOf(this.serverResolutions,a):this.map.getZoomForResolution(a)+(this.zoomOffset||0)},applyBackBuffer:function(a){null!==this.backBufferTimerId&&this.removeBackBuffer();var b=this.backBuffer;if(!b){b=this.createBackBuffer(); +if(!b)return;a===this.gridResolution?this.div.insertBefore(b,this.div.firstChild):this.map.baseLayer.div.parentNode.insertBefore(b,this.map.baseLayer.div);this.backBuffer=b;var c=this.grid[0][0].bounds;this.backBufferLonLat={lon:c.left,lat:c.top};this.backBufferResolution=this.gridResolution}for(var c=this.backBufferResolution/a,d=b.childNodes,e,f=d.length-1;0<=f;--f)e=d[f],e.style.top=(c*e._i*e._h|0)+"px",e.style.left=(c*e._j*e._w|0)+"px",e.style.width=Math.round(c*e._w)+"px",e.style.height=Math.round(c* +e._h)+"px";a=this.getViewPortPxFromLonLat(this.backBufferLonLat,a);c=this.map.layerContainerOriginPx.y;b.style.left=Math.round(a.x-this.map.layerContainerOriginPx.x)+"px";b.style.top=Math.round(a.y-c)+"px"},createBackBuffer:function(){var a;if(0<this.grid.length){a=document.createElement("div");a.id=this.div.id+"_bb";a.className="olBackBuffer";a.style.position="absolute";var b=this.map;a.style.zIndex="resize"===this.transitionEffect?this.getZIndex()-1:b.Z_INDEX_BASE.BaseLayer-(b.getNumLayers()-b.getLayerIndex(this)); +for(var b=0,c=this.grid.length;b<c;b++)for(var d=0,e=this.grid[b].length;d<e;d++){var f=this.grid[b][d],g=this.grid[b][d].createBackBuffer();g&&(g._i=b,g._j=d,g._w=f.size.w,g._h=f.size.h,g.id=f.id+"_bb",a.appendChild(g))}}return a},removeBackBuffer:function(){if(this._transitionElement){for(var a=this.transitionendEvents.length-1;0<=a;--a)OpenLayers.Event.stopObserving(this._transitionElement,this.transitionendEvents[a],this._removeBackBuffer);delete this._transitionElement}this.backBuffer&&(this.backBuffer.parentNode&& +this.backBuffer.parentNode.removeChild(this.backBuffer),this.backBufferResolution=this.backBuffer=null,null!==this.backBufferTimerId&&(window.clearTimeout(this.backBufferTimerId),this.backBufferTimerId=null))},moveByPx:function(a,b){this.singleTile||this.moveGriddedTiles()},setTileSize:function(a){this.singleTile&&(a=this.map.getSize(),a.h=parseInt(a.h*this.ratio,10),a.w=parseInt(a.w*this.ratio,10));OpenLayers.Layer.HTTPRequest.prototype.setTileSize.apply(this,[a])},getTilesBounds:function(){var a= +null,b=this.grid.length;if(b)var a=this.grid[b-1][0].bounds,b=this.grid[0].length*a.getWidth(),c=this.grid.length*a.getHeight(),a=new OpenLayers.Bounds(a.left,a.bottom,a.left+b,a.bottom+c);return a},initSingleTile:function(a){this.events.triggerEvent("retile");var b=a.getCenterLonLat(),c=a.getWidth()*this.ratio;a=a.getHeight()*this.ratio;b=new OpenLayers.Bounds(b.lon-c/2,b.lat-a/2,b.lon+c/2,b.lat+a/2);c=this.map.getLayerPxFromLonLat({lon:b.left,lat:b.top});this.grid.length||(this.grid[0]=[]);(a=this.grid[0][0])? +a.moveTo(b,c):(a=this.addTile(b,c),this.addTileMonitoringHooks(a),a.draw(),this.grid[0][0]=a);this.removeExcessTiles(1,1);this.gridResolution=this.getServerResolution()},calculateGridLayout:function(a,b,c){var d=c*this.tileSize.w;c*=this.tileSize.h;var e=Math.floor((a.left-b.lon)/d)-this.buffer,f=this.rowSign;a=Math[~f?"floor":"ceil"](f*(b.lat-a.top+c)/c)-this.buffer*f;return{tilelon:d,tilelat:c,startcol:e,startrow:a}},getTileOrigin:function(){var a=this.tileOrigin;if(!a)var a=this.getMaxExtent(), +b={tl:["left","top"],tr:["right","top"],bl:["left","bottom"],br:["right","bottom"]}[this.tileOriginCorner],a=new OpenLayers.LonLat(a[b[0]],a[b[1]]);return a},getTileBoundsForGridIndex:function(a,b){var c=this.getTileOrigin(),d=this.gridLayout,e=d.tilelon,f=d.tilelat,g=d.startcol,d=d.startrow,h=this.rowSign;return new OpenLayers.Bounds(c.lon+(g+b)*e,c.lat-(d+a*h)*f*h,c.lon+(g+b+1)*e,c.lat-(d+(a-1)*h)*f*h)},initGriddedTiles:function(a){this.events.triggerEvent("retile");var b=this.map.getSize(),c=this.getTileOrigin(), +d=this.map.getResolution(),e=this.getServerResolution(),f=d/e,d=this.tileSize.w/f,f=this.tileSize.h/f,g=Math.ceil(b.h/f)+2*this.buffer+1,b=Math.ceil(b.w/d)+2*this.buffer+1;this.gridLayout=e=this.calculateGridLayout(a,c,e);var c=e.tilelon,h=e.tilelat,e=this.map.layerContainerOriginPx.x,k=this.map.layerContainerOriginPx.y,l=this.getTileBoundsForGridIndex(0,0),m=this.map.getViewPortPxFromLonLat(new OpenLayers.LonLat(l.left,l.top));m.x=Math.round(m.x)-e;m.y=Math.round(m.y)-k;var e=[],k=this.map.getCenter(), +q=0;do{var n=this.grid[q];n||(n=[],this.grid.push(n));var p=0;do{var l=this.getTileBoundsForGridIndex(q,p),r=m.clone();r.x+=p*Math.round(d);r.y+=q*Math.round(f);var t=n[p];t?t.moveTo(l,r,!1):(t=this.addTile(l,r),this.addTileMonitoringHooks(t),n.push(t));r=l.getCenterLonLat();e.push({tile:t,distance:Math.pow(r.lon-k.lon,2)+Math.pow(r.lat-k.lat,2)});p+=1}while(l.right<=a.right+c*this.buffer||p<b);q+=1}while(l.bottom>=a.bottom-h*this.buffer||q<g);this.removeExcessTiles(q,p);this.gridResolution=d=this.getServerResolution(); +e.sort(function(a,b){return a.distance-b.distance});a=0;for(d=e.length;a<d;++a)e[a].tile.draw()},getMaxExtent:function(){return this.maxExtent},addTile:function(a,b){var c=new this.tileClass(this,b,a,null,this.tileSize,this.tileOptions);this.events.triggerEvent("addtile",{tile:c});return c},addTileMonitoringHooks:function(a){a.onLoadStart=function(){!1===this.loading&&(this.loading=!0,this.events.triggerEvent("loadstart"));this.events.triggerEvent("tileloadstart",{tile:a});this.numLoadingTiles++; +!this.singleTile&&this.backBuffer&&this.gridResolution===this.backBufferResolution&&OpenLayers.Element.addClass(a.getTile(),"olTileReplacing")};a.onLoadEnd=function(b){this.numLoadingTiles--;b="unload"===b.type;this.events.triggerEvent("tileloaded",{tile:a,aborted:b});if(!this.singleTile&&!b&&this.backBuffer&&this.gridResolution===this.backBufferResolution){var c=a.getTile();if("none"===OpenLayers.Element.getStyle(c,"display")){var d=document.getElementById(a.id+"_bb");d&&d.parentNode.removeChild(d)}OpenLayers.Element.removeClass(c, +"olTileReplacing")}if(0===this.numLoadingTiles){if(this.backBuffer)if(0===this.backBuffer.childNodes.length)this.removeBackBuffer();else{this._transitionElement=b?this.div.lastChild:a.imgDiv;b=this.transitionendEvents;for(c=b.length-1;0<=c;--c)OpenLayers.Event.observe(this._transitionElement,b[c],this._removeBackBuffer);this.backBufferTimerId=window.setTimeout(this._removeBackBuffer,this.removeBackBufferDelay)}this.loading=!1;this.events.triggerEvent("loadend")}};a.onLoadError=function(){this.events.triggerEvent("tileerror", +{tile:a})};a.events.on({loadstart:a.onLoadStart,loadend:a.onLoadEnd,unload:a.onLoadEnd,loaderror:a.onLoadError,scope:this})},removeTileMonitoringHooks:function(a){a.unload();a.events.un({loadstart:a.onLoadStart,loadend:a.onLoadEnd,unload:a.onLoadEnd,loaderror:a.onLoadError,scope:this})},moveGriddedTiles:function(){for(var a=this.buffer+1;;){var b=this.grid[0][0],c=b.position.x+this.map.layerContainerOriginPx.x,b=b.position.y+this.map.layerContainerOriginPx.y,d=this.getServerResolution()/this.map.getResolution(), +d={w:Math.round(this.tileSize.w*d),h:Math.round(this.tileSize.h*d)};if(c>-d.w*(a-1))this.shiftColumn(!0,d);else if(c<-d.w*a)this.shiftColumn(!1,d);else if(b>-d.h*(a-1))this.shiftRow(!0,d);else if(b<-d.h*a)this.shiftRow(!1,d);else break}},shiftRow:function(a,b){var c=this.grid,d=a?0:c.length-1,e=a?-1:1;this.gridLayout.startrow+=e*this.rowSign;for(var f=c[d],g=c[a?"pop":"shift"](),h=0,k=g.length;h<k;h++){var l=g[h],m=f[h].position.clone();m.y+=b.h*e;l.moveTo(this.getTileBoundsForGridIndex(d,h),m)}c[a? +"unshift":"push"](g)},shiftColumn:function(a,b){var c=this.grid,d=a?0:c[0].length-1,e=a?-1:1;this.gridLayout.startcol+=e;for(var f=0,g=c.length;f<g;f++){var h=c[f],k=h[d].position.clone(),l=h[a?"pop":"shift"]();k.x+=b.w*e;l.moveTo(this.getTileBoundsForGridIndex(f,d),k);h[a?"unshift":"push"](l)}},removeExcessTiles:function(a,b){for(var c,d;this.grid.length>a;){var e=this.grid.pop();c=0;for(d=e.length;c<d;c++){var f=e[c];this.destroyTile(f)}}c=0;for(d=this.grid.length;c<d;c++)for(;this.grid[c].length> +b;)e=this.grid[c],f=e.pop(),this.destroyTile(f)},onMapResize:function(){this.singleTile&&(this.clearGrid(),this.setTileSize())},getTileBounds:function(a){var b=this.maxExtent,c=this.getResolution(),d=c*this.tileSize.w,c=c*this.tileSize.h,e=this.getLonLatFromViewPortPx(a);a=b.left+d*Math.floor((e.lon-b.left)/d);b=b.bottom+c*Math.floor((e.lat-b.bottom)/c);return new OpenLayers.Bounds(a,b,a+d,b+c)},CLASS_NAME:"OpenLayers.Layer.Grid"});OpenLayers.Layer.XYZ=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:!0,sphericalMercator:!1,zoomOffset:0,serverResolutions:null,initialize:function(a,b,c){if(c&&c.sphericalMercator||this.sphericalMercator)c=OpenLayers.Util.extend({projection:"EPSG:900913",numZoomLevels:19},c);OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a||this.name,b||this.url,{},c])},clone:function(a){null==a&&(a=new OpenLayers.Layer.XYZ(this.name,this.url,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this, +[a])},getURL:function(a){a=this.getXYZ(a);var b=this.url;OpenLayers.Util.isArray(b)&&(b=this.selectUrl(""+a.x+a.y+a.z,b));return OpenLayers.String.format(b,a)},getXYZ:function(a){var b=this.getServerResolution(),c=Math.round((a.left-this.maxExtent.left)/(b*this.tileSize.w));a=Math.round((this.maxExtent.top-a.top)/(b*this.tileSize.h));b=this.getServerZoom();if(this.wrapDateLine)var d=Math.pow(2,b),c=(c%d+d)%d;return{x:c,y:a,z:b}},setMap:function(a){OpenLayers.Layer.Grid.prototype.setMap.apply(this, +arguments);this.tileOrigin||(this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.bottom))},CLASS_NAME:"OpenLayers.Layer.XYZ"});OpenLayers.Renderer.SVG=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"http://www.w3.org/2000/svg",xlinkns:"http://www.w3.org/1999/xlink",MAX_PIXEL:15E3,translationParameters:null,symbolMetrics:null,initialize:function(a){this.supported()&&(OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments),this.translationParameters={x:0,y:0},this.symbolMetrics={})},supported:function(){return document.implementation&&(document.implementation.hasFeature("org.w3c.svg","1.0")||document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#SVG", +"1.1")||document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1"))},inValidRange:function(a,b,c){a+=c?0:this.translationParameters.x;b+=c?0:this.translationParameters.y;return a>=-this.MAX_PIXEL&&a<=this.MAX_PIXEL&&b>=-this.MAX_PIXEL&&b<=this.MAX_PIXEL},setExtent:function(a,b){var c=OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments),d=this.getResolution(),e=-a.left/d,d=a.top/d;if(b)return this.left=e,this.top=d,this.rendererRoot.setAttributeNS(null, +"viewBox","0 0 "+this.size.w+" "+this.size.h),this.translate(this.xOffset,0),!0;(e=this.translate(e-this.left+this.xOffset,d-this.top))||this.setExtent(a,!0);return c&&e},translate:function(a,b){if(this.inValidRange(a,b,!0)){var c="";if(a||b)c="translate("+a+","+b+")";this.root.setAttributeNS(null,"transform",c);this.translationParameters={x:a,y:b};return!0}return!1},setSize:function(a){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);this.rendererRoot.setAttributeNS(null,"width",this.size.w); +this.rendererRoot.setAttributeNS(null,"height",this.size.h)},getNodeType:function(a,b){var c=null;switch(a.CLASS_NAME){case "OpenLayers.Geometry.Point":c=b.externalGraphic?"image":this.isComplexSymbol(b.graphicName)?"svg":"circle";break;case "OpenLayers.Geometry.Rectangle":c="rect";break;case "OpenLayers.Geometry.LineString":c="polyline";break;case "OpenLayers.Geometry.LinearRing":c="polygon";break;case "OpenLayers.Geometry.Polygon":case "OpenLayers.Geometry.Curve":c="path"}return c},setStyle:function(a, +b,c){b=b||a._style;c=c||a._options;var d=b.title||b.graphicTitle;if(d){a.setAttributeNS(null,"title",d);var e=a.getElementsByTagName("title");0<e.length?e[0].firstChild.textContent=d:(e=this.nodeFactory(null,"title"),e.textContent=d,a.appendChild(e))}var e=parseFloat(a.getAttributeNS(null,"r")),d=1,f;if("OpenLayers.Geometry.Point"==a._geometryClass&&e){a.style.visibility="";if(!1===b.graphic)a.style.visibility="hidden";else if(b.externalGraphic){f=this.getPosition(a);b.graphicWidth&&b.graphicHeight&& +a.setAttributeNS(null,"preserveAspectRatio","none");var e=b.graphicWidth||b.graphicHeight,g=b.graphicHeight||b.graphicWidth,e=e?e:2*b.pointRadius,g=g?g:2*b.pointRadius,h=void 0!=b.graphicYOffset?b.graphicYOffset:-(.5*g),k=b.graphicOpacity||b.fillOpacity;a.setAttributeNS(null,"x",(f.x+(void 0!=b.graphicXOffset?b.graphicXOffset:-(.5*e))).toFixed());a.setAttributeNS(null,"y",(f.y+h).toFixed());a.setAttributeNS(null,"width",e);a.setAttributeNS(null,"height",g);a.setAttributeNS(this.xlinkns,"xlink:href", +b.externalGraphic);a.setAttributeNS(null,"style","opacity: "+k);a.onclick=OpenLayers.Event.preventDefault}else if(this.isComplexSymbol(b.graphicName)){var e=3*b.pointRadius,g=2*e,l=this.importSymbol(b.graphicName);f=this.getPosition(a);d=3*this.symbolMetrics[l.id][0]/g;h=a.parentNode;k=a.nextSibling;h&&h.removeChild(a);a.firstChild&&a.removeChild(a.firstChild);a.appendChild(l.firstChild.cloneNode(!0));a.setAttributeNS(null,"viewBox",l.getAttributeNS(null,"viewBox"));a.setAttributeNS(null,"width", +g);a.setAttributeNS(null,"height",g);a.setAttributeNS(null,"x",f.x-e);a.setAttributeNS(null,"y",f.y-e);k?h.insertBefore(a,k):h&&h.appendChild(a)}else a.setAttributeNS(null,"r",b.pointRadius);e=b.rotation;void 0===e&&void 0===a._rotation||!f||(a._rotation=e,e|=0,"svg"!==a.nodeName?a.setAttributeNS(null,"transform","rotate("+e+" "+f.x+" "+f.y+")"):(f=this.symbolMetrics[l.id],a.firstChild.setAttributeNS(null,"transform","rotate("+e+" "+f[1]+" "+f[2]+")")))}c.isFilled?(a.setAttributeNS(null,"fill",b.fillColor), +a.setAttributeNS(null,"fill-opacity",b.fillOpacity)):a.setAttributeNS(null,"fill","none");c.isStroked?(a.setAttributeNS(null,"stroke",b.strokeColor),a.setAttributeNS(null,"stroke-opacity",b.strokeOpacity),a.setAttributeNS(null,"stroke-width",b.strokeWidth*d),a.setAttributeNS(null,"stroke-linecap",b.strokeLinecap||"round"),a.setAttributeNS(null,"stroke-linejoin","round"),b.strokeDashstyle&&a.setAttributeNS(null,"stroke-dasharray",this.dashStyle(b,d))):a.setAttributeNS(null,"stroke","none");b.pointerEvents&& +a.setAttributeNS(null,"pointer-events",b.pointerEvents);null!=b.cursor&&a.setAttributeNS(null,"cursor",b.cursor);return a},dashStyle:function(a,b){var c=a.strokeWidth*b,d=a.strokeDashstyle;switch(d){case "solid":return"none";case "dot":return[1,4*c].join();case "dash":return[4*c,4*c].join();case "dashdot":return[4*c,4*c,1,4*c].join();case "longdash":return[8*c,4*c].join();case "longdashdot":return[8*c,4*c,1,4*c].join();default:return OpenLayers.String.trim(d).replace(/\s+/g,",")}},createNode:function(a, +b){var c=document.createElementNS(this.xmlns,a);b&&c.setAttributeNS(null,"id",b);return c},nodeTypeCompare:function(a,b){return b==a.nodeName},createRenderRoot:function(){var a=this.nodeFactory(this.container.id+"_svgRoot","svg");a.style.display="block";return a},createRoot:function(a){return this.nodeFactory(this.container.id+a,"g")},createDefs:function(){var a=this.nodeFactory(this.container.id+"_defs","defs");this.rendererRoot.appendChild(a);return a},drawPoint:function(a,b){return this.drawCircle(a, +b,1)},drawCircle:function(a,b,c){var d=this.getResolution(),e=(b.x-this.featureDx)/d+this.left;b=this.top-b.y/d;return this.inValidRange(e,b)?(a.setAttributeNS(null,"cx",e),a.setAttributeNS(null,"cy",b),a.setAttributeNS(null,"r",c),a):!1},drawLineString:function(a,b){var c=this.getComponentsString(b.components);return c.path?(a.setAttributeNS(null,"points",c.path),c.complete?a:null):!1},drawLinearRing:function(a,b){var c=this.getComponentsString(b.components);return c.path?(a.setAttributeNS(null, +"points",c.path),c.complete?a:null):!1},drawPolygon:function(a,b){for(var c="",d=!0,e=!0,f,g,h=0,k=b.components.length;h<k;h++)c+=" M",f=this.getComponentsString(b.components[h].components," "),(g=f.path)?(c+=" "+g,e=f.complete&&e):d=!1;return d?(a.setAttributeNS(null,"d",c+" z"),a.setAttributeNS(null,"fill-rule","evenodd"),e?a:null):!1},drawRectangle:function(a,b){var c=this.getResolution(),d=(b.x-this.featureDx)/c+this.left,e=this.top-b.y/c;return this.inValidRange(d,e)?(a.setAttributeNS(null,"x", +d),a.setAttributeNS(null,"y",e),a.setAttributeNS(null,"width",b.width/c),a.setAttributeNS(null,"height",b.height/c),a):!1},drawText:function(a,b,c){var d=!!b.labelOutlineWidth;if(d){var e=OpenLayers.Util.extend({},b);e.fontColor=e.labelOutlineColor;e.fontStrokeColor=e.labelOutlineColor;e.fontStrokeWidth=b.labelOutlineWidth;b.labelOutlineOpacity&&(e.fontOpacity=b.labelOutlineOpacity);delete e.labelOutlineWidth;this.drawText(a,e,c)}var f=this.getResolution(),e=(c.x-this.featureDx)/f+this.left,g=c.y/ +f-this.top,d=d?this.LABEL_OUTLINE_SUFFIX:this.LABEL_ID_SUFFIX,f=this.nodeFactory(a+d,"text");f.setAttributeNS(null,"x",e);f.setAttributeNS(null,"y",-g);b.fontColor&&f.setAttributeNS(null,"fill",b.fontColor);b.fontStrokeColor&&f.setAttributeNS(null,"stroke",b.fontStrokeColor);b.fontStrokeWidth&&f.setAttributeNS(null,"stroke-width",b.fontStrokeWidth);b.fontOpacity&&f.setAttributeNS(null,"opacity",b.fontOpacity);b.fontFamily&&f.setAttributeNS(null,"font-family",b.fontFamily);b.fontSize&&f.setAttributeNS(null, +"font-size",b.fontSize);b.fontWeight&&f.setAttributeNS(null,"font-weight",b.fontWeight);b.fontStyle&&f.setAttributeNS(null,"font-style",b.fontStyle);!0===b.labelSelect?(f.setAttributeNS(null,"pointer-events","visible"),f._featureId=a):f.setAttributeNS(null,"pointer-events","none");g=b.labelAlign||OpenLayers.Renderer.defaultSymbolizer.labelAlign;f.setAttributeNS(null,"text-anchor",OpenLayers.Renderer.SVG.LABEL_ALIGN[g[0]]||"middle");!0===OpenLayers.IS_GECKO&&f.setAttributeNS(null,"dominant-baseline", +OpenLayers.Renderer.SVG.LABEL_ALIGN[g[1]]||"central");for(var h=b.label.split("\n"),k=h.length;f.childNodes.length>k;)f.removeChild(f.lastChild);for(var l=0;l<k;l++){var m=this.nodeFactory(a+d+"_tspan_"+l,"tspan");!0===b.labelSelect&&(m._featureId=a,m._geometry=c,m._geometryClass=c.CLASS_NAME);!1===OpenLayers.IS_GECKO&&m.setAttributeNS(null,"baseline-shift",OpenLayers.Renderer.SVG.LABEL_VSHIFT[g[1]]||"-35%");m.setAttribute("x",e);if(0==l){var q=OpenLayers.Renderer.SVG.LABEL_VFACTOR[g[1]];null==q&& +(q=-.5);m.setAttribute("dy",q*(k-1)+"em")}else m.setAttribute("dy","1em");m.textContent=""===h[l]?" ":h[l];m.parentNode||f.appendChild(m)}f.parentNode||this.textRoot.appendChild(f)},getComponentsString:function(a,b){for(var c=[],d=!0,e=a.length,f=[],g,h=0;h<e;h++)g=a[h],c.push(g),(g=this.getShortString(g))?f.push(g):(0<h&&this.getShortString(a[h-1])&&f.push(this.clipLine(a[h],a[h-1])),h<e-1&&this.getShortString(a[h+1])&&f.push(this.clipLine(a[h],a[h+1])),d=!1);return{path:f.join(b||","),complete:d}}, +clipLine:function(a,b){if(b.equals(a))return"";var c=this.getResolution(),d=this.MAX_PIXEL-this.translationParameters.x,e=this.MAX_PIXEL-this.translationParameters.y,f=(b.x-this.featureDx)/c+this.left,g=this.top-b.y/c,h=(a.x-this.featureDx)/c+this.left,c=this.top-a.y/c,k;if(h<-d||h>d)k=(c-g)/(h-f),h=0>h?-d:d,c=g+(h-f)*k;if(c<-e||c>e)k=(h-f)/(c-g),c=0>c?-e:e,h=f+(c-g)*k;return h+","+c},getShortString:function(a){var b=this.getResolution(),c=(a.x-this.featureDx)/b+this.left;a=this.top-a.y/b;return this.inValidRange(c, +a)?c+","+a:!1},getPosition:function(a){return{x:parseFloat(a.getAttributeNS(null,"cx")),y:parseFloat(a.getAttributeNS(null,"cy"))}},importSymbol:function(a){this.defs||(this.defs=this.createDefs());var b=this.container.id+"-"+a,c=document.getElementById(b);if(null!=c)return c;var d=OpenLayers.Renderer.symbol[a];if(!d)throw Error(a+" is not a valid symbol name");a=this.nodeFactory(b,"symbol");var e=this.nodeFactory(null,"polygon");a.appendChild(e);for(var c=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE, +0,0),f=[],g,h,k=0;k<d.length;k+=2)g=d[k],h=d[k+1],c.left=Math.min(c.left,g),c.bottom=Math.min(c.bottom,h),c.right=Math.max(c.right,g),c.top=Math.max(c.top,h),f.push(g,",",h);e.setAttributeNS(null,"points",f.join(" "));d=c.getWidth();e=c.getHeight();a.setAttributeNS(null,"viewBox",[c.left-d,c.bottom-e,3*d,3*e].join(" "));this.symbolMetrics[b]=[Math.max(d,e),c.getCenterLonLat().lon,c.getCenterLonLat().lat];this.defs.appendChild(a);return a},getFeatureIdFromEvent:function(a){var b=OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this, +arguments);b||(b=a.target,b=b.parentNode&&b!=this.rendererRoot?b.parentNode._featureId:void 0);return b},CLASS_NAME:"OpenLayers.Renderer.SVG"});OpenLayers.Renderer.SVG.LABEL_ALIGN={l:"start",r:"end",b:"bottom",t:"hanging"};OpenLayers.Renderer.SVG.LABEL_VSHIFT={t:"-70%",b:"0"};OpenLayers.Renderer.SVG.LABEL_VFACTOR={t:0,b:-1};OpenLayers.Renderer.SVG.preventDefault=function(a){OpenLayers.Event.preventDefault(a)};OpenLayers.Control.PanZoom=OpenLayers.Class(OpenLayers.Control,{slideFactor:50,slideRatio:null,buttons:null,position:null,initialize:function(a){this.position=new OpenLayers.Pixel(OpenLayers.Control.PanZoom.X,OpenLayers.Control.PanZoom.Y);OpenLayers.Control.prototype.initialize.apply(this,arguments)},destroy:function(){this.map&&this.map.events.unregister("buttonclick",this,this.onButtonClick);this.removeButtons();this.position=this.buttons=null;OpenLayers.Control.prototype.destroy.apply(this,arguments)}, +setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.register("buttonclick",this,this.onButtonClick)},draw:function(a){OpenLayers.Control.prototype.draw.apply(this,arguments);a=this.position;this.buttons=[];var b={w:18,h:18},c=new OpenLayers.Pixel(a.x+b.w/2,a.y);this._addButton("panup","north-mini.png",c,b);a.y=c.y+b.h;this._addButton("panleft","west-mini.png",a,b);this._addButton("panright","east-mini.png",a.add(b.w,0),b);this._addButton("pandown","south-mini.png", +c.add(0,2*b.h),b);this._addButton("zoomin","zoom-plus-mini.png",c.add(0,3*b.h+5),b);this._addButton("zoomworld","zoom-world-mini.png",c.add(0,4*b.h+5),b);this._addButton("zoomout","zoom-minus-mini.png",c.add(0,5*b.h+5),b);return this.div},_addButton:function(a,b,c,d){b=OpenLayers.Util.getImageLocation(b);c=OpenLayers.Util.createAlphaImageDiv(this.id+"_"+a,c,d,b,"absolute");c.style.cursor="pointer";this.div.appendChild(c);c.action=a;c.className="olButton";this.buttons.push(c);return c},_removeButton:function(a){this.div.removeChild(a); +OpenLayers.Util.removeItem(this.buttons,a)},removeButtons:function(){for(var a=this.buttons.length-1;0<=a;--a)this._removeButton(this.buttons[a])},onButtonClick:function(a){switch(a.buttonElement.action){case "panup":this.map.pan(0,-this.getSlideFactor("h"));break;case "pandown":this.map.pan(0,this.getSlideFactor("h"));break;case "panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case "panright":this.map.pan(this.getSlideFactor("w"),0);break;case "zoomin":this.map.zoomIn();break;case "zoomout":this.map.zoomOut(); +break;case "zoomworld":this.map.zoomToMaxExtent()}},getSlideFactor:function(a){return this.slideRatio?this.map.getSize()[a]*this.slideRatio:this.slideFactor},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Popup=OpenLayers.Class({events:null,id:"",lonlat:null,div:null,contentSize:null,size:null,contentHTML:null,backgroundColor:"",opacity:"",border:"",contentDiv:null,groupDiv:null,closeDiv:null,autoSize:!1,minSize:null,maxSize:null,displayClass:"olPopup",contentDisplayClass:"olPopupContent",padding:0,disableFirefoxOverflowHack:!1,fixPadding:function(){"number"==typeof this.padding&&(this.padding=new OpenLayers.Bounds(this.padding,this.padding,this.padding,this.padding))},panMapIfOutOfView:!1, +keepInMap:!1,closeOnMove:!1,map:null,initialize:function(a,b,c,d,e,f){null==a&&(a=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_"));this.id=a;this.lonlat=b;this.contentSize=null!=c?c:new OpenLayers.Size(OpenLayers.Popup.WIDTH,OpenLayers.Popup.HEIGHT);null!=d&&(this.contentHTML=d);this.backgroundColor=OpenLayers.Popup.COLOR;this.opacity=OpenLayers.Popup.OPACITY;this.border=OpenLayers.Popup.BORDER;this.div=OpenLayers.Util.createDiv(this.id,null,null,null,null,null,"hidden");this.div.className=this.displayClass; +this.groupDiv=OpenLayers.Util.createDiv(this.id+"_GroupDiv",null,null,null,"relative",null,"hidden");a=this.div.id+"_contentDiv";this.contentDiv=OpenLayers.Util.createDiv(a,null,this.contentSize.clone(),null,"relative");this.contentDiv.className=this.contentDisplayClass;this.groupDiv.appendChild(this.contentDiv);this.div.appendChild(this.groupDiv);e&&this.addCloseBox(f);this.registerEvents()},destroy:function(){this.border=this.opacity=this.backgroundColor=this.contentHTML=this.size=this.lonlat=this.id= +null;this.closeOnMove&&this.map&&this.map.events.unregister("movestart",this,this.hide);this.events.destroy();this.events=null;this.closeDiv&&(OpenLayers.Event.stopObservingElement(this.closeDiv),this.groupDiv.removeChild(this.closeDiv));this.closeDiv=null;this.div.removeChild(this.groupDiv);this.groupDiv=null;null!=this.map&&this.map.removePopup(this);this.panMapIfOutOfView=this.padding=this.maxSize=this.minSize=this.autoSize=this.div=this.map=null},draw:function(a){null==a&&null!=this.lonlat&&null!= +this.map&&(a=this.map.getLayerPxFromLonLat(this.lonlat));this.closeOnMove&&this.map.events.register("movestart",this,this.hide);this.disableFirefoxOverflowHack||"firefox"!=OpenLayers.BROWSER_NAME||(this.map.events.register("movestart",this,function(){var a=document.defaultView.getComputedStyle(this.contentDiv,null).getPropertyValue("overflow");"hidden"!=a&&(this.contentDiv._oldOverflow=a,this.contentDiv.style.overflow="hidden")}),this.map.events.register("moveend",this,function(){var a=this.contentDiv._oldOverflow; +a&&(this.contentDiv.style.overflow=a,this.contentDiv._oldOverflow=null)}));this.moveTo(a);this.autoSize||this.size||this.setSize(this.contentSize);this.setBackgroundColor();this.setOpacity();this.setBorder();this.setContentHTML();this.panMapIfOutOfView&&this.panIntoView();return this.div},updatePosition:function(){if(this.lonlat&&this.map){var a=this.map.getLayerPxFromLonLat(this.lonlat);a&&this.moveTo(a)}},moveTo:function(a){null!=a&&null!=this.div&&(this.div.style.left=a.x+"px",this.div.style.top= +a.y+"px")},visible:function(){return OpenLayers.Element.visible(this.div)},toggle:function(){this.visible()?this.hide():this.show()},show:function(){this.div.style.display="";this.panMapIfOutOfView&&this.panIntoView()},hide:function(){this.div.style.display="none"},setSize:function(a){this.size=a.clone();var b=this.getContentDivPadding(),c=b.left+b.right,d=b.top+b.bottom;this.fixPadding();c+=this.padding.left+this.padding.right;d+=this.padding.top+this.padding.bottom;if(this.closeDiv)var e=parseInt(this.closeDiv.style.width), +c=c+(e+b.right);this.size.w+=c;this.size.h+=d;"msie"==OpenLayers.BROWSER_NAME&&(this.contentSize.w+=b.left+b.right,this.contentSize.h+=b.bottom+b.top);null!=this.div&&(this.div.style.width=this.size.w+"px",this.div.style.height=this.size.h+"px");null!=this.contentDiv&&(this.contentDiv.style.width=a.w+"px",this.contentDiv.style.height=a.h+"px")},updateSize:function(){var a="<div class='"+this.contentDisplayClass+"'>"+this.contentDiv.innerHTML+"</div>",b=this.map?this.map.div:document.body,c=OpenLayers.Util.getRenderedDimensions(a, +null,{displayClass:this.displayClass,containerElement:b}),d=this.getSafeContentSize(c),e=null;d.equals(c)?e=c:(c={w:d.w<c.w?d.w:null,h:d.h<c.h?d.h:null},c.w&&c.h?e=d:(a=OpenLayers.Util.getRenderedDimensions(a,c,{displayClass:this.contentDisplayClass,containerElement:b}),"hidden"!=OpenLayers.Element.getStyle(this.contentDiv,"overflow")&&a.equals(d)&&(d=OpenLayers.Util.getScrollbarWidth(),c.w?a.h+=d:a.w+=d),e=this.getSafeContentSize(a)));this.setSize(e)},setBackgroundColor:function(a){void 0!=a&&(this.backgroundColor= +a);null!=this.div&&(this.div.style.backgroundColor=this.backgroundColor)},setOpacity:function(a){void 0!=a&&(this.opacity=a);null!=this.div&&(this.div.style.opacity=this.opacity,this.div.style.filter="alpha(opacity="+100*this.opacity+")")},setBorder:function(a){void 0!=a&&(this.border=a);null!=this.div&&(this.div.style.border=this.border)},setContentHTML:function(a){null!=a&&(this.contentHTML=a);null!=this.contentDiv&&null!=this.contentHTML&&this.contentHTML!=this.contentDiv.innerHTML&&(this.contentDiv.innerHTML= +this.contentHTML,this.autoSize&&(this.registerImageListeners(),this.updateSize()))},registerImageListeners:function(){for(var a=function(){null!==this.popup.id&&(this.popup.updateSize(),this.popup.visible()&&this.popup.panMapIfOutOfView&&this.popup.panIntoView(),OpenLayers.Event.stopObserving(this.img,"load",this.img._onImgLoad))},b=this.contentDiv.getElementsByTagName("img"),c=0,d=b.length;c<d;c++){var e=b[c];if(0==e.width||0==e.height)e._onImgLoad=OpenLayers.Function.bind(a,{popup:this,img:e}), +OpenLayers.Event.observe(e,"load",e._onImgLoad)}},getSafeContentSize:function(a){a=a.clone();var b=this.getContentDivPadding(),c=b.left+b.right,d=b.top+b.bottom;this.fixPadding();c+=this.padding.left+this.padding.right;d+=this.padding.top+this.padding.bottom;if(this.closeDiv)var e=parseInt(this.closeDiv.style.width),c=c+(e+b.right);this.minSize&&(a.w=Math.max(a.w,this.minSize.w-c),a.h=Math.max(a.h,this.minSize.h-d));this.maxSize&&(a.w=Math.min(a.w,this.maxSize.w-c),a.h=Math.min(a.h,this.maxSize.h- +d));if(this.map&&this.map.size){e=b=0;if(this.keepInMap&&!this.panMapIfOutOfView)switch(e=this.map.getPixelFromLonLat(this.lonlat),this.relativePosition){case "tr":b=e.x;e=this.map.size.h-e.y;break;case "tl":b=this.map.size.w-e.x;e=this.map.size.h-e.y;break;case "bl":b=this.map.size.w-e.x;e=e.y;break;case "br":b=e.x;e=e.y;break;default:b=e.x,e=this.map.size.h-e.y}d=this.map.size.h-this.map.paddingForPopups.top-this.map.paddingForPopups.bottom-d-e;a.w=Math.min(a.w,this.map.size.w-this.map.paddingForPopups.left- +this.map.paddingForPopups.right-c-b);a.h=Math.min(a.h,d)}return a},getContentDivPadding:function(){var a=this._contentDivPadding;a||(null==this.div.parentNode&&(this.div.style.display="none",document.body.appendChild(this.div)),this._contentDivPadding=a=new OpenLayers.Bounds(OpenLayers.Element.getStyle(this.contentDiv,"padding-left"),OpenLayers.Element.getStyle(this.contentDiv,"padding-bottom"),OpenLayers.Element.getStyle(this.contentDiv,"padding-right"),OpenLayers.Element.getStyle(this.contentDiv, +"padding-top")),this.div.parentNode==document.body&&(document.body.removeChild(this.div),this.div.style.display=""));return a},addCloseBox:function(a){this.closeDiv=OpenLayers.Util.createDiv(this.id+"_close",null,{w:17,h:17});this.closeDiv.className="olPopupCloseBox";var b=this.getContentDivPadding();this.closeDiv.style.right=b.right+"px";this.closeDiv.style.top=b.top+"px";this.groupDiv.appendChild(this.closeDiv);a=a||function(a){this.hide();OpenLayers.Event.stop(a)};OpenLayers.Event.observe(this.closeDiv, +"touchend",OpenLayers.Function.bindAsEventListener(a,this));OpenLayers.Event.observe(this.closeDiv,"click",OpenLayers.Function.bindAsEventListener(a,this))},panIntoView:function(){var a=this.map.getSize(),b=this.map.getViewPortPxFromLayerPx(new OpenLayers.Pixel(parseInt(this.div.style.left),parseInt(this.div.style.top))),c=b.clone();b.x<this.map.paddingForPopups.left?c.x=this.map.paddingForPopups.left:b.x+this.size.w>a.w-this.map.paddingForPopups.right&&(c.x=a.w-this.map.paddingForPopups.right-this.size.w); +b.y<this.map.paddingForPopups.top?c.y=this.map.paddingForPopups.top:b.y+this.size.h>a.h-this.map.paddingForPopups.bottom&&(c.y=a.h-this.map.paddingForPopups.bottom-this.size.h);this.map.pan(b.x-c.x,b.y-c.y)},registerEvents:function(){this.events=new OpenLayers.Events(this,this.div,null,!0);this.events.on({mousedown:this.onmousedown,mousemove:this.onmousemove,mouseup:this.onmouseup,click:this.onclick,mouseout:this.onmouseout,dblclick:this.ondblclick,touchstart:function(a){OpenLayers.Event.stop(a,!0)}, +scope:this})},onmousedown:function(a){this.mousedown=!0;OpenLayers.Event.stop(a,!0)},onmousemove:function(a){this.mousedown&&OpenLayers.Event.stop(a,!0)},onmouseup:function(a){this.mousedown&&(this.mousedown=!1,OpenLayers.Event.stop(a,!0))},onclick:function(a){OpenLayers.Event.stop(a,!0)},onmouseout:function(a){this.mousedown=!1},ondblclick:function(a){OpenLayers.Event.stop(a,!0)},CLASS_NAME:"OpenLayers.Popup"});OpenLayers.Popup.WIDTH=200;OpenLayers.Popup.HEIGHT=200;OpenLayers.Popup.COLOR="white"; +OpenLayers.Popup.OPACITY=1;OpenLayers.Popup.BORDER="0px";OpenLayers.Popup.Anchored=OpenLayers.Class(OpenLayers.Popup,{relativePosition:null,keepInMap:!0,anchor:null,initialize:function(a,b,c,d,e,f,g){OpenLayers.Popup.prototype.initialize.apply(this,[a,b,c,d,f,g]);this.anchor=null!=e?e:{size:new OpenLayers.Size(0,0),offset:new OpenLayers.Pixel(0,0)}},destroy:function(){this.relativePosition=this.anchor=null;OpenLayers.Popup.prototype.destroy.apply(this,arguments)},show:function(){this.updatePosition();OpenLayers.Popup.prototype.show.apply(this,arguments)}, +moveTo:function(a){var b=this.relativePosition;this.relativePosition=this.calculateRelativePosition(a);OpenLayers.Popup.prototype.moveTo.call(this,this.calculateNewPx(a));this.relativePosition!=b&&this.updateRelativePosition()},setSize:function(a){OpenLayers.Popup.prototype.setSize.apply(this,arguments);if(this.lonlat&&this.map){var b=this.map.getLayerPxFromLonLat(this.lonlat);this.moveTo(b)}},calculateRelativePosition:function(a){a=this.map.getLonLatFromLayerPx(a);a=this.map.getExtent().determineQuadrant(a); +return OpenLayers.Bounds.oppositeQuadrant(a)},updateRelativePosition:function(){},calculateNewPx:function(a){a=a.offset(this.anchor.offset);var b=this.size||this.contentSize,c="t"==this.relativePosition.charAt(0);a.y+=c?-b.h:this.anchor.size.h;c="l"==this.relativePosition.charAt(1);a.x+=c?-b.w:this.anchor.size.w;return a},CLASS_NAME:"OpenLayers.Popup.Anchored"});OpenLayers.Popup.Framed=OpenLayers.Class(OpenLayers.Popup.Anchored,{imageSrc:null,imageSize:null,isAlphaImage:!1,positionBlocks:null,blocks:null,fixedRelativePosition:!1,initialize:function(a,b,c,d,e,f,g){OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments);this.fixedRelativePosition&&(this.updateRelativePosition(),this.calculateRelativePosition=function(a){return this.relativePosition});this.contentDiv.style.position="absolute";this.contentDiv.style.zIndex=1;f&&(this.closeDiv.style.zIndex= +1);this.groupDiv.style.position="absolute";this.groupDiv.style.top="0px";this.groupDiv.style.left="0px";this.groupDiv.style.height="100%";this.groupDiv.style.width="100%"},destroy:function(){this.isAlphaImage=this.imageSize=this.imageSrc=null;this.fixedRelativePosition=!1;this.positionBlocks=null;for(var a=0;a<this.blocks.length;a++){var b=this.blocks[a];b.image&&b.div.removeChild(b.image);b.image=null;b.div&&this.groupDiv.removeChild(b.div);b.div=null}this.blocks=null;OpenLayers.Popup.Anchored.prototype.destroy.apply(this, +arguments)},setBackgroundColor:function(a){},setBorder:function(){},setOpacity:function(a){},setSize:function(a){OpenLayers.Popup.Anchored.prototype.setSize.apply(this,arguments);this.updateBlocks()},updateRelativePosition:function(){this.padding=this.positionBlocks[this.relativePosition].padding;if(this.closeDiv){var a=this.getContentDivPadding();this.closeDiv.style.right=a.right+this.padding.right+"px";this.closeDiv.style.top=a.top+this.padding.top+"px"}this.updateBlocks()},calculateNewPx:function(a){var b= +OpenLayers.Popup.Anchored.prototype.calculateNewPx.apply(this,arguments);return b=b.offset(this.positionBlocks[this.relativePosition].offset)},createBlocks:function(){this.blocks=[];var a=null,b;for(b in this.positionBlocks){a=b;break}a=this.positionBlocks[a];for(b=0;b<a.blocks.length;b++){var c={};this.blocks.push(c);c.div=OpenLayers.Util.createDiv(this.id+"_FrameDecorationDiv_"+b,null,null,null,"absolute",null,"hidden",null);c.image=(this.isAlphaImage?OpenLayers.Util.createAlphaImageDiv:OpenLayers.Util.createImage)(this.id+ +"_FrameDecorationImg_"+b,null,this.imageSize,this.imageSrc,"absolute",null,null,null);c.div.appendChild(c.image);this.groupDiv.appendChild(c.div)}},updateBlocks:function(){this.blocks||this.createBlocks();if(this.size&&this.relativePosition){for(var a=this.positionBlocks[this.relativePosition],b=0;b<a.blocks.length;b++){var c=a.blocks[b],d=this.blocks[b],e=c.anchor.left,f=c.anchor.bottom,g=c.anchor.right,h=c.anchor.top,k=isNaN(c.size.w)?this.size.w-(g+e):c.size.w,l=isNaN(c.size.h)?this.size.h-(f+ +h):c.size.h;d.div.style.width=(0>k?0:k)+"px";d.div.style.height=(0>l?0:l)+"px";d.div.style.left=null!=e?e+"px":"";d.div.style.bottom=null!=f?f+"px":"";d.div.style.right=null!=g?g+"px":"";d.div.style.top=null!=h?h+"px":"";d.image.style.left=c.position.x+"px";d.image.style.top=c.position.y+"px"}this.contentDiv.style.left=this.padding.left+"px";this.contentDiv.style.top=this.padding.top+"px"}},CLASS_NAME:"OpenLayers.Popup.Framed"});OpenLayers.Strategy.BBOX=OpenLayers.Class(OpenLayers.Strategy,{bounds:null,resolution:null,ratio:2,resFactor:null,response:null,activate:function(){var a=OpenLayers.Strategy.prototype.activate.call(this);a&&(this.layer.events.on({moveend:this.update,refresh:this.update,visibilitychanged:this.update,scope:this}),this.update());return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&this.layer.events.un({moveend:this.update,refresh:this.update,visibilitychanged:this.update, +scope:this});return a},update:function(a){var b=this.getMapBounds();null!==b&&(a&&a.force||this.layer.visibility&&this.layer.calculateInRange()&&this.invalidBounds(b))&&(this.calculateBounds(b),this.resolution=this.layer.map.getResolution(),this.triggerRead(a))},getMapBounds:function(){if(null===this.layer.map)return null;var a=this.layer.map.getExtent();a&&!this.layer.projection.equals(this.layer.map.getProjectionObject())&&(a=a.clone().transform(this.layer.map.getProjectionObject(),this.layer.projection)); +return a},invalidBounds:function(a){a||(a=this.getMapBounds());a=!this.bounds||!this.bounds.containsBounds(a);!a&&this.resFactor&&(a=this.resolution/this.layer.map.getResolution(),a=a>=this.resFactor||a<=1/this.resFactor);return a},calculateBounds:function(a){a||(a=this.getMapBounds());var b=a.getCenterLonLat(),c=a.getWidth()*this.ratio;a=a.getHeight()*this.ratio;this.bounds=new OpenLayers.Bounds(b.lon-c/2,b.lat-a/2,b.lon+c/2,b.lat+a/2)},triggerRead:function(a){!this.response||a&&!0===a.noAbort|| +(this.layer.protocol.abort(this.response),this.layer.events.triggerEvent("loadend"));var b={filter:this.createFilter()};this.layer.events.triggerEvent("loadstart",b);this.response=this.layer.protocol.read(OpenLayers.Util.applyDefaults({filter:b.filter,callback:this.merge,scope:this},a))},createFilter:function(){var a=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,value:this.bounds,projection:this.layer.projection});this.layer.filter&&(a=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND, +filters:[this.layer.filter,a]}));return a},merge:function(a){this.layer.destroyFeatures();if(a.success()){var b=a.features;if(b&&0<b.length){var c=this.layer.projection,d=this.layer.map.getProjectionObject();if(!d.equals(c))for(var e,f=0,g=b.length;f<g;++f)(e=b[f].geometry)&&e.transform(c,d);this.layer.addFeatures(b)}}else this.bounds=null;this.response=null;this.layer.events.triggerEvent("loadend",{response:a})},CLASS_NAME:"OpenLayers.Strategy.BBOX"});OpenLayers.Popup.FramedCloud=OpenLayers.Class(OpenLayers.Popup.Framed,{contentDisplayClass:"olFramedCloudPopupContent",autoSize:!0,panMapIfOutOfView:!0,imageSize:new OpenLayers.Size(1276,736),isAlphaImage:!1,fixedRelativePosition:!1,positionBlocks:{tl:{offset:new OpenLayers.Pixel(44,0),padding:new OpenLayers.Bounds(8,40,8,9),blocks:[{size:new OpenLayers.Size("auto","auto"),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null, +50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size("auto",19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,18),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-632)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(0,-688)}]},tr:{offset:new OpenLayers.Pixel(-45,0),padding:new OpenLayers.Bounds(8,40,8,9),blocks:[{size:new OpenLayers.Size("auto", +"auto"),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size("auto",19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,19),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-631)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(0, +0,null,null),position:new OpenLayers.Pixel(-215,-687)}]},bl:{offset:new OpenLayers.Pixel(45,0),padding:new OpenLayers.Bounds(8,9,8,40),blocks:[{size:new OpenLayers.Size("auto","auto"),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size("auto",21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22, +21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(null,null,0,0),position:new OpenLayers.Pixel(-101,-674)}]},br:{offset:new OpenLayers.Pixel(-44,0),padding:new OpenLayers.Bounds(8,9,8,40),blocks:[{size:new OpenLayers.Size("auto","auto"),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238, +0)},{size:new OpenLayers.Size("auto",21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(0,null,null,0),position:new OpenLayers.Pixel(-311,-674)}]}},minSize:new OpenLayers.Size(105,10),maxSize:new OpenLayers.Size(1200,660),initialize:function(a,b,c,d,e,f,g){this.imageSrc=OpenLayers.Util.getImageLocation("cloud-popup-relative.png"); +OpenLayers.Popup.Framed.prototype.initialize.apply(this,arguments);this.contentDiv.className=this.contentDisplayClass},CLASS_NAME:"OpenLayers.Popup.FramedCloud"});OpenLayers.Rule=OpenLayers.Class({id:null,name:null,title:null,description:null,context:null,filter:null,elseFilter:!1,symbolizer:null,symbolizers:null,minScaleDenominator:null,maxScaleDenominator:null,initialize:function(a){this.symbolizer={};OpenLayers.Util.extend(this,a);this.symbolizers&&delete this.symbolizer;this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){for(var a in this.symbolizer)this.symbolizer[a]=null;this.symbolizer=null;delete this.symbolizers},evaluate:function(a){var b= +this.getContext(a),c=!0;if(this.minScaleDenominator||this.maxScaleDenominator)var d=a.layer.map.getScale();this.minScaleDenominator&&(c=d>=OpenLayers.Style.createLiteral(this.minScaleDenominator,b));c&&this.maxScaleDenominator&&(c=d<OpenLayers.Style.createLiteral(this.maxScaleDenominator,b));c&&this.filter&&(c="OpenLayers.Filter.FeatureId"==this.filter.CLASS_NAME?this.filter.evaluate(a):this.filter.evaluate(b));return c},getContext:function(a){var b=this.context;b||(b=a.attributes||a.data);"function"== +typeof this.context&&(b=this.context(a));return b},clone:function(){var a=OpenLayers.Util.extend({},this);if(this.symbolizers){var b=this.symbolizers.length;a.symbolizers=Array(b);for(var c=0;c<b;++c)a.symbolizers[c]=this.symbolizers[c].clone()}else{a.symbolizer={};for(var d in this.symbolizer)b=this.symbolizer[d],c=typeof b,"object"===c?a.symbolizer[d]=OpenLayers.Util.extend({},b):"string"===c&&(a.symbolizer[d]=b)}a.filter=this.filter&&this.filter.clone();a.context=this.context&&OpenLayers.Util.extend({}, +this.context);return new OpenLayers.Rule(a)},CLASS_NAME:"OpenLayers.Rule"});OpenLayers.Handler.Pinch=OpenLayers.Class(OpenLayers.Handler,{started:!1,stopDown:!1,pinching:!1,last:null,start:null,touchstart:function(a){var b=!0;this.pinching=!1;if(OpenLayers.Event.isMultiTouch(a))this.started=!0,this.last=this.start={distance:this.getDistance(a.touches),delta:0,scale:1},this.callback("start",[a,this.start]),b=!this.stopDown;else{if(this.started)return!1;this.started=!1;this.last=this.start=null}OpenLayers.Event.preventDefault(a);return b},touchmove:function(a){if(this.started&& +OpenLayers.Event.isMultiTouch(a)){this.pinching=!0;var b=this.getPinchData(a);this.callback("move",[a,b]);this.last=b;OpenLayers.Event.stop(a)}else if(this.started)return!1;return!0},touchend:function(a){return this.started&&!OpenLayers.Event.isMultiTouch(a)?(this.pinching=this.started=!1,this.callback("done",[a,this.start,this.last]),this.last=this.start=null,!1):!0},activate:function(){var a=!1;OpenLayers.Handler.prototype.activate.apply(this,arguments)&&(this.pinching=!1,a=!0);return a},deactivate:function(){var a= +!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.pinching=this.started=!1,this.last=this.start=null,a=!0);return a},getDistance:function(a){var b=a[0];a=a[1];return Math.sqrt(Math.pow(b.olClientX-a.olClientX,2)+Math.pow(b.olClientY-a.olClientY,2))},getPinchData:function(a){a=this.getDistance(a.touches);return{distance:a,delta:this.last.distance-a,scale:a/this.start.distance}},CLASS_NAME:"OpenLayers.Handler.Pinch"});OpenLayers.Layer.OSM=OpenLayers.Class(OpenLayers.Layer.XYZ,{name:"OpenStreetMap",url:["http://a.tile.openstreetmap.org/${z}/${x}/${y}.png","http://b.tile.openstreetmap.org/${z}/${x}/${y}.png","http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"],attribution:"© <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors",sphericalMercator:!0,wrapDateLine:!0,tileOptions:null,initialize:function(a,b,c){OpenLayers.Layer.XYZ.prototype.initialize.apply(this,arguments);this.tileOptions= +OpenLayers.Util.extend({crossOriginKeyword:"anonymous"},this.options&&this.options.tileOptions)},clone:function(a){null==a&&(a=new OpenLayers.Layer.OSM(this.name,this.url,this.getOptions()));return a=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[a])},CLASS_NAME:"OpenLayers.Layer.OSM"});OpenLayers.Format.QueryStringFilter=function(){function a(a){a=a.replace(/%/g,"\\%");a=a.replace(/\\\\\.(\*)?/g,function(a,b){return b?a:"\\\\_"});a=a.replace(/\\\\\.\*/g,"\\\\%");a=a.replace(/(\\)?\.(\*)?/g,function(a,b,c){return b||c?a:"_"});a=a.replace(/(\\)?\.\*/g,function(a,b){return b?a:"%"});a=a.replace(/\\\./g,".");return a=a.replace(/(\\)?\\\*/g,function(a,b){return b?a:"*"})}var b={};b[OpenLayers.Filter.Comparison.EQUAL_TO]="eq";b[OpenLayers.Filter.Comparison.NOT_EQUAL_TO]="ne";b[OpenLayers.Filter.Comparison.LESS_THAN]= +"lt";b[OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO]="lte";b[OpenLayers.Filter.Comparison.GREATER_THAN]="gt";b[OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO]="gte";b[OpenLayers.Filter.Comparison.LIKE]="ilike";return OpenLayers.Class(OpenLayers.Format,{wildcarded:!1,srsInBBOX:!1,write:function(c,d){d=d||{};var e=c.CLASS_NAME,e=e.substring(e.lastIndexOf(".")+1);switch(e){case "Spatial":switch(c.type){case OpenLayers.Filter.Spatial.BBOX:d.bbox=c.value.toArray();this.srsInBBOX&&c.projection&& +d.bbox.push(c.projection.getCode());break;case OpenLayers.Filter.Spatial.DWITHIN:d.tolerance=c.distance;case OpenLayers.Filter.Spatial.WITHIN:d.lon=c.value.x;d.lat=c.value.y;break;default:OpenLayers.Console.warn("Unknown spatial filter type "+c.type)}break;case "Comparison":e=b[c.type];if(void 0!==e){var f=c.value;c.type==OpenLayers.Filter.Comparison.LIKE&&(f=a(f),this.wildcarded&&(f="%"+f+"%"));d[c.property+"__"+e]=f;d.queryable=d.queryable||[];d.queryable.push(c.property)}else OpenLayers.Console.warn("Unknown comparison filter type "+ +c.type);break;case "Logical":if(c.type===OpenLayers.Filter.Logical.AND)for(e=0,f=c.filters.length;e<f;e++)d=this.write(c.filters[e],d);else OpenLayers.Console.warn("Unsupported logical filter type "+c.type);break;default:OpenLayers.Console.warn("Unknown filter type "+e)}return d},CLASS_NAME:"OpenLayers.Format.QueryStringFilter"})}();OpenLayers.Protocol.WFS.v1_0_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.0.0",CLASS_NAME:"OpenLayers.Protocol.WFS.v1_0_0"});OpenLayers.Format.WFSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.WFSCapabilities.v1,{readers:{wfs:OpenLayers.Util.applyDefaults({Service:function(a,b){b.service={};this.readChildNodes(a,b.service)},Fees:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.fees=c)},AccessConstraints:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.accessConstraints=c)},OnlineResource:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.onlineResource= +c)},Keywords:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.keywords=c.split(", "))},Capability:function(a,b){b.capability={};this.readChildNodes(a,b.capability)},Request:function(a,b){b.request={};this.readChildNodes(a,b.request)},GetFeature:function(a,b){b.getfeature={href:{},formats:[]};this.readChildNodes(a,b.getfeature)},ResultFormat:function(a,b){for(var c=a.childNodes,d,e=0;e<c.length;e++)d=c[e],1==d.nodeType&&b.formats.push(d.nodeName)},DCPType:function(a,b){this.readChildNodes(a, +b)},HTTP:function(a,b){this.readChildNodes(a,b.href)},Get:function(a,b){b.get=a.getAttribute("onlineResource")},Post:function(a,b){b.post=a.getAttribute("onlineResource")},SRS:function(a,b){var c=this.getChildValue(a);c&&(b.srs=c)}},OpenLayers.Format.WFSCapabilities.v1.prototype.readers.wfs)},CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1_0_0"});OpenLayers.Renderer.VML=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"urn:schemas-microsoft-com:vml",symbolCache:{},offset:null,initialize:function(a){if(this.supported()){if(!document.namespaces.olv){document.namespaces.add("olv",this.xmlns);for(var b=document.createStyleSheet(),c="shape rect oval fill stroke imagedata group textbox".split(" "),d=0,e=c.length;d<e;d++)b.addRule("olv\\:"+c[d],"behavior: url(#default#VML); position: absolute; display: inline-block;")}OpenLayers.Renderer.Elements.prototype.initialize.apply(this, +arguments)}},supported:function(){return!!document.namespaces},setExtent:function(a,b){var c=OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments),d=this.getResolution(),e=a.left/d|0,d=a.top/d-this.size.h|0;b||!this.offset?(this.offset={x:e,y:d},d=e=0):(e-=this.offset.x,d-=this.offset.y);this.root.coordorigin=e-this.xOffset+" "+d;for(var e=[this.root,this.vectorRoot,this.textRoot],f=0,g=e.length;f<g;++f)d=e[f],d.coordsize=this.size.w+" "+this.size.h;this.root.style.flip="y";return c}, +setSize:function(a){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);for(var b=[this.rendererRoot,this.root,this.vectorRoot,this.textRoot],c=this.size.w+"px",d=this.size.h+"px",e,f=0,g=b.length;f<g;++f)e=b[f],e.style.width=c,e.style.height=d},getNodeType:function(a,b){var c=null;switch(a.CLASS_NAME){case "OpenLayers.Geometry.Point":c=b.externalGraphic?"olv:rect":this.isComplexSymbol(b.graphicName)?"olv:shape":"olv:oval";break;case "OpenLayers.Geometry.Rectangle":c="olv:rect";break;case "OpenLayers.Geometry.LineString":case "OpenLayers.Geometry.LinearRing":case "OpenLayers.Geometry.Polygon":case "OpenLayers.Geometry.Curve":c= +"olv:shape"}return c},setStyle:function(a,b,c,d){b=b||a._style;c=c||a._options;var e=b.fillColor,f=b.title||b.graphicTitle;f&&(a.title=f);if("OpenLayers.Geometry.Point"===a._geometryClass)if(b.externalGraphic){c.isFilled=!0;var e=b.graphicWidth||b.graphicHeight,f=b.graphicHeight||b.graphicWidth,e=e?e:2*b.pointRadius,f=f?f:2*b.pointRadius,g=this.getResolution(),h=void 0!=b.graphicXOffset?b.graphicXOffset:-(.5*e),k=void 0!=b.graphicYOffset?b.graphicYOffset:-(.5*f);a.style.left=((d.x-this.featureDx)/ +g-this.offset.x+h|0)+"px";a.style.top=(d.y/g-this.offset.y-(k+f)|0)+"px";a.style.width=e+"px";a.style.height=f+"px";a.style.flip="y";e="none";c.isStroked=!1}else this.isComplexSymbol(b.graphicName)?(f=this.importSymbol(b.graphicName),a.path=f.path,a.coordorigin=f.left+","+f.bottom,f=f.size,a.coordsize=f+","+f,this.drawCircle(a,d,b.pointRadius),a.style.flip="y"):this.drawCircle(a,d,b.pointRadius);c.isFilled?a.fillcolor=e:a.filled="false";d=a.getElementsByTagName("fill");d=0==d.length?null:d[0];c.isFilled? +(d||(d=this.createNode("olv:fill",a.id+"_fill")),d.opacity=b.fillOpacity,"OpenLayers.Geometry.Point"===a._geometryClass&&b.externalGraphic&&(b.graphicOpacity&&(d.opacity=b.graphicOpacity),d.src=b.externalGraphic,d.type="frame",b.graphicWidth&&b.graphicHeight||(d.aspect="atmost")),d.parentNode!=a&&a.appendChild(d)):d&&a.removeChild(d);e=b.rotation;if(void 0!==e||void 0!==a._rotation)a._rotation=e,b.externalGraphic?(this.graphicRotate(a,h,k,b),d.opacity=0):"OpenLayers.Geometry.Point"===a._geometryClass&& +(a.style.rotation=e||0);h=a.getElementsByTagName("stroke");h=0==h.length?null:h[0];c.isStroked?(h||(h=this.createNode("olv:stroke",a.id+"_stroke"),a.appendChild(h)),h.on=!0,h.color=b.strokeColor,h.weight=b.strokeWidth+"px",h.opacity=b.strokeOpacity,h.endcap="butt"==b.strokeLinecap?"flat":b.strokeLinecap||"round",b.strokeDashstyle&&(h.dashstyle=this.dashStyle(b))):(a.stroked=!1,h&&(h.on=!1));"inherit"!=b.cursor&&null!=b.cursor&&(a.style.cursor=b.cursor);return a},graphicRotate:function(a,b,c,d){d= +d||a._style;var e=d.rotation||0,f,g;if(d.graphicWidth&&d.graphicHeight){g=Math.max(d.graphicWidth,d.graphicHeight);f=d.graphicWidth/d.graphicHeight;var h=Math.round(d.graphicWidth||g*f),k=Math.round(d.graphicHeight||g);a.style.width=h+"px";a.style.height=k+"px";var l=document.getElementById(a.id+"_image");l||(l=this.createNode("olv:imagedata",a.id+"_image"),a.appendChild(l));l.style.width=h+"px";l.style.height=k+"px";l.src=d.externalGraphic;l.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='', sizingMethod='scale')"; +l=e*Math.PI/180;e=Math.sin(l);l=Math.cos(l);e="progid:DXImageTransform.Microsoft.Matrix(M11="+l+",M12="+-e+",M21="+e+",M22="+l+",SizingMethod='auto expand')\n";(l=d.graphicOpacity||d.fillOpacity)&&1!=l&&(e+="progid:DXImageTransform.Microsoft.BasicImage(opacity="+l+")\n");a.style.filter=e;e=new OpenLayers.Geometry.Point(-b,-c);h=(new OpenLayers.Bounds(0,0,h,k)).toGeometry();h.rotate(d.rotation,e);h=h.getBounds();a.style.left=Math.round(parseInt(a.style.left)+h.left)+"px";a.style.top=Math.round(parseInt(a.style.top)- +h.bottom)+"px"}else{var m=new Image;m.onreadystatechange=OpenLayers.Function.bind(function(){if("complete"==m.readyState||"interactive"==m.readyState)f=m.width/m.height,g=Math.max(2*d.pointRadius,d.graphicWidth||0,d.graphicHeight||0),b*=f,d.graphicWidth=g*f,d.graphicHeight=g,this.graphicRotate(a,b,c,d)},this);m.src=d.externalGraphic}},postDraw:function(a){a.style.visibility="visible";var b=a._style.fillColor,c=a._style.strokeColor;"none"==b&&a.fillcolor!=b&&(a.fillcolor=b);"none"==c&&a.strokecolor!= +c&&(a.strokecolor=c)},setNodeDimension:function(a,b){var c=b.getBounds();if(c){var d=this.getResolution(),c=new OpenLayers.Bounds((c.left-this.featureDx)/d-this.offset.x|0,c.bottom/d-this.offset.y|0,(c.right-this.featureDx)/d-this.offset.x|0,c.top/d-this.offset.y|0);a.style.left=c.left+"px";a.style.top=c.top+"px";a.style.width=c.getWidth()+"px";a.style.height=c.getHeight()+"px";a.coordorigin=c.left+" "+c.top;a.coordsize=c.getWidth()+" "+c.getHeight()}},dashStyle:function(a){a=a.strokeDashstyle;switch(a){case "solid":case "dot":case "dash":case "dashdot":case "longdash":case "longdashdot":return a; +default:return a=a.split(/[ ,]/),2==a.length?1*a[0]>=2*a[1]?"longdash":1==a[0]||1==a[1]?"dot":"dash":4==a.length?1*a[0]>=2*a[1]?"longdashdot":"dashdot":"solid"}},createNode:function(a,b){var c=document.createElement(a);b&&(c.id=b);c.unselectable="on";c.onselectstart=OpenLayers.Function.False;return c},nodeTypeCompare:function(a,b){var c=b,d=c.indexOf(":");-1!=d&&(c=c.substr(d+1));var e=a.nodeName,d=e.indexOf(":");-1!=d&&(e=e.substr(d+1));return c==e},createRenderRoot:function(){return this.nodeFactory(this.container.id+ +"_vmlRoot","div")},createRoot:function(a){return this.nodeFactory(this.container.id+a,"olv:group")},drawPoint:function(a,b){return this.drawCircle(a,b,1)},drawCircle:function(a,b,c){if(!isNaN(b.x)&&!isNaN(b.y)){var d=this.getResolution();a.style.left=((b.x-this.featureDx)/d-this.offset.x|0)-c+"px";a.style.top=(b.y/d-this.offset.y|0)-c+"px";b=2*c;a.style.width=b+"px";a.style.height=b+"px";return a}return!1},drawLineString:function(a,b){return this.drawLine(a,b,!1)},drawLinearRing:function(a,b){return this.drawLine(a, +b,!0)},drawLine:function(a,b,c){this.setNodeDimension(a,b);for(var d=this.getResolution(),e=b.components.length,f=Array(e),g,h,k=0;k<e;k++)g=b.components[k],h=(g.x-this.featureDx)/d-this.offset.x|0,g=g.y/d-this.offset.y|0,f[k]=" "+h+","+g+" l ";b=c?" x e":" e";a.path="m"+f.join("")+b;return a},drawPolygon:function(a,b){this.setNodeDimension(a,b);var c=this.getResolution(),d=[],e,f,g,h,k,l,m,q,n,p;e=0;for(f=b.components.length;e<f;e++){d.push("m");g=b.components[e].components;h=0===e;l=k=null;m=0; +for(q=g.length;m<q;m++)n=g[m],p=(n.x-this.featureDx)/c-this.offset.x|0,n=n.y/c-this.offset.y|0,p=" "+p+","+n,d.push(p),0==m&&d.push(" l"),h||(k?k!=p&&(l?l!=p&&(h=!0):l=p):k=p);d.push(h?" x ":" ")}d.push("e");a.path=d.join("");return a},drawRectangle:function(a,b){var c=this.getResolution();a.style.left=((b.x-this.featureDx)/c-this.offset.x|0)+"px";a.style.top=(b.y/c-this.offset.y|0)+"px";a.style.width=(b.width/c|0)+"px";a.style.height=(b.height/c|0)+"px";return a},drawText:function(a,b,c){var d=this.nodeFactory(a+ +this.LABEL_ID_SUFFIX,"olv:rect"),e=this.nodeFactory(a+this.LABEL_ID_SUFFIX+"_textbox","olv:textbox"),f=this.getResolution();d.style.left=((c.x-this.featureDx)/f-this.offset.x|0)+"px";d.style.top=(c.y/f-this.offset.y|0)+"px";d.style.flip="y";e.innerText=b.label;"inherit"!=b.cursor&&null!=b.cursor&&(e.style.cursor=b.cursor);b.fontColor&&(e.style.color=b.fontColor);b.fontOpacity&&(e.style.filter="alpha(opacity="+100*b.fontOpacity+")");b.fontFamily&&(e.style.fontFamily=b.fontFamily);b.fontSize&&(e.style.fontSize= +b.fontSize);b.fontWeight&&(e.style.fontWeight=b.fontWeight);b.fontStyle&&(e.style.fontStyle=b.fontStyle);!0===b.labelSelect&&(d._featureId=a,e._featureId=a,e._geometry=c,e._geometryClass=c.CLASS_NAME);e.style.whiteSpace="nowrap";e.inset="1px,0px,0px,0px";d.parentNode||(d.appendChild(e),this.textRoot.appendChild(d));b=b.labelAlign||"cm";1==b.length&&(b+="m");a=e.clientWidth*OpenLayers.Renderer.VML.LABEL_SHIFT[b.substr(0,1)];e=e.clientHeight*OpenLayers.Renderer.VML.LABEL_SHIFT[b.substr(1,1)];d.style.left= +parseInt(d.style.left)-a-1+"px";d.style.top=parseInt(d.style.top)+e+"px"},moveRoot:function(a){var b=this.map.getLayer(a.container.id);b instanceof OpenLayers.Layer.Vector.RootContainer&&(b=this.map.getLayer(this.container.id));b&&b.renderer.clear();OpenLayers.Renderer.Elements.prototype.moveRoot.apply(this,arguments);b&&b.redraw()},importSymbol:function(a){var b=this.container.id+"-"+a,c=this.symbolCache[b];if(c)return c;c=OpenLayers.Renderer.symbol[a];if(!c)throw Error(a+" is not a valid symbol name"); +a=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,0,0);for(var d=["m"],e=0;e<c.length;e+=2){var f=c[e],g=c[e+1];a.left=Math.min(a.left,f);a.bottom=Math.min(a.bottom,g);a.right=Math.max(a.right,f);a.top=Math.max(a.top,g);d.push(f);d.push(g);0==e&&d.push("l")}d.push("x e");c=d.join(" ");d=(a.getWidth()-a.getHeight())/2;0<d?(a.bottom-=d,a.top+=d):(a.left+=d,a.right-=d);c={path:c,size:a.getWidth(),left:a.left,bottom:a.bottom};return this.symbolCache[b]=c},CLASS_NAME:"OpenLayers.Renderer.VML"}); +OpenLayers.Renderer.VML.LABEL_SHIFT={l:0,c:.5,r:1,t:0,m:.5,b:1};OpenLayers.Protocol.HTTP=OpenLayers.Class(OpenLayers.Protocol,{url:null,headers:null,params:null,callback:null,scope:null,readWithPOST:!1,updateWithPOST:!1,deleteWithPOST:!1,wildcarded:!1,srsInBBOX:!1,initialize:function(a){a=a||{};this.params={};this.headers={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var b=new OpenLayers.Format.QueryStringFilter({wildcarded:this.wildcarded,srsInBBOX:this.srsInBBOX});this.filterToParams= +function(a,d){return b.write(a,d)}}},destroy:function(){this.headers=this.params=null;OpenLayers.Protocol.prototype.destroy.apply(this)},read:function(a){OpenLayers.Protocol.prototype.read.apply(this,arguments);a=a||{};a.params=OpenLayers.Util.applyDefaults(a.params,this.options.params);a=OpenLayers.Util.applyDefaults(a,this.options);a.filter&&this.filterToParams&&(a.params=this.filterToParams(a.filter,a.params));var b=void 0!==a.readWithPOST?a.readWithPOST:this.readWithPOST,c=new OpenLayers.Protocol.Response({requestType:"read"}); +b?(b=a.headers||{},b["Content-Type"]="application/x-www-form-urlencoded",c.priv=OpenLayers.Request.POST({url:a.url,callback:this.createCallback(this.handleRead,c,a),data:OpenLayers.Util.getParameterString(a.params),headers:b})):c.priv=OpenLayers.Request.GET({url:a.url,callback:this.createCallback(this.handleRead,c,a),params:a.params,headers:a.headers});return c},handleRead:function(a,b){this.handleResponse(a,b)},create:function(a,b){b=OpenLayers.Util.applyDefaults(b,this.options);var c=new OpenLayers.Protocol.Response({reqFeatures:a, +requestType:"create"});c.priv=OpenLayers.Request.POST({url:b.url,callback:this.createCallback(this.handleCreate,c,b),headers:b.headers,data:this.format.write(a)});return c},handleCreate:function(a,b){this.handleResponse(a,b)},update:function(a,b){b=b||{};var c=b.url||a.url||this.options.url+"/"+a.fid;b=OpenLayers.Util.applyDefaults(b,this.options);var d=new OpenLayers.Protocol.Response({reqFeatures:a,requestType:"update"});d.priv=OpenLayers.Request[this.updateWithPOST?"POST":"PUT"]({url:c,callback:this.createCallback(this.handleUpdate, +d,b),headers:b.headers,data:this.format.write(a)});return d},handleUpdate:function(a,b){this.handleResponse(a,b)},"delete":function(a,b){b=b||{};var c=b.url||a.url||this.options.url+"/"+a.fid;b=OpenLayers.Util.applyDefaults(b,this.options);var d=new OpenLayers.Protocol.Response({reqFeatures:a,requestType:"delete"}),e=this.deleteWithPOST?"POST":"DELETE",c={url:c,callback:this.createCallback(this.handleDelete,d,b),headers:b.headers};this.deleteWithPOST&&(c.data=this.format.write(a));d.priv=OpenLayers.Request[e](c); +return d},handleDelete:function(a,b){this.handleResponse(a,b)},handleResponse:function(a,b){var c=a.priv;b.callback&&(200<=c.status&&300>c.status?("delete"!=a.requestType&&(a.features=this.parseFeatures(c)),a.code=OpenLayers.Protocol.Response.SUCCESS):a.code=OpenLayers.Protocol.Response.FAILURE,b.callback.call(b.scope,a))},parseFeatures:function(a){var b=a.responseXML;b&&b.documentElement||(b=a.responseText);return!b||0>=b.length?null:this.format.read(b)},commit:function(a,b){function c(a){for(var b= +a.features?a.features.length:0,c=Array(b),e=0;e<b;++e)c[e]=a.features[e].fid;r.insertIds=c;d.apply(this,[a])}function d(a){this.callUserCallback(a,b);p=p&&a.success();f++;f>=n&&b.callback&&(r.code=p?OpenLayers.Protocol.Response.SUCCESS:OpenLayers.Protocol.Response.FAILURE,b.callback.apply(b.scope,[r]))}b=OpenLayers.Util.applyDefaults(b,this.options);var e=[],f=0,g={};g[OpenLayers.State.INSERT]=[];g[OpenLayers.State.UPDATE]=[];g[OpenLayers.State.DELETE]=[];for(var h,k,l=[],m=0,q=a.length;m<q;++m)if(h= +a[m],k=g[h.state])k.push(h),l.push(h);var n=(0<g[OpenLayers.State.INSERT].length?1:0)+g[OpenLayers.State.UPDATE].length+g[OpenLayers.State.DELETE].length,p=!0,r=new OpenLayers.Protocol.Response({reqFeatures:l});h=g[OpenLayers.State.INSERT];0<h.length&&e.push(this.create(h,OpenLayers.Util.applyDefaults({callback:c,scope:this},b.create)));h=g[OpenLayers.State.UPDATE];for(m=h.length-1;0<=m;--m)e.push(this.update(h[m],OpenLayers.Util.applyDefaults({callback:d,scope:this},b.update)));h=g[OpenLayers.State.DELETE]; +for(m=h.length-1;0<=m;--m)e.push(this["delete"](h[m],OpenLayers.Util.applyDefaults({callback:d,scope:this},b["delete"])));return e},abort:function(a){a&&a.priv.abort()},callUserCallback:function(a,b){var c=b[a.requestType];c&&c.callback&&c.callback.call(c.scope,a)},CLASS_NAME:"OpenLayers.Protocol.HTTP"});OpenLayers.Format.JSON=OpenLayers.Class(OpenLayers.Format,{indent:" ",space:" ",newline:"\n",level:0,pretty:!1,nativeJSON:function(){return!(!window.JSON||"function"!=typeof JSON.parse||"function"!=typeof JSON.stringify)}(),read:function(a,b){var c;if(this.nativeJSON)c=JSON.parse(a,b);else try{if(/^[\],:{}\s]*$/.test(a.replace(/\\["\\\/bfnrtu]/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))&&(c=eval("("+a+")"),"function"=== +typeof b)){var d=function(a,c){if(c&&"object"===typeof c)for(var g in c)c.hasOwnProperty(g)&&(c[g]=d(g,c[g]));return b(a,c)};c=d("",c)}}catch(e){}this.keepData&&(this.data=c);return c},write:function(a,b){this.pretty=!!b;var c=null,d=typeof a;if(this.serialize[d])try{c=!this.pretty&&this.nativeJSON?JSON.stringify(a):this.serialize[d].apply(this,[a])}catch(e){OpenLayers.Console.error("Trouble serializing: "+e)}return c},writeIndent:function(){var a=[];if(this.pretty)for(var b=0;b<this.level;++b)a.push(this.indent); +return a.join("")},writeNewline:function(){return this.pretty?this.newline:""},writeSpace:function(){return this.pretty?this.space:""},serialize:{object:function(a){if(null==a)return"null";if(a.constructor==Date)return this.serialize.date.apply(this,[a]);if(a.constructor==Array)return this.serialize.array.apply(this,[a]);var b=["{"];this.level+=1;var c,d,e,f=!1;for(c in a)a.hasOwnProperty(c)&&(d=OpenLayers.Format.JSON.prototype.write.apply(this,[c,this.pretty]),e=OpenLayers.Format.JSON.prototype.write.apply(this, +[a[c],this.pretty]),null!=d&&null!=e&&(f&&b.push(","),b.push(this.writeNewline(),this.writeIndent(),d,":",this.writeSpace(),e),f=!0));--this.level;b.push(this.writeNewline(),this.writeIndent(),"}");return b.join("")},array:function(a){var b,c=["["];this.level+=1;for(var d=0,e=a.length;d<e;++d)b=OpenLayers.Format.JSON.prototype.write.apply(this,[a[d],this.pretty]),null!=b&&(0<d&&c.push(","),c.push(this.writeNewline(),this.writeIndent(),b));--this.level;c.push(this.writeNewline(),this.writeIndent(), +"]");return c.join("")},string:function(a){var b={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"};return/["\\\x00-\x1f]/.test(a)?'"'+a.replace(/([\x00-\x1f\\"])/g,function(a,d){var e=b[d];if(e)return e;e=d.charCodeAt();return"\\u00"+Math.floor(e/16).toString(16)+(e%16).toString(16)})+'"':'"'+a+'"'},number:function(a){return isFinite(a)?String(a):"null"},"boolean":function(a){return String(a)},date:function(a){function b(a){return 10>a?"0"+a:a}return'"'+a.getFullYear()+ +"-"+b(a.getMonth()+1)+"-"+b(a.getDate())+"T"+b(a.getHours())+":"+b(a.getMinutes())+":"+b(a.getSeconds())+'"'}},CLASS_NAME:"OpenLayers.Format.JSON"});OpenLayers.Control.DragFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,onStart:function(a,b){},onDrag:function(a,b){},onComplete:function(a,b){},onEnter:function(a){},onLeave:function(a){},documentDrag:!1,layer:null,feature:null,dragCallbacks:{},featureCallbacks:{},lastPixel:null,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);this.layer=a;this.handlers={drag:new OpenLayers.Handler.Drag(this,OpenLayers.Util.extend({down:this.downFeature,move:this.moveFeature, +up:this.upFeature,out:this.cancel,done:this.doneDragging},this.dragCallbacks),{documentDrag:this.documentDrag}),feature:new OpenLayers.Handler.Feature(this,this.layer,OpenLayers.Util.extend({click:this.clickFeature,clickout:this.clickoutFeature,over:this.overFeature,out:this.outFeature},this.featureCallbacks),{geometryTypes:this.geometryTypes})}},clickFeature:function(a){this.handlers.feature.touch&&!this.over&&this.overFeature(a)&&(this.handlers.drag.dragstart(this.handlers.feature.evt),this.handlers.drag.stopDown= +!1)},clickoutFeature:function(a){this.handlers.feature.touch&&this.over&&(this.outFeature(a),this.handlers.drag.stopDown=!0)},destroy:function(){this.layer=null;OpenLayers.Control.prototype.destroy.apply(this,[])},activate:function(){return this.handlers.feature.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments)},deactivate:function(){this.handlers.drag.deactivate();this.handlers.feature.deactivate();this.feature=null;this.dragging=!1;this.lastPixel=null;OpenLayers.Element.removeClass(this.map.viewPortDiv, +this.displayClass+"Over");return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},overFeature:function(a){var b=!1;this.handlers.drag.dragging?this.over=this.feature.id==a.id?!0:!1:(this.feature=a,this.handlers.drag.activate(),this.over=b=!0,OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass+"Over"),this.onEnter(a));return b},downFeature:function(a){this.lastPixel=a;this.onStart(this.feature,a)},moveFeature:function(a){var b=this.map.getResolution();this.feature.geometry.move(b* +(a.x-this.lastPixel.x),b*(this.lastPixel.y-a.y));this.layer.drawFeature(this.feature);this.lastPixel=a;this.onDrag(this.feature,a)},upFeature:function(a){this.over||this.handlers.drag.deactivate()},doneDragging:function(a){this.onComplete(this.feature,a)},outFeature:function(a){this.handlers.drag.dragging?this.feature.id==a.id&&(this.over=!1):(this.over=!1,this.handlers.drag.deactivate(),OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over"),this.onLeave(a),this.feature=null)}, +cancel:function(){this.handlers.drag.deactivate();this.over=!1},setMap:function(a){this.handlers.drag.setMap(a);this.handlers.feature.setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},CLASS_NAME:"OpenLayers.Control.DragFeature"});OpenLayers.Protocol.WFS.v1_1_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.1.0",initialize:function(a){OpenLayers.Protocol.WFS.v1.prototype.initialize.apply(this,arguments);this.outputFormat&&!this.readFormat&&("gml2"==this.outputFormat.toLowerCase()?this.readFormat=new OpenLayers.Format.GML.v2({featureType:this.featureType,featureNS:this.featureNS,geometryName:this.geometryName}):"json"==this.outputFormat.toLowerCase()&&(this.readFormat=new OpenLayers.Format.GeoJSON))},CLASS_NAME:"OpenLayers.Protocol.WFS.v1_1_0"});OpenLayers.Control.PinchZoom=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,pinchOrigin:null,currentCenter:null,autoActivate:!0,preserveCenter:!1,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.handler=new OpenLayers.Handler.Pinch(this,{start:this.pinchStart,move:this.pinchMove,done:this.pinchDone},this.handlerOptions)},pinchStart:function(a,b){var c=this.preserveCenter?this.map.getPixelFromLonLat(this.map.getCenter()):a.xy;this.currentCenter= +this.pinchOrigin=c},pinchMove:function(a,b){var c=b.scale,d=this.map.layerContainerOriginPx,e=this.pinchOrigin,f=this.preserveCenter?this.map.getPixelFromLonLat(this.map.getCenter()):a.xy;this.map.applyTransform(Math.round(d.x+f.x-e.x+(c-1)*(d.x-e.x)),Math.round(d.y+f.y-e.y+(c-1)*(d.y-e.y)),c);this.currentCenter=f},pinchDone:function(a,b,c){this.map.applyTransform();a=this.map.getZoomForResolution(this.map.getResolution()/c.scale,!0);if(a!==this.map.getZoom()||!this.currentCenter.equals(this.pinchOrigin)){b= +this.map.getResolutionForZoom(a);c=this.map.getLonLatFromPixel(this.pinchOrigin);var d=this.currentCenter,e=this.map.getSize();c.lon+=b*(e.w/2-d.x);c.lat-=b*(e.h/2-d.y);this.map.div.clientWidth=this.map.div.clientWidth;this.map.setCenter(c,a)}},CLASS_NAME:"OpenLayers.Control.PinchZoom"});OpenLayers.Format.WFS=OpenLayers.Class(OpenLayers.Format.GML,{layer:null,wfsns:"http://www.opengis.net/wfs",ogcns:"http://www.opengis.net/ogc",initialize:function(a,b){OpenLayers.Format.GML.prototype.initialize.apply(this,[a]);this.layer=b;this.layer.featureNS&&(this.featureNS=this.layer.featureNS);this.layer.options.geometry_column&&(this.geometryName=this.layer.options.geometry_column);this.layer.options.typename&&(this.featureName=this.layer.options.typename)},write:function(a){var b=this.createElementNS(this.wfsns, +"wfs:Transaction");b.setAttribute("version","1.0.0");b.setAttribute("service","WFS");for(var c=0;c<a.length;c++)switch(a[c].state){case OpenLayers.State.INSERT:b.appendChild(this.insert(a[c]));break;case OpenLayers.State.UPDATE:b.appendChild(this.update(a[c]));break;case OpenLayers.State.DELETE:b.appendChild(this.remove(a[c]))}return OpenLayers.Format.XML.prototype.write.apply(this,[b])},createFeatureXML:function(a){var b=this.buildGeometryNode(a.geometry),c=this.createElementNS(this.featureNS,"feature:"+ +this.geometryName);c.appendChild(b);b=this.createElementNS(this.featureNS,"feature:"+this.featureName);b.appendChild(c);for(var d in a.attributes){var c=this.createTextNode(a.attributes[d]),e=d;-1!=d.search(":")&&(e=d.split(":")[1]);e=this.createElementNS(this.featureNS,"feature:"+e);e.appendChild(c);b.appendChild(e)}return b},insert:function(a){var b=this.createElementNS(this.wfsns,"wfs:Insert");b.appendChild(this.createFeatureXML(a));return b},update:function(a){a.fid||OpenLayers.Console.userError(OpenLayers.i18n("noFID")); +var b=this.createElementNS(this.wfsns,"wfs:Update");b.setAttribute("typeName",this.featurePrefix+":"+this.featureName);b.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);var c=this.createElementNS(this.wfsns,"wfs:Property"),d=this.createElementNS(this.wfsns,"wfs:Name"),e=this.createTextNode(this.geometryName);d.appendChild(e);c.appendChild(d);d=this.createElementNS(this.wfsns,"wfs:Value");e=this.buildGeometryNode(a.geometry);a.layer&&e.setAttribute("srsName",a.layer.projection.getCode()); +d.appendChild(e);c.appendChild(d);b.appendChild(c);for(var f in a.attributes)c=this.createElementNS(this.wfsns,"wfs:Property"),d=this.createElementNS(this.wfsns,"wfs:Name"),d.appendChild(this.createTextNode(f)),c.appendChild(d),d=this.createElementNS(this.wfsns,"wfs:Value"),d.appendChild(this.createTextNode(a.attributes[f])),c.appendChild(d),b.appendChild(c);c=this.createElementNS(this.ogcns,"ogc:Filter");f=this.createElementNS(this.ogcns,"ogc:FeatureId");f.setAttribute("fid",a.fid);c.appendChild(f); +b.appendChild(c);return b},remove:function(a){if(!a.fid)return OpenLayers.Console.userError(OpenLayers.i18n("noFID")),!1;var b=this.createElementNS(this.wfsns,"wfs:Delete");b.setAttribute("typeName",this.featurePrefix+":"+this.featureName);b.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);var c=this.createElementNS(this.ogcns,"ogc:Filter"),d=this.createElementNS(this.ogcns,"ogc:FeatureId");d.setAttribute("fid",a.fid);c.appendChild(d);b.appendChild(c);return b},destroy:function(){this.layer= +null},CLASS_NAME:"OpenLayers.Format.WFS"}); diff --git a/web/js/fixmystreet-admin.js b/web/js/fixmystreet-admin.js index 5e0d873c5..1b6624b9b 100644 --- a/web/js/fixmystreet-admin.js +++ b/web/js/fixmystreet-admin.js @@ -9,7 +9,7 @@ $(function(){ 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.match(/^(email|emptyhomes|noop|refused)$/i)) { + } else if (send_method && !send_method.match(/^(email|noop|refused)$/i)) { show_open311 = true; } if (show_open311) { diff --git a/web/js/fixmystreet-old-box.js b/web/js/fixmystreet-old-box.js deleted file mode 100644 index 72eeafb4d..000000000 --- a/web/js/fixmystreet-old-box.js +++ /dev/null @@ -1,39 +0,0 @@ -/* - * fixmystreet-old-box.js - * Create the 'email me updates' pop up box on old-style report display pages. - */ - -$(function(){ - - if (!$('#email_alert_box').length) { - return; - } - - var timer; - function email_alert_close() { - $('#email_alert_box').hide('fast'); - } - - $('#email_alert').click(function(e) { - e.preventDefault(); - if ($('#email_alert_box').is(':visible')) { - email_alert_close(); - } else { - var pos = $(this).position(); - $('#email_alert_box').css( { 'left': ( pos.left - 20 ) + 'px', 'top': ( pos.top + 20 ) + 'px' } ); - $('#email_alert_box').show('fast'); - $('#alert_rznvy').focus(); - } - }).hover(function() { - window.clearTimeout(timer); - }, function() { - timer = window.setTimeout(email_alert_close, 2000); - }); - - $('#email_alert_box').hover(function() { - window.clearTimeout(timer); - }, function() { - timer = window.setTimeout(email_alert_close, 2000); - }); - -}); diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 312a3e294..0a15982f5 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -128,7 +128,7 @@ $(function(){ $('#form_name').addClass('required').removeClass('valid'); } ); - $('#facebook_sign_in').click(function(e){ + $('#facebook_sign_in, #twitter_sign_in').click(function(e){ $('#form_email').removeClass(); $('#form_rznvy').removeClass(); $('#email').removeClass(); @@ -136,12 +136,12 @@ $(function(){ // Geolocation if (geo_position_js.init()) { - var link = '<a href="#LINK" id="geolocate_link">… ' + translation_strings.geolocate + '</a>'; - $('form[action="/alert/list"]').append(link.replace('LINK','alert/list')); + var link = '<a href="LINK" id="geolocate_link">… ' + translation_strings.geolocate + '</a>'; + $('form[action="/alert/list"]').append(link.replace('LINK','/alert/list')); if ($('body.frontpage').length) { - $('#postcodeForm').after(link.replace('LINK','around')); + $('#postcodeForm').after(link.replace('LINK','/around')); } else{ - $('#postcodeForm').append(link.replace('LINK','around')); + $('#postcodeForm').append(link.replace('LINK','/around')); } $('#geolocate_link').click(function(e) { var $link = $(this); @@ -157,8 +157,8 @@ $(function(){ $link.find('img').remove(); var latitude = pos.coords.latitude; var longitude = pos.coords.longitude; - var page = $link.attr('href').substr(1); - location.href = '/' + page + '?latitude=' + latitude + ';longitude=' + longitude; + var page = $link.attr('href'); + location.href = page + '?latitude=' + latitude + ';longitude=' + longitude; }, function(err) { $link.find('img').remove(); if (err.code == 1) { // User said no diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index cc4959b7b..f6c446f7b 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -21,8 +21,12 @@ function fixmystreet_update_pin(lonlat) { return; } $('#side-form, #site-logo').show(); + var old_category = $("select#form_category").val(); $('#councils_text').html(data.councils_text); $('#form_category_row').html(data.category); + if ($("select#form_category option[value=\""+old_category+"\"]").length) { + $("select#form_category").val(old_category); + } if ( data.extra_name_info && !$('#form_fms_extra_title').length ) { // there might be a first name field on some cobrands var lb = $('#form_first_name').prev(); diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index dc81c967f..4c386e87d 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -92,7 +92,7 @@ $(function(){ layer: "tiled_LuftbildHybrid", matrixSet: "default028mm", requestEncoding: "REST", - url: "http://www.gis.stadt-zuerich.ch/maps/rest/services/tiled/LuftbildHybrid/MapServer/WMTS/tile/", + url: "//www.gis.stadt-zuerich.ch/maps/rest/services/tiled/LuftbildHybrid/MapServer/WMTS/tile/", style: "default", matrixIds: [ // { @@ -244,7 +244,7 @@ $(function(){ layer_options, OpenLayers.Util.applyDefaults({ name: "Stadtplan3D", layer: "Stadtplan3D", - url: "http://www.gis.stadt-zuerich.ch/maps/rest/services/tiled/Stadtplan3D/MapServer/WMTS/tile/" + url: "//www.gis.stadt-zuerich.ch/maps/rest/services/tiled/Stadtplan3D/MapServer/WMTS/tile/" }, layer_options) ]; |
