diff options
92 files changed, 11106 insertions, 5269 deletions
diff --git a/.travis.yml b/.travis.yml index 709342dc8..944931667 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_install: - cpanm -q DIME::Tools --force # And let's install the same version the carton.lock file currently has. - cpanm -q MKUTTER/SOAP-Lite-0.715.tar.gz - - sudo locale-gen cy_GB.UTF-8 en_GB.UTF-8 nb_NO.UTF-8 + - sudo locale-gen cy_GB.UTF-8 en_GB.UTF-8 nb_NO.UTF-8 de_CH.UTF-8 install: - carton install --deployment before_script: @@ -34,8 +34,8 @@ before_script: - psql fms postgres < db/generate_secret.sql - > sed -r -e "s,(FMS_DB_USER:) 'fms',\\1 'postgres'," - -e "s,cobrand_one,fixmystreet," - -e "s,cobrand_two: 'hostname_substring2',fixmystreet: 'localhost'," + -e "s,cobrand_one,barnet\\n - bromley\\n - emptyhomes\\n - fiksgatami\\n - fixmybarangay\\n - lichfielddc\\n - reading\\n - seesomething\\n - southampton\\n - zurich," + -e "s,cobrand_two: 'hostname_substring2',fixmystreet: '.'," -e "s,(BASE_URL:) 'http://www.example.org',\\1 'http://localhost'," -e "s,(MAPIT_URL:) '',\\1 'http://mapit.mysociety.org/'," conf/general.yml-example > conf/general.yml @@ -14,10 +14,21 @@ RSS alerts of problems in their area. It was created in 2007 by [mySociety](http://www.mysociety.org/) for reporting problems to UK councils and has been copied around the world. The FixMyStreet -Platform is now at version 1.2.2. +Platform is now at version 1.2.4. ## Releases +* v1.2.4 (5th September 2013) + - A fix for the long-standing issue where multiline strings were not being + translated (reported at https://github.com/abw/Template2/pull/29 ) + - Better translation strings for "marked as" updates, fixes #391 + - Less noise when running the tests +* v1.2.3 (2nd September 2013) + - Maintenance release to deal with failing installation + - Improve reuse of make_css and shared CSS + - Remove hardcoded UK URLs on couple of admin error emails + - Mark couple of strings missing translation + - mapquest URL update * v1.2.2 (26th July 2013) - Maintenance release to deal with failing installation - Improve Google Maps plugin somewhat, though still needs work diff --git a/bin/make_css b/bin/make_css index 80fcb462f..c48dda4d6 100755 --- a/bin/make_css +++ b/bin/make_css @@ -13,20 +13,12 @@ DIRECTORY=$(cd `dirname $0`/../web && pwd) -# FixMyStreet uses compass -NEWSTYLE=${1:-`find $DIRECTORY -name "config.rb" -exec dirname {} \;`} -NEWSTYLE_REGEX=$(sed 's/ /\\|/g' <<< $NEWSTYLE) -for site in $NEWSTYLE; do - compass compile --output-style compressed $site -done - -# If given a command line argument, assume was a compass directory and exit -if [ -n "$1" ]; then - exit 0 -fi +DIRS=${1:-`find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq`} -# The rest are plain sass -for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v "\($NEWSTYLE_REGEX\)"` -do - sass --scss --update --style compressed $scss +for dir in $DIRS; do + if [ -e "$dir/config.rb" ]; then + compass compile --output-style compressed $dir + else + sass --scss --update --style compressed $dir + fi done diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index 7b841dd64..d3da12104 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=v1.2.2 +VERSION=${VERSION_OVERRIDE:-v1.2.4} PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh diff --git a/bin/update-schema b/bin/update-schema index f728f8c56..81c9ff4ab 100644 --- a/bin/update-schema +++ b/bin/update-schema @@ -84,6 +84,7 @@ print "Nothing to do\n" if $nothing; # By querying the database schema, we can see where we're currently at # (assuming schema change files are never half-applied, which should be the case) sub get_db_version { + return '0029' if column_exists('body', 'deleted'); return '0028' if table_exists('body'); return '0027' if column_exists('problem', 'subcategory'); return '0026' if column_exists('open311conf', 'send_extended_statuses'); diff --git a/bin/zurich/convert_internal_notes_to_comments b/bin/zurich/convert_internal_notes_to_comments new file mode 100755 index 000000000..e92be40b3 --- /dev/null +++ b/bin/zurich/convert_internal_notes_to_comments @@ -0,0 +1,74 @@ +#!/usr/bin/env perl + +=head1 DESCRIPTION + +This is a Zurich specific migration script. + +It converts the internal notes that used to be stored on the problem in the +extra hash into comments instead. + + ./bin/zurich/convert_internal_notes_to_comments user_id + +You need to select a user to have the internal notes be associated with, perhaps +the superuser, or one created just for this purpose? + +=cut + +use strict; +use warnings; + +use FixMyStreet::App; + +# Because it is not possible to determine the user that last edited the +# internal_notes we need require a user to assign all the comments to. +my $comment_user_id = $ARGV[0] + || die "Usage: $0 id_of_user_for_comments"; +my $comment_user = FixMyStreet::App # + ->model('DB::User') # + ->find($comment_user_id) + || die "Could not find user with id '$comment_user_id'"; + +# We use now as the time for the internal note. This is not the time it was +# actually created, but I don't think that can be extracted from the problem. +my $comment_timestamp = DateTime->now(); + +# The state of 'hidden' seems most appropriate for these internal_notes - as +# they should not be shown to the public. Certainly more suitable than +# 'unconfirmed' or 'confirmed'. +my $comment_state = 'hidden'; + +# Load all the comments, more reliable than trying to search on the contents of +# the extra field. +my $problems = FixMyStreet::App->model('DB::Problem')->search(); + +while ( my $problem = $problems->next() ) { + + my $problem_id = $problem->id; + + # Extract the bits we are interested in. May not exist, in which case + # skip on. + my $extra = $problem->extra || {}; + next unless exists $extra->{internal_notes}; + + # If there is something to save create a comment with the notes in them + if ( my $internal_notes = $extra->{internal_notes} ) { + print "Creating internal note comment for problem '$problem_id'\n"; + $problem->add_to_comments( + { + text => $internal_notes, + created => $comment_timestamp, + user => $comment_user, + state => $comment_state, + mark_fixed => 0, + problem_state => $problem->state, + anonymous => 1, + extra => { is_internal_note => 1 }, + } + ); + } + + # Remove the notes from extra and save back to the problem + delete $extra->{internal_notes}; + $problem->update({ extra => $extra }); +} + diff --git a/conf/general.yml-example b/conf/general.yml-example index d30c494ca..2f78de986 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -130,6 +130,7 @@ MAP_TYPE: 'OSM' ALLOWED_COBRANDS: - cobrand_one - cobrand_two: 'hostname_substring2' + - cobrand_three # This is only used in "offensive report" emails to provide a link directly to # the admin interface. If wanted, set to the full URL of your admin interface. @@ -166,3 +167,4 @@ LONDON_REPORTIT_KEY: '' LONDON_REPORTIT_SECRET: '' AUTH_SHARED_SECRET: '' HEARFROMYOURMP_BASE_URL: '' + diff --git a/db/schema.sql b/db/schema.sql index 5e4bc4a3e..5c54e2d88 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -64,7 +64,8 @@ create table body ( comment_user_id int references users(id), suppress_alerts boolean not null default 'f', can_be_devolved boolean not null default 'f', - send_extended_statuses boolean not null default 'f' + send_extended_statuses boolean not null default 'f', + deleted boolean not null default 'f' ); create table body_areas ( diff --git a/db/schema_0029-add_deleted_flag_to_body.sql b/db/schema_0029-add_deleted_flag_to_body.sql new file mode 100644 index 000000000..3a8be7890 --- /dev/null +++ b/db/schema_0029-add_deleted_flag_to_body.sql @@ -0,0 +1,6 @@ +BEGIN; + +ALTER table body + ADD column deleted BOOL NOT NULL DEFAULT 'f'; + +COMMIT; diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 13a5df439..f629176d4 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-04-24 08:59+0100\n" +"POT-Creation-Date: 2013-09-05 17:39+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:636 perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid " and " msgstr "" @@ -29,7 +29,7 @@ msgstr "" msgid " or " msgstr "" -#: templates/web/default/admin/bodies.html:32 +#: templates/web/default/admin/bodies.html:36 msgid "%d addresses" msgstr "" @@ -65,7 +65,7 @@ msgstr "" msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "%s ward, %s" msgstr "" @@ -73,7 +73,7 @@ msgstr "" msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "%s, within %s ward" msgstr "" @@ -109,7 +109,7 @@ msgstr "" msgid "(fixed)" msgstr "" -#: templates/web/default/index.html:11 templates/web/default/index.html:15 templates/web/fixmystreet/around/intro.html:2 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" @@ -133,11 +133,11 @@ msgstr "" msgid "(we never show your email)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 perllib/FixMyStreet/App/Controller/Report/New.pm:661 perllib/FixMyStreet/DB/Result/Problem.pm:418 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 perllib/FixMyStreet/DB/Result/Problem.pm:424 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "" @@ -245,15 +245,15 @@ msgstr "" msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/default/static/about-en-gb.html:1 templates/web/default/static/about-en-gb.html:3 templates/web/emptyhomes/header.html:34 templates/web/emptyhomes/static/about-en-gb.html:1 templates/web/emptyhomes/static/about-en-gb.html:3 +#: templates/web/default/static/about-en-gb.html:1 templates/web/default/static/about-en-gb.html:3 templates/web/emptyhomes/header.html:34 templates/web/emptyhomes/static/about-cy.html:1 templates/web/emptyhomes/static/about-cy.html:3 templates/web/emptyhomes/static/about-en-gb.html:1 templates/web/emptyhomes/static/about-en-gb.html:3 msgid "About us" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:39 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 msgid "Action Scheduled" msgstr "" -#: templates/web/default/admin/bodies.html:47 templates/web/default/admin/body-form.html:82 templates/web/zurich/admin/body-form.html:47 +#: templates/web/default/admin/bodies.html:53 templates/web/default/admin/bodies.html:57 templates/web/default/admin/body-form.html:82 templates/web/zurich/admin/body-form.html:47 msgid "Add body" msgstr "" @@ -317,11 +317,11 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/default/admin/list_updates.html:11 templates/web/default/admin/problem_row.html:14 +#: templates/web/default/admin/list_updates.html:11 templates/web/default/admin/problem_row.html:20 msgid "Anonymous" msgstr "" -#: templates/web/default/admin/report_edit.html:37 templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:62 templates/web/default/admin/update_edit.html:23 msgid "Anonymous:" msgstr "" @@ -341,27 +341,27 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/report_edit.html:124 templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:127 +#: templates/web/zurich/admin/report_edit.html:133 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:113 templates/web/zurich/admin/report_edit.html:170 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:99 templates/web/zurich/report/updates.html:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" -#: templates/web/default/open311/index.html:17 +#: templates/web/default/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/default/open311/index.html:9 +#: templates/web/default/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "" @@ -381,7 +381,7 @@ msgstr "" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 perllib/FixMyStreet/Cobrand/Zurich.pm:205 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 perllib/FixMyStreet/Cobrand/Zurich.pm:208 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -413,11 +413,11 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/default/admin/body.html:75 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:36 templates/web/default/report/new/fill_in_details_form.html:67 templates/web/emptyhomes/report/new/fill_in_details_form.html:50 templates/web/zurich/admin/body.html:36 templates/web/zurich/admin/report_edit-sdm.html:42 templates/web/zurich/admin/report_edit.html:117 +#: templates/web/default/admin/body.html:75 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:61 templates/web/default/report/new/fill_in_details_form.html:67 templates/web/emptyhomes/report/new/fill_in_details_form.html:50 templates/web/zurich/admin/body.html:36 templates/web/zurich/admin/report_edit-sdm.html:42 templates/web/zurich/admin/report_edit.html:123 msgid "Category:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "Category: %s" msgstr "" @@ -425,11 +425,11 @@ msgstr "" msgid "Change Password" msgstr "" -#: templates/web/default/js/translation_strings.html:39 templates/web/fixmystreet/around/_report_banner.html:2 +#: templates/web/default/js/translation_strings.html:41 templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:76 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:31 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/fixmystreet/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/report_edit.html:90 templates/web/zurich/admin/report_edit.html:92 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:45 templates/web/default/admin/report_edit.html:47 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/fixmystreet/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/report_edit.html:96 templates/web/zurich/admin/report_edit.html:98 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" @@ -441,7 +441,7 @@ msgstr "" msgid "Closed reports" msgstr "" -#: templates/web/default/admin/problem_row.html:32 +#: templates/web/default/admin/problem_row.html:38 msgid "Closed:" msgstr "" @@ -449,7 +449,7 @@ msgstr "" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" -#: templates/web/default/admin/report_edit.html:17 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:23 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit.html:47 msgid "Co-ordinates:" msgstr "" @@ -457,15 +457,15 @@ msgstr "" msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:50 templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:75 templates/web/default/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:49 templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:74 templates/web/default/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" @@ -497,7 +497,7 @@ msgstr "" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/default/admin/problem_row.html:30 templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/problem_row.html:36 templates/web/default/admin/report_edit.html:70 msgid "Confirmed:" msgstr "" @@ -513,11 +513,11 @@ msgstr "" msgid "Contact Us" msgstr "" -#: templates/web/bromley/contact/submit.html:3 templates/web/default/contact/index.html:6 templates/web/default/contact/submit.html:3 templates/web/fixmystreet/contact/index.html:7 +#: templates/web/bromley/contact/submit.html:3 templates/web/default/contact/index.html:6 templates/web/default/contact/submit.html:3 templates/web/fixmystreet/contact/index.html:19 msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1265 perllib/FixMyStreet/App/Controller/Admin.pm:1293 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 perllib/FixMyStreet/App/Controller/Admin.pm:1305 msgid "Could not find user" msgstr "" @@ -549,11 +549,11 @@ msgstr "" msgid "Create category" msgstr "" -#: templates/web/default/admin/list_updates.html:10 templates/web/default/admin/problem_row.html:28 templates/web/zurich/admin/list_updates.html:7 +#: templates/web/default/admin/list_updates.html:10 templates/web/default/admin/problem_row.html:34 templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:44 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:47 templates/web/zurich/admin/report_edit.html:61 templates/web/zurich/admin/update_edit.html:29 +#: templates/web/default/admin/report_edit.html:69 templates/web/default/admin/update_edit.html:51 templates/web/zurich/admin/report_edit-sdm.html:47 templates/web/zurich/admin/report_edit.html:62 templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -581,7 +581,7 @@ msgstr "" msgid "Details" msgstr "" -#: templates/web/default/admin/report_edit.html:14 templates/web/default/report/new/fill_in_details_form.html:61 templates/web/emptyhomes/report/new/fill_in_details_form.html:79 templates/web/zurich/admin/report_edit-sdm.html:25 templates/web/zurich/admin/report_edit.html:25 templates/web/zurich/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:20 templates/web/default/report/new/fill_in_details_form.html:61 templates/web/emptyhomes/report/new/fill_in_details_form.html:79 templates/web/zurich/admin/report_edit-sdm.html:25 templates/web/zurich/admin/report_edit.html:26 templates/web/zurich/admin/report_edit.html:36 msgid "Details:" msgstr "" @@ -605,11 +605,11 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:47 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 templates/web/default/admin/problem_row.html:35 templates/web/default/admin/users.html:28 templates/web/zurich/admin/problem_row.html:36 +#: templates/web/default/admin/list_updates.html:42 templates/web/default/admin/problem_row.html:41 templates/web/default/admin/users.html:28 templates/web/zurich/admin/problem_row.html:44 msgid "Edit" msgstr "" @@ -617,7 +617,7 @@ msgstr "" msgid "Edit body details" msgstr "" -#: templates/web/default/admin/report_edit.html:1 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit-sdm.html:4 templates/web/zurich/admin/report_edit.html:1 templates/web/zurich/admin/report_edit.html:4 +#: templates/web/default/admin/report_edit.html:1 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit-sdm.html:4 templates/web/zurich/admin/report_edit.html:1 templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "" @@ -637,11 +637,11 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1241 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 msgid "Email already in abuse list" msgstr "" @@ -653,23 +653,23 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/default/admin/body.html:80 templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html:42 templates/web/default/admin/update_edit.html:27 templates/web/default/admin/user-form.html:6 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:38 templates/web/zurich/admin/body.html:41 templates/web/zurich/admin/report_edit-sdm.html:44 templates/web/zurich/admin/report_edit.html:57 +#: templates/web/default/admin/body.html:80 templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html:67 templates/web/default/admin/update_edit.html:33 templates/web/default/admin/user-form.html:6 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:38 templates/web/zurich/admin/body.html:41 templates/web/zurich/admin/report_edit-sdm.html:44 templates/web/zurich/admin/report_edit.html:58 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 msgid "Empty office or other commercial" msgstr "" @@ -677,11 +677,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -701,7 +701,7 @@ msgstr "" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:29 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 msgid "Enter a Zürich street name" msgstr "" @@ -737,11 +737,11 @@ msgstr "" msgid "Example postcode %s" msgstr "" -#: templates/web/default/open311/index.html:27 +#: templates/web/default/open311/index.html:96 msgid "Examples:" msgstr "" -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:76 msgid "Extra data:" msgstr "" @@ -749,7 +749,7 @@ msgstr "" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "" -#: templates/web/zurich/admin/index-dm.html:32 templates/web/zurich/admin/index-sdm.html:29 +#: templates/web/zurich/admin/index-dm.html:33 templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" msgstr "" @@ -794,15 +794,15 @@ msgid "" "for the county council." msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:84 templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:31 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:34 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:84 templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:41 templates/web/default/admin/report_edit.html:42 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:34 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:32 msgid "Fixed" msgstr "" -#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "" -#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:42 msgid "Fixed - User" msgstr "" @@ -810,7 +810,7 @@ msgstr "" msgid "Fixed reports" msgstr "" -#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/problem_row.html:37 msgid "Fixed:" msgstr "" @@ -818,11 +818,11 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 templates/web/default/admin/users.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:53 templates/web/default/admin/user-form.html:14 +#: templates/web/default/admin/report_edit.html:78 templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -830,7 +830,7 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "For council(s):" msgstr "" @@ -838,15 +838,15 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: templates/web/default/faq/faq-en-gb.html:1 templates/web/emptyhomes/faq/faq-cy.html:1 templates/web/emptyhomes/faq/faq-en-gb.html:1 templates/web/fiksgatami/faq/faq-nb.html:1 templates/web/fiksgatami/nn/faq/faq-nn.html:1 templates/web/fixmybarangay/faq/faq-en-gb.html:1 templates/web/fixmystreet/faq/faq-en-gb.html:1 templates/web/fixmystreet/static/privacy.html:1 templates/web/oxfordshire/faq/faq-en-gb.html:1 +#: templates/web/default/faq/faq-en-gb.html:1 templates/web/emptyhomes/faq/faq-cy.html:1 templates/web/emptyhomes/faq/faq-en-gb.html:1 templates/web/fiksgatami/faq/faq-nb.html:1 templates/web/fiksgatami/nn/faq/faq-nn.html:1 templates/web/fixmindelo/faq/faq-pt-cv.html:1 templates/web/fixmybarangay/faq/faq-en-gb.html:1 templates/web/fixmystreet/faq/faq-en-gb.html:1 templates/web/fixmystreet/static/privacy.html:1 templates/web/oxfordshire/faq/faq-en-gb.html:1 msgid "Frequently Asked Questions" msgstr "" -#: templates/web/default/open311/index.html:69 +#: templates/web/default/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "" -#: templates/web/bromley/report/display.html:30 templates/web/fixmystreet/report/display.html:38 +#: templates/web/bromley/report/display.html:30 templates/web/fixmystreet/around/_updates.html:3 templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "" @@ -866,7 +866,7 @@ msgstr "" msgid "Go" msgstr "" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "" @@ -874,7 +874,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/default/reports/index.html:8 templates/web/emptyhomes/reports/index.html:5 +#: templates/web/default/reports/index.html:8 msgid "Greyed-out lines are councils that no longer exist." msgstr "" @@ -898,7 +898,7 @@ msgstr "" msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:85 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:50 templates/web/default/admin/report_edit.html:51 templates/web/default/admin/update_edit.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/admin/report_edit.html:91 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" @@ -926,7 +926,7 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:700 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -989,11 +989,11 @@ msgstr "" msgid "In Progress" msgstr "" -#: templates/web/default/open311/index.html:21 +#: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:79 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:31 templates/web/fixmystreet/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:94 templates/web/zurich/report/banner.html:15 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:38 templates/web/fixmystreet/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:100 templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" @@ -1001,7 +1001,7 @@ msgstr "" msgid "Incident Category" msgstr "" -#: templates/web/zurich/admin/report_edit.html:137 +#: templates/web/zurich/admin/report_edit.html:143 msgid "Include reporter personal details" msgstr "" @@ -1009,31 +1009,35 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:56 templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:55 templates/web/zurich/admin/report_edit.html:82 msgid "Internal notes:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 +#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:48 +msgid "Internal referral" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1052 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 msgid "Invalid end date" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:424 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 msgid "Invalid start date" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:30 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:37 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 msgid "Investigating" msgstr "" @@ -1053,11 +1057,11 @@ msgstr "" msgid "Last editor" msgstr "" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:72 msgid "Last update:" msgstr "" -#: templates/web/default/admin/problem_row.html:33 +#: templates/web/default/admin/problem_row.html:39 msgid "Last update:" msgstr "" @@ -1093,7 +1097,7 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "" -#: templates/web/fixmystreet/contact/index.html:86 +#: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "" @@ -1101,7 +1105,7 @@ msgstr "" msgid "Message:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "" @@ -1117,7 +1121,7 @@ msgstr "" msgid "More problems nearby" msgstr "" -#: templates/web/default/admin/bodies.html:7 templates/web/default/admin/body-form.html:4 templates/web/default/admin/flagged.html:11 templates/web/default/admin/flagged.html:28 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/reports.html:13 templates/web/default/admin/users.html:12 templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/nn/reports/index.html:9 templates/web/fiksgatami/reports/index.html:9 templates/web/fixmybarangay/reports/index.html:15 templates/web/fixmystreet/auth/general.html:56 templates/web/fixmystreet/report/new/fill_in_details_form.html:120 templates/web/fixmystreet/report/new/fill_in_details_form.html:187 templates/web/fixmystreet/report/update-form.html:136 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:58 templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/default/admin/bodies.html:7 templates/web/default/admin/body-form.html:4 templates/web/default/admin/flagged.html:11 templates/web/default/admin/flagged.html:28 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/reports.html:13 templates/web/default/admin/users.html:12 templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:9 templates/web/fiksgatami/nn/reports/index.html:9 templates/web/fiksgatami/reports/index.html:9 templates/web/fixmybarangay/reports/index.html:15 templates/web/fixmystreet/auth/general.html:56 templates/web/fixmystreet/report/new/fill_in_details_form.html:120 templates/web/fixmystreet/report/new/fill_in_details_form.html:187 templates/web/fixmystreet/report/update-form.html:136 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:58 templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "Name" msgstr "" @@ -1125,11 +1129,11 @@ msgstr "" msgid "Name (optional)" msgstr "" -#: templates/web/default/admin/report_edit.html:41 templates/web/default/admin/update_edit.html:26 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:56 templates/web/zurich/admin/stats.html:41 +#: templates/web/default/admin/report_edit.html:66 templates/web/default/admin/update_edit.html:32 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:57 templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "" @@ -1145,11 +1149,11 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:415 perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:418 perllib/FixMyStreet/Cobrand/Default.pm:458 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1163,11 +1167,11 @@ msgstr "" msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:249 +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 msgid "New category contact added" msgstr "" @@ -1179,7 +1183,7 @@ msgstr "" msgid "New local reports on reportemptyhomes.com" msgstr "" -#: templates/web/emptyhomes/reports/index.html:11 templates/web/fiksgatami/nn/reports/index.html:10 templates/web/fiksgatami/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/nn/reports/index.html:10 templates/web/fiksgatami/reports/index.html:10 msgid "New problems" msgstr "" @@ -1231,7 +1235,7 @@ msgstr "" msgid "New state" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:59 +#: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" msgstr "" @@ -1243,7 +1247,7 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:4 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/list_updates.html:33 templates/web/default/admin/problem_row.html:14 templates/web/default/admin/report_edit.html:39 templates/web/default/admin/report_edit.html:52 templates/web/default/admin/update_edit.html:19 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:111 templates/web/default/questionnaire/index.html:68 templates/web/fixmystreet/questionnaire/index.html:101 templates/web/fixmystreet/questionnaire/index.html:62 +#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:4 templates/web/default/admin/list_updates.html:37 templates/web/default/admin/list_updates.html:38 templates/web/default/admin/list_updates.html:39 templates/web/default/admin/problem_row.html:20 templates/web/default/admin/report_edit.html:64 templates/web/default/admin/report_edit.html:77 templates/web/default/admin/update_edit.html:25 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:111 templates/web/default/questionnaire/index.html:68 templates/web/fixmystreet/questionnaire/index.html:101 templates/web/fixmystreet/questionnaire/index.html:62 msgid "No" msgstr "" @@ -1271,7 +1275,7 @@ msgstr "" msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:66 +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" msgstr "" @@ -1295,11 +1299,11 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:24 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:60 +#: templates/web/default/admin/report_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:61 msgid "None" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:83 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:83 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:46 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31 msgid "Not Responsible" msgstr "" @@ -1327,7 +1331,7 @@ msgstr "" msgid "Note:" msgstr "" -#: templates/web/default/open311/index.html:6 +#: templates/web/default/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "" @@ -1379,11 +1383,11 @@ msgstr "" msgid "Older fixed" msgstr "" -#: templates/web/emptyhomes/reports/index.html:12 templates/web/fiksgatami/nn/reports/index.html:11 templates/web/fiksgatami/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:11 templates/web/fiksgatami/nn/reports/index.html:11 templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/update_edit.html:22 templates/web/default/dashboard/index.html:142 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:83 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:36 templates/web/default/admin/report_edit.html:37 templates/web/default/admin/update_edit.html:28 templates/web/default/dashboard/index.html:142 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 msgid "Open" msgstr "" @@ -1391,15 +1395,15 @@ msgstr "" msgid "Open reports" msgstr "" -#: templates/web/default/open311/index.html:3 +#: templates/web/default/open311/index.html:72 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/default/open311/index.html:13 +#: templates/web/default/open311/index.html:82 msgid "Open311 initiative web page" msgstr "" -#: templates/web/default/open311/index.html:14 +#: templates/web/default/open311/index.html:83 msgid "Open311 specification" msgstr "" @@ -1411,7 +1415,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:1043 perllib/FixMyStreet/App/Controller/Report/New.pm:661 perllib/FixMyStreet/App/Controller/Report/New.pm:662 perllib/FixMyStreet/DB/Result/Problem.pm:578 perllib/FixMyStreet/DB/Result/Problem.pm:588 perllib/FixMyStreet/DB/Result/Problem.pm:598 perllib/FixMyStreet/DB/Result/Problem.pm:610 perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1046 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/App/Controller/Report/New.pm:665 perllib/FixMyStreet/DB/Result/Problem.pm:578 perllib/FixMyStreet/DB/Result/Problem.pm:588 perllib/FixMyStreet/DB/Result/Problem.pm:598 perllib/FixMyStreet/DB/Result/Problem.pm:610 perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Other" msgstr "" @@ -1431,7 +1435,7 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:51 msgid "Partial" msgstr "" @@ -1443,15 +1447,19 @@ msgstr "" msgid "Password:" msgstr "" +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:136 templates/web/bromley/report/new/fill_in_details_form.html:183 templates/web/fixmystreet/report/new/fill_in_details_form.html:138 templates/web/fixmystreet/report/new/fill_in_details_form.html:205 templates/web/seesomething/report/new/fill_in_details_form.html:89 templates/web/zurich/report/new/fill_in_details_form.html:106 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 templates/web/default/admin/report_edit.html:43 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/emptyhomes/report/new/fill_in_details_form.html:138 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:60 templates/web/zurich/admin/stats.html:39 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 templates/web/default/admin/report_edit.html:68 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/emptyhomes/report/new/fill_in_details_form.html:138 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:61 templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" -#: templates/web/bromley/report/display.html:111 templates/web/bromley/report/new/fill_in_details_form.html:104 templates/web/fixmystreet/report/new/fill_in_details_form.html:92 templates/web/fixmystreet/report/update-form.html:59 templates/web/seesomething/report/new/fill_in_details_form.html:52 templates/web/zurich/admin/stats.html:37 templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/bromley/report/display.html:111 templates/web/bromley/report/new/fill_in_details_form.html:104 templates/web/fixmystreet/report/new/fill_in_details_form.html:92 templates/web/fixmystreet/report/update-form.html:59 templates/web/seesomething/report/new/fill_in_details_form.html:52 templates/web/zurich/admin/index-dm.html:29 templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/stats.html:37 templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" msgstr "" @@ -1467,7 +1475,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:30 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:84 +#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:38 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/admin/report_edit.html:90 msgid "Planned" msgstr "" @@ -1491,7 +1499,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 perllib/FixMyStreet/App/Controller/Report/New.pm:852 perllib/FixMyStreet/App/Controller/Report/New.pm:871 perllib/FixMyStreet/App/Controller/Report/New.pm:914 perllib/FixMyStreet/DB/Result/Problem.pm:420 templates/web/default/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 perllib/FixMyStreet/App/Controller/Report/New.pm:855 perllib/FixMyStreet/App/Controller/Report/New.pm:874 perllib/FixMyStreet/App/Controller/Report/New.pm:917 perllib/FixMyStreet/DB/Result/Problem.pm:420 templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" @@ -1671,11 +1679,11 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:172 +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 msgid "Please upload a JPEG image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:179 +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 msgid "Please upload a JPEG image only\n" msgstr "" @@ -1687,7 +1695,7 @@ msgstr "" msgid "Please write your update here" msgstr "" -#: templates/web/bromley/report/display.html:123 templates/web/bromley/report/display.html:151 templates/web/bromley/report/display.html:163 templates/web/default/contact/index.html:93 templates/web/default/report/update-form.html:109 templates/web/default/report/update-form.html:131 templates/web/default/report/update-form.html:72 templates/web/fixmystreet/contact/index.html:93 templates/web/fixmystreet/report/update-form.html:123 templates/web/fixmystreet/report/update-form.html:71 templates/web/fixmystreet/report/update-form.html:95 +#: templates/web/bromley/report/display.html:123 templates/web/bromley/report/display.html:151 templates/web/bromley/report/display.html:163 templates/web/default/contact/index.html:93 templates/web/default/report/update-form.html:109 templates/web/default/report/update-form.html:131 templates/web/default/report/update-form.html:72 templates/web/fixmystreet/contact/index.html:105 templates/web/fixmystreet/report/update-form.html:123 templates/web/fixmystreet/report/update-form.html:71 templates/web/fixmystreet/report/update-form.html:95 msgid "Post" msgstr "" @@ -1707,7 +1715,7 @@ msgstr "" msgid "Previous" msgstr "" -#: templates/web/default/admin/body.html:97 templates/web/default/admin/body_edit.html:40 templates/web/default/admin/report_edit.html:54 +#: templates/web/default/admin/body.html:97 templates/web/default/admin/body_edit.html:40 templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "" @@ -1735,7 +1743,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:917 +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 msgid "Problem marked as open." msgstr "" @@ -1767,11 +1775,11 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:615 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/Default.pm:626 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 perllib/FixMyStreet/Cobrand/UK.pm:228 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 perllib/FixMyStreet/Cobrand/UK.pm:241 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 perllib/FixMyStreet/Cobrand/UK.pm:242 msgid "Problems within %s ward" msgstr "" @@ -1787,7 +1795,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/default/admin/report_edit.html:26 templates/web/emptyhomes/report/new/fill_in_details_form.html:115 +#: templates/web/default/admin/report_edit.html:32 templates/web/emptyhomes/report/new/fill_in_details_form.html:115 msgid "Property address:" msgstr "" @@ -1803,6 +1811,10 @@ msgstr "" msgid "Provide an update" msgstr "" +#: templates/web/fixmystreet/auth/general.html:53 +msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:180 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" @@ -1819,15 +1831,15 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:172 templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/report_edit.html:178 templates/web/zurich/admin/report_edit.html:194 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:72 templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/report_edit.html:78 templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:196 +#: templates/web/zurich/admin/report_edit.html:202 msgid "Publish the response" msgstr "" @@ -1851,19 +1863,19 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -1875,11 +1887,11 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:616 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 perllib/FixMyStreet/Cobrand/UK.pm:235 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "RSS feed of problems within %s ward" msgstr "" @@ -1907,7 +1919,7 @@ msgstr "" msgid "Recently fixed" msgstr "" -#: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "" @@ -1923,11 +1935,11 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:64 templates/web/default/admin/update_edit.html:51 templates/web/zurich/admin/update_edit.html:35 +#: templates/web/default/admin/report_edit.html:89 templates/web/default/admin/update_edit.html:57 templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/default/index.html:9 templates/web/emptyhomes/header.html:12 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "" @@ -1947,7 +1959,7 @@ msgstr "" msgid "Report on %s" msgstr "" -#: templates/web/default/index.html:18 templates/web/fixmystreet/around/intro.html:1 templates/web/stevenage/around/intro.html:1 templates/web/zurich/around/intro.html:1 +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 templates/web/fixmystreet/around/intro.html:1 templates/web/stevenage/around/intro.html:1 templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" msgstr "" @@ -1959,7 +1971,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:46 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -1971,7 +1983,7 @@ msgstr "" msgid "Reported by %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:48 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -2003,7 +2015,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 perllib/FixMyStreet/Cobrand/Zurich.pm:198 templates/web/seesomething/admin/stats.html:1 templates/web/zurich/header.html:60 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 perllib/FixMyStreet/Cobrand/Zurich.pm:201 templates/web/seesomething/admin/stats.html:1 templates/web/zurich/header.html:60 msgid "Reports" msgstr "" @@ -2023,7 +2035,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Resend report" msgstr "" @@ -2039,11 +2051,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 perllib/FixMyStreet/App/Controller/Admin.pm:1343 templates/web/default/admin/report_edit.html:60 templates/web/zurich/admin/report_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 perllib/FixMyStreet/App/Controller/Admin.pm:1355 templates/web/default/admin/report_edit.html:85 templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 templates/web/default/admin/report_edit.html:61 templates/web/zurich/admin/report_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 templates/web/default/admin/report_edit.html:86 templates/web/zurich/admin/report_edit.html:75 msgid "Rotate Right" msgstr "" @@ -2083,11 +2095,11 @@ msgstr "" msgid "Sent to %s %s later" msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Sent:" msgstr "" -#: templates/web/default/admin/report_edit.html:48 templates/web/zurich/admin/stats.html:45 +#: templates/web/default/admin/report_edit.html:73 templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2147,7 +2159,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 perllib/FixMyStreet/Geocode/Google.pm:74 perllib/FixMyStreet/Geocode/OSM.pm:66 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 perllib/FixMyStreet/Geocode/Google.pm:74 perllib/FixMyStreet/Geocode/OSM.pm:66 msgid "Sorry, we could not find that location." msgstr "" @@ -2175,11 +2187,11 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/default/admin/report_edit.html:28 templates/web/default/admin/update_edit.html:21 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:54 templates/web/zurich/admin/report_edit.html:79 templates/web/zurich/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:34 templates/web/default/admin/update_edit.html:27 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:53 templates/web/zurich/admin/report_edit.html:85 templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1138 perllib/FixMyStreet/Cobrand/Zurich.pm:213 templates/web/default/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 perllib/FixMyStreet/Cobrand/Zurich.pm:216 templates/web/default/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" msgstr "" @@ -2191,7 +2203,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 msgid "Subcategory: %s" msgstr "" @@ -2199,11 +2211,11 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:48 templates/web/fixmystreet/contact/index.html:79 templates/web/fixmystreet/report/new/fill_in_details_form.html:60 +#: templates/web/bromley/report/new/fill_in_details_form.html:48 templates/web/fixmystreet/contact/index.html:91 templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "" -#: templates/web/default/admin/report_edit.html:13 templates/web/default/contact/index.html:83 templates/web/default/report/new/fill_in_details_form.html:52 templates/web/emptyhomes/report/new/fill_in_details_form.html:70 templates/web/zurich/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:19 templates/web/default/contact/index.html:83 templates/web/default/report/new/fill_in_details_form.html:52 templates/web/emptyhomes/report/new/fill_in_details_form.html:70 templates/web/zurich/admin/report_edit.html:35 msgid "Subject:" msgstr "" @@ -2211,7 +2223,7 @@ msgstr "" msgid "Submit" msgstr "" -#: templates/web/default/admin/report_edit.html:67 templates/web/default/admin/update_edit.html:54 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:65 templates/web/zurich/admin/report_edit.html:198 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/default/admin/report_edit.html:92 templates/web/default/admin/update_edit.html:60 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:64 templates/web/zurich/admin/report_edit.html:204 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2219,7 +2231,7 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:82 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/admin/report_edit.html:88 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "" @@ -2235,7 +2247,7 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 perllib/FixMyStreet/Cobrand/Zurich.pm:197 templates/web/default/admin/index.html:1 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:57 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 perllib/FixMyStreet/Cobrand/Zurich.pm:200 templates/web/default/admin/index.html:1 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:57 msgid "Summary" msgstr "" @@ -2243,7 +2255,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 msgid "Survey" msgstr "" @@ -2259,7 +2271,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/default/admin/update_edit.html:14 templates/web/zurich/admin/update_edit.html:12 +#: templates/web/default/admin/update_edit.html:20 templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "" @@ -2299,7 +2311,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/Controller/Photo.pm:186 +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2315,7 +2327,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:683 msgid "That problem will now be resent." msgstr "" @@ -2327,7 +2339,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/default/open311/index.html:23 +#: templates/web/default/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" @@ -2347,11 +2359,11 @@ msgstr "" msgid "The details of your problem are available on the right hand side of this page." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 perllib/FixMyStreet/App/Controller/Reports.pm:67 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "" -#: templates/web/default/open311/index.html:19 +#: templates/web/default/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -2419,11 +2431,11 @@ msgstr "" msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -2431,7 +2443,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 templates/web/seesomething/auth/general.html:24 templates/web/zurich/auth/general.html:28 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 templates/web/seesomething/auth/general.html:24 templates/web/zurich/auth/general.html:28 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 "" @@ -2451,19 +2463,19 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/default/open311/index.html:10 +#: templates/web/default/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 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:891 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 perllib/FixMyStreet/Cobrand/UK.pm:58 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "" @@ -2475,7 +2487,11 @@ msgstr "" msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." msgstr "" -#: templates/web/default/reports/index.html:7 templates/web/emptyhomes/reports/index.html:4 templates/web/fiksgatami/nn/reports/index.html:4 templates/web/fiksgatami/reports/index.html:4 +#: templates/web/emptyhomes/reports/index.html:4 +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." +msgstr "" + +#: templates/web/default/reports/index.html:7 templates/web/fiksgatami/nn/reports/index.html:4 templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." msgstr "" @@ -2503,7 +2519,7 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 perllib/FixMyStreet/Cobrand/Zurich.pm:67 templates/web/zurich/report/_main.html:14 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 perllib/FixMyStreet/Cobrand/Zurich.pm:68 templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -2519,15 +2535,15 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2543,7 +2559,7 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 msgid "To view a map of the precise location of this issue" msgstr "" @@ -2559,11 +2575,11 @@ msgstr "" msgid "Try again" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:83 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:83 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:46 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31 msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:45 templates/web/zurich/admin/report_edit.html:58 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:51 templates/web/default/admin/update_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:45 templates/web/zurich/admin/report_edit.html:59 templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -2591,11 +2607,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/default/contact/index.html:21 templates/web/fixmystreet/contact/index.html:22 +#: templates/web/default/contact/index.html:21 templates/web/fixmystreet/contact/index.html:34 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/default/contact/index.html:23 templates/web/fixmystreet/contact/index.html:24 +#: templates/web/default/contact/index.html:23 templates/web/fixmystreet/contact/index.html:36 msgid "Update below added by %s at %s" msgstr "" @@ -2611,15 +2627,15 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/default/admin/update_edit.html:36 templates/web/zurich/admin/update_edit.html:25 +#: templates/web/default/admin/update_edit.html:42 templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/default/admin/update_edit.html:44 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/update_edit.html:46 msgid "Update reopened problem" msgstr "" @@ -2635,7 +2651,7 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:763 perllib/FixMyStreet/App/Controller/Admin.pm:907 perllib/FixMyStreet/App/Controller/Admin.pm:960 perllib/FixMyStreet/App/Controller/Admin.pm:999 perllib/FixMyStreet/Cobrand/Zurich.pm:421 perllib/FixMyStreet/Cobrand/Zurich.pm:485 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 perllib/FixMyStreet/App/Controller/Admin.pm:775 perllib/FixMyStreet/App/Controller/Admin.pm:919 perllib/FixMyStreet/App/Controller/Admin.pm:972 perllib/FixMyStreet/Cobrand/Zurich.pm:424 perllib/FixMyStreet/Cobrand/Zurich.pm:488 msgid "Updated!" msgstr "" @@ -2655,23 +2671,23 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 perllib/FixMyStreet/Cobrand/Zurich.pm:212 templates/web/default/admin/flagged.html:24 templates/web/zurich/header.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 perllib/FixMyStreet/Cobrand/Zurich.pm:215 templates/web/default/admin/flagged.html:24 templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "Values updated" msgstr "" -#: templates/web/default/admin/report_edit.html:12 templates/web/default/admin/update_edit.html:12 templates/web/zurich/admin/report_edit-sdm.html:24 templates/web/zurich/admin/report_edit.html:22 templates/web/zurich/admin/update_edit.html:10 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/update_edit.html:18 templates/web/zurich/admin/report_edit-sdm.html:24 templates/web/zurich/admin/report_edit.html:23 templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "" @@ -2719,7 +2735,7 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 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 "" @@ -2747,15 +2763,15 @@ msgstr "" msgid "When edited" msgstr "" -#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/problem_row.html:35 msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Whole block of empty flats" msgstr "" -#: templates/web/default/open311/index.html:25 +#: templates/web/default/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -2779,7 +2795,7 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:5 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/list_updates.html:33 templates/web/default/admin/problem_row.html:14 templates/web/default/admin/report_edit.html:38 templates/web/default/admin/report_edit.html:52 templates/web/default/admin/update_edit.html:18 templates/web/default/admin/users.html:26 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:109 templates/web/default/questionnaire/index.html:66 templates/web/fixmystreet/questionnaire/index.html:60 templates/web/fixmystreet/questionnaire/index.html:99 +#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:5 templates/web/default/admin/list_updates.html:37 templates/web/default/admin/list_updates.html:38 templates/web/default/admin/list_updates.html:39 templates/web/default/admin/problem_row.html:20 templates/web/default/admin/report_edit.html:63 templates/web/default/admin/report_edit.html:77 templates/web/default/admin/update_edit.html:24 templates/web/default/admin/users.html:26 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:109 templates/web/default/questionnaire/index.html:66 templates/web/fixmystreet/questionnaire/index.html:60 templates/web/fixmystreet/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -2787,11 +2803,11 @@ msgstr "" msgid "Yes I have a password" msgstr "" -#: templates/web/default/contact/index.html:37 templates/web/fixmystreet/contact/index.html:38 +#: templates/web/default/contact/index.html:37 templates/web/fixmystreet/contact/index.html:50 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/default/contact/index.html:15 templates/web/fixmystreet/contact/index.html:16 +#: templates/web/default/contact/index.html:15 templates/web/fixmystreet/contact/index.html:28 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -2851,7 +2867,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 perllib/FixMyStreet/App/Controller/Report/Update.pm:140 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -2859,7 +2875,7 @@ msgstr "" msgid "You must now click the link in the email we've just sent you." msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "" @@ -2867,7 +2883,7 @@ msgstr "" msgid "Your Reports" msgstr "" -#: templates/web/bromley/report/display.html:41 templates/web/bromley/report/display.html:43 templates/web/bromley/report/new/fill_in_details_form.html:145 templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:72 templates/web/fixmystreet/report/display.html:65 templates/web/fixmystreet/report/display.html:67 templates/web/fixmystreet/report/new/fill_in_details_form.html:115 templates/web/fixmystreet/report/new/fill_in_details_form.html:147 templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/bromley/report/display.html:41 templates/web/bromley/report/display.html:43 templates/web/bromley/report/new/fill_in_details_form.html:145 templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:84 templates/web/fixmystreet/report/display.html:65 templates/web/fixmystreet/report/display.html:67 templates/web/fixmystreet/report/new/fill_in_details_form.html:115 templates/web/fixmystreet/report/new/fill_in_details_form.html:147 templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your email" msgstr "" @@ -2899,7 +2915,7 @@ msgstr "" msgid "Your last name" msgstr "" -#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/contact/index.html:65 templates/web/fixmystreet/report/new/fill_in_details_form.html:124 templates/web/fixmystreet/report/new/fill_in_details_form.html:192 templates/web/fixmystreet/report/update-form.html:140 templates/web/seesomething/report/new/fill_in_details_form.html:79 templates/web/zurich/auth/general.html:59 templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/contact/index.html:77 templates/web/fixmystreet/report/new/fill_in_details_form.html:124 templates/web/fixmystreet/report/new/fill_in_details_form.html:192 templates/web/fixmystreet/report/update-form.html:140 templates/web/seesomething/report/new/fill_in_details_form.html:79 templates/web/zurich/auth/general.html:59 templates/web/zurich/report/new/fill_in_details_form.html:104 msgid "Your name" msgstr "" @@ -2951,14 +2967,10 @@ msgstr "" msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:55 msgid "didn't use map" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 -msgid "duplicate report" -msgstr "" - #: templates/web/default/alert/index.html:33 templates/web/fixmystreet/around/postcode_form.html:20 templates/web/seesomething/around/postcode_form.html:9 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -2975,24 +2987,48 @@ msgstr "" msgid "less than a minute" msgstr "" -#: templates/web/default/report/updates.html:38 -msgid "marked as %s" +#: templates/web/default/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "" + +#: templates/web/default/report/updates.html:47 +msgid "marked as action scheduled" +msgstr "" + +#: templates/web/default/report/updates.html:59 +msgid "marked as an internal referral" msgstr "" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:49 +msgid "marked as closed" +msgstr "" + +#: templates/web/default/report/updates.html:28 templates/web/default/report/updates.html:51 msgid "marked as fixed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:128 templates/web/default/admin/questionnaire.html:15 templates/web/default/admin/questionnaire.html:16 -msgid "n/a" +#: templates/web/default/report/updates.html:45 +msgid "marked as in progress" +msgstr "" + +#: templates/web/default/report/updates.html:41 +msgid "marked as investigating" +msgstr "" + +#: templates/web/default/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "" + +#: templates/web/default/report/updates.html:43 +msgid "marked as planned" msgstr "" -#: templates/web/default/report/updates.html:32 -msgid "no further action" +#: templates/web/default/report/updates.html:53 +msgid "marked as unable to fix" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 -msgid "not the council's responsibility" +#: perllib/FixMyStreet/App/Controller/Admin.pm:128 templates/web/default/admin/questionnaire.html:15 templates/web/default/admin/questionnaire.html:16 +msgid "n/a" msgstr "" #: templates/web/default/alert/_list.html:87 templates/web/fixmybarangay/alert/_list.html:32 templates/web/fixmystreet/alert/_list.html:85 @@ -3003,15 +3039,15 @@ msgstr "" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit-sdm.html:36 templates/web/zurich/admin/report_edit-sdm.html:38 templates/web/zurich/admin/report_edit.html:27 templates/web/zurich/admin/report_edit.html:29 templates/web/zurich/admin/report_edit.html:38 templates/web/zurich/admin/report_edit.html:40 templates/web/zurich/admin/report_edit.html:50 templates/web/zurich/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:24 templates/web/default/admin/report_edit.html:26 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit-sdm.html:36 templates/web/zurich/admin/report_edit-sdm.html:38 templates/web/zurich/admin/report_edit.html:28 templates/web/zurich/admin/report_edit.html:30 templates/web/zurich/admin/report_edit.html:39 templates/web/zurich/admin/report_edit.html:41 templates/web/zurich/admin/report_edit.html:51 templates/web/zurich/admin/report_edit.html:53 msgid "originally entered: “%s”" msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:28 templates/web/default/report/updates.html:36 +#: templates/web/default/report/updates.html:29 templates/web/default/report/updates.html:39 msgid "reopened" msgstr "" @@ -3027,11 +3063,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: templates/web/default/report/updates.html:33 -msgid "third party responsibility" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 msgid "this type of local problem" msgstr "" @@ -3039,15 +3071,15 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:55 msgid "used map" msgstr "" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:35 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/update_edit.html:38 msgid "user is problem owner" msgstr "" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 0be4310e4..941e70a9a 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-04-24 08:59+0100\n" +"POT-Creation-Date: 2013-09-05 17:39+0100\n" "PO-Revision-Date: 2013-05-03 09:41-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" @@ -22,7 +22,7 @@ msgstr "" "X-Generator: Poedit 1.5.5\n" #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid " and " msgstr " and " @@ -43,7 +43,7 @@ msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>" msgid " or " msgstr "neu" -#: templates/web/default/admin/bodies.html:32 +#: templates/web/default/admin/bodies.html:36 msgid "%d addresses" msgstr "%d addresses" @@ -81,7 +81,7 @@ msgstr "%s - Adroddiadau cryno" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "%s ward, %s" msgstr "%s ward, %s" @@ -89,7 +89,7 @@ msgstr "%s ward, %s" msgid "%s, reported at %s" msgstr "%s, reported at %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "%s, within %s ward" msgstr "%s, within %s ward" @@ -134,7 +134,7 @@ msgstr "(closed)" msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" -#: templates/web/default/index.html:11 templates/web/default/index.html:15 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 #: templates/web/fixmystreet/around/intro.html:2 msgid " " msgstr " " @@ -163,13 +163,13 @@ msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" msgid "(we never show your email)" msgstr "(we never show your email)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Pick a category --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 #: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -326,6 +326,8 @@ msgstr "<strong>Yes</strong> I have a password" #: templates/web/default/static/about-en-gb.html:1 #: templates/web/default/static/about-en-gb.html:3 #: templates/web/emptyhomes/header.html:34 +#: templates/web/emptyhomes/static/about-cy.html:1 +#: templates/web/emptyhomes/static/about-cy.html:3 #: templates/web/emptyhomes/static/about-en-gb.html:1 #: templates/web/emptyhomes/static/about-en-gb.html:3 msgid "About us" @@ -333,6 +335,8 @@ msgstr "Amdanom ni" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -340,7 +344,8 @@ msgstr "Amdanom ni" msgid "Action Scheduled" msgstr "Action Scheduled" -#: templates/web/default/admin/bodies.html:47 +#: templates/web/default/admin/bodies.html:53 +#: templates/web/default/admin/bodies.html:57 #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" @@ -441,12 +446,12 @@ msgid "An update marked this empty property as returned to use." msgstr "Fe wnaeth diweddariad gofnodi bod yr eiddo hwn wedi cael ei adfer i'w ddefnyddio." #: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/problem_row.html:14 +#: templates/web/default/admin/problem_row.html:20 msgid "Anonymous" msgstr "Di-enw" -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonymous:" @@ -469,30 +474,30 @@ msgstr "Are you from a council?" msgid "Area covered" msgstr "Area covered" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:124 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "Assign to different category:" -#: templates/web/zurich/admin/report_edit.html:127 +#: templates/web/zurich/admin/report_edit.html:133 msgid "Assign to external body:" msgstr "Assign to external body:" -#: templates/web/zurich/admin/report_edit.html:107 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:113 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Assign to subdivision:" msgstr "Assign to subdivision:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:99 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Assigned to %s" -#: templates/web/default/open311/index.html:17 +#: templates/web/default/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." -#: templates/web/default/open311/index.html:9 +#: templates/web/default/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "At the moment only searching for and looking at reports work." @@ -513,8 +518,8 @@ msgstr "Ban email address" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "Be sure to choose the right category, because we use that to determine to whom the report is sent." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:208 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -567,16 +572,16 @@ msgstr "Category fix rate for empty properties > 4 weeks old" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:61 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/report_edit.html:123 msgid "Category:" msgstr "Categori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "Category: %s" msgstr "Category: %s" @@ -586,22 +591,23 @@ msgstr "Category: %s" msgid "Change Password" msgstr "Change Password" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/default/js/translation_strings.html:41 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:76 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:90 -#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit.html:98 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -615,7 +621,7 @@ msgstr "Closed by council" msgid "Closed reports" msgstr "Closed reports" -#: templates/web/default/admin/problem_row.html:32 +#: templates/web/default/admin/problem_row.html:38 msgid "Closed:" msgstr "Closed:" @@ -624,9 +630,9 @@ msgstr "Closed:" msgid "Closest nearby empty properties <small>(within %skm)</small>" msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Co-ordinates:" msgstr "Co-ordinates:" @@ -634,17 +640,17 @@ msgstr "Co-ordinates:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/default/admin/report_edit.html:50 -#: templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:75 +#: templates/web/default/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Cobrand data:" -#: templates/web/default/admin/report_edit.html:49 -#: templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:74 +#: templates/web/default/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Configuration updated - contacts will be generated automatically later" @@ -691,8 +697,8 @@ msgstr "Confirmed" msgid "Confirmed reports between %s and %s" msgstr "Confirmed reports between %s and %s" -#: templates/web/default/admin/problem_row.html:30 -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/problem_row.html:36 +#: templates/web/default/admin/report_edit.html:70 msgid "Confirmed:" msgstr "Confirmed:" @@ -717,12 +723,12 @@ msgstr "Cysylltwch â Ni" #: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 -#: templates/web/fixmystreet/contact/index.html:7 +#: templates/web/fixmystreet/contact/index.html:19 msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1265 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1293 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 msgid "Could not find user" msgstr "Could not find user" @@ -761,15 +767,15 @@ msgid "Create category" msgstr "Create category" #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/problem_row.html:34 #: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Created" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:45 +#: templates/web/default/admin/report_edit.html:69 +#: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 -#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Created:" @@ -808,12 +814,12 @@ msgstr "Description" msgid "Details" msgstr "Manylion" -#: templates/web/default/admin/report_edit.html:14 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:25 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:36 msgid "Details:" msgstr "Manylion:" @@ -843,6 +849,8 @@ msgstr "Ddim yn gwybod" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -850,10 +858,10 @@ msgstr "Ddim yn gwybod" msgid "Duplicate" msgstr "Duplicate" -#: templates/web/default/admin/list_updates.html:36 -#: templates/web/default/admin/problem_row.html:35 +#: templates/web/default/admin/list_updates.html:42 +#: templates/web/default/admin/problem_row.html:41 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:36 +#: templates/web/zurich/admin/problem_row.html:44 msgid "Edit" msgstr "Edit" @@ -866,7 +874,7 @@ msgstr "Edit body details" #: templates/web/zurich/admin/report_edit-sdm.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:4 +#: templates/web/zurich/admin/report_edit.html:5 msgid "Editing empty property %d" msgstr "Editing empty property %d" @@ -900,11 +908,11 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1241 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 msgid "Email added to abuse list" msgstr "Email added to abuse list" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 msgid "Email already in abuse list" msgstr "Email already in abuse list" @@ -918,30 +926,30 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:42 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:67 +#: templates/web/default/admin/update_edit.html:33 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit.html:58 msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty flat or maisonette" msgstr "Fflat neu fflat deulawr gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty house or bungalow" msgstr "Tŷ neu fyngalo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 msgid "Empty office or other commercial" msgstr "Swyddfa wag neu fan masnachol gwag arall" @@ -949,11 +957,11 @@ msgstr "Swyddfa wag neu fan masnachol gwag arall" msgid "Empty property details form" msgstr "Ffurflen manylion eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Empty pub or bar" msgstr "Tafarn neu far gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." @@ -973,7 +981,7 @@ msgstr "End month:" msgid "Endpoint" msgstr "Endpoint" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:29 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 msgid "Enter a Zürich street name" msgstr "Enter a Zürich street name" @@ -1028,11 +1036,11 @@ msgstr "Gwall" msgid "Example postcode %s" msgstr "Example postcode %s" -#: templates/web/default/open311/index.html:27 +#: templates/web/default/open311/index.html:96 msgid "Examples:" msgstr "Examples:" -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:76 msgid "Extra data:" msgstr "Extra data:" @@ -1041,8 +1049,8 @@ msgstr "Extra data:" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." -#: templates/web/zurich/admin/index-dm.html:32 -#: templates/web/zurich/admin/index-sdm.html:29 +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" msgstr "Filter report list" @@ -1104,8 +1112,9 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1116,13 +1125,13 @@ msgstr "" msgid "Fixed" msgstr "Fixed" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "Fixed - Council" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:42 msgid "Fixed - User" msgstr "Fixed - User" @@ -1130,7 +1139,7 @@ msgstr "Fixed - User" msgid "Fixed reports" msgstr "Fixed reports" -#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/problem_row.html:37 msgid "Fixed:" msgstr "Fixed:" @@ -1138,12 +1147,12 @@ msgstr "Fixed:" msgid "Flag user" msgstr "Flag user" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flagged" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:78 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Flagged:" @@ -1153,7 +1162,7 @@ msgstr "Flagged:" msgid "Follow a ward link to view only reports within that ward." msgstr "Follow a ward link to view only reports within that ward." -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "For council(s):" msgstr "For council(s):" @@ -1167,6 +1176,7 @@ msgstr "Forgotten your password?" #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmindelo/faq/faq-pt-cv.html:1 #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 @@ -1174,11 +1184,12 @@ msgstr "Forgotten your password?" msgid "Frequently Asked Questions" msgstr "Cwestiynau Cyffredin" -#: templates/web/default/open311/index.html:69 +#: templates/web/default/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "GeoRSS on Google Maps" #: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/around/_updates.html:3 #: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "Get updates" @@ -1207,7 +1218,7 @@ msgstr "Rhowch borthiant RSS i mi" msgid "Go" msgstr "Ewch" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "Going to send questionnaire?" @@ -1216,7 +1227,6 @@ msgid "Graph of empty property creation by status over time" msgstr "Graph of empty property creation by status over time" #: templates/web/default/reports/index.html:8 -#: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "Mae'r llinellau mewn llwyd yn gynghorau nad ydynt yn bodoli mwyach." @@ -1263,13 +1273,14 @@ msgstr "Dyma'r mathau o hysbysiadau am eiddo gwag lleol ar gyfer ‘%s&rsquo msgid "Hi %s" msgstr "Hi %s" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:91 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1299,7 +1310,7 @@ msgstr "Sut i roi gwybod am eiddo gwag" msgid "How to send successful reports" msgstr "How to send successful reports" -#: perllib/FixMyStreet/App/Controller/Admin.pm:700 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "I am afraid you cannot confirm unconfirmed reports." @@ -1385,17 +1396,17 @@ msgstr "Dewis porthiant annilys" msgid "In Progress" msgstr "In Progress" -#: templates/web/default/open311/index.html:21 +#: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:79 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:94 +#: templates/web/zurich/admin/report_edit.html:100 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In progress" @@ -1404,7 +1415,7 @@ msgstr "In progress" msgid "Incident Category" msgstr "Incident Category" -#: templates/web/zurich/admin/report_edit.html:137 +#: templates/web/zurich/admin/report_edit.html:143 msgid "Include reporter personal details" msgstr "Include reporter personal details" @@ -1412,35 +1423,41 @@ msgstr "Include reporter personal details" msgid "Include unconfirmed reports" msgstr "Include unconfirmed reports" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "Incorrect has_photo value \"%s\"" -#: templates/web/zurich/admin/report_edit-sdm.html:56 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:82 msgid "Internal notes:" msgstr "Internal notes:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:48 +#, fuzzy +msgid "Internal referral" +msgstr "Internal notes:" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "Invalid agency_responsible value %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1052 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 msgid "Invalid end date" msgstr "Invalid end date" -#: perllib/FixMyStreet/App/Controller/Open311.pm:424 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "Invalid format %s specified." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 msgid "Invalid start date" msgstr "Invalid start date" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1481,11 +1498,11 @@ msgstr "Last Name" msgid "Last editor" msgstr "Last editor" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:72 msgid "Last update:" msgstr "Last update:" -#: templates/web/default/admin/problem_row.html:33 +#: templates/web/default/admin/problem_row.html:39 msgid "Last update:" msgstr "Last update:" @@ -1551,7 +1568,7 @@ msgstr "MAP" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" -#: templates/web/fixmystreet/contact/index.html:86 +#: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "Message" @@ -1559,7 +1576,7 @@ msgstr "Message" msgid "Message:" msgstr "Neges:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "Missing jurisdiction_id" @@ -1583,7 +1600,7 @@ msgstr "Mwy o eiddo gwag cyfagos" #: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 -#: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:9 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmybarangay/reports/index.html:15 @@ -1601,16 +1618,16 @@ msgstr "Enw" msgid "Name (optional)" msgstr "Name (optional)" -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:66 +#: templates/web/default/admin/update_edit.html:32 #: templates/web/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:57 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Enw:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Enw: %s" @@ -1628,12 +1645,12 @@ msgstr "Nearest named road to the pin placed on the map (automatically generated msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" -#: perllib/FixMyStreet/Cobrand/Default.pm:415 -#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:458 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1650,11 +1667,11 @@ msgstr "Bron â gorffen! Nawr, ewch at eich negeseuon e-bost..." msgid "New <br>empty properties" msgstr "New <br>empty properties" -#: perllib/FixMyStreet/App/Controller/Admin.pm:249 +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 msgid "New body added" msgstr "New body added" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 msgid "New category contact added" msgstr "New category contact added" @@ -1666,7 +1683,7 @@ msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" msgid "New local reports on reportemptyhomes.com" msgstr "Adroddiadau lleol newydd ar reportemptyhomes.com" -#: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New empty property reports" @@ -1720,7 +1737,7 @@ msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com" msgid "New state" msgstr "New state" -#: templates/web/zurich/admin/report_edit-sdm.html:59 +#: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" msgstr "New update:" @@ -1738,13 +1755,13 @@ msgstr "Next" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:25 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 #: templates/web/default/questionnaire/index.html:68 @@ -1777,7 +1794,7 @@ msgstr "No flagged empty properties found" msgid "No flagged users found" msgstr "No flagged users found" -#: templates/web/zurich/admin/report_edit-sdm.html:66 +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" msgstr "No further updates" @@ -1804,14 +1821,16 @@ msgstr "No supporters" msgid "Non Public" msgstr "Non Public" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 msgid "None" msgstr "None" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1847,7 +1866,7 @@ msgstr "Note that when including unconfirmed reports we use the date the report msgid "Note:" msgstr "Note:" -#: templates/web/default/open311/index.html:6 +#: templates/web/default/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "Note: <strong>%s</strong>" @@ -1905,23 +1924,25 @@ msgstr "Adroddiadau hŷn o eiddo gwag" msgid "Older returned to use" msgstr "Wedi'u hadfer i'w defnyddio ers amser" -#: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/emptyhomes/reports/index.html:11 #: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older empty property reports" msgstr "Adroddiadau hŷn o eiddo gwag" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:83 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1931,15 +1952,15 @@ msgstr "Open" msgid "Open reports" msgstr "Open reports" -#: templates/web/default/open311/index.html:3 +#: templates/web/default/open311/index.html:72 msgid "Open311 API for the mySociety reportemptyhomes.com server" msgstr "Open311 API for the mySociety reportemptyhomes.com server" -#: templates/web/default/open311/index.html:13 +#: templates/web/default/open311/index.html:82 msgid "Open311 initiative web page" msgstr "Open311 initiative web page" -#: templates/web/default/open311/index.html:14 +#: templates/web/default/open311/index.html:83 msgid "Open311 specification" msgstr "Open311 specification" @@ -1953,15 +1974,15 @@ msgstr "Neu eiddo gwag y rhoddwyd gwybod amdanynt i:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn byw ynddo:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1046 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:588 #: perllib/FixMyStreet/DB/Result/Problem.pm:598 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Other" msgstr "Arall" @@ -1983,8 +2004,8 @@ msgstr "Page Not Found" msgid "Parent" msgstr "Parent" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 msgid "Partial" msgstr "Partial" @@ -2002,6 +2023,10 @@ msgstr "Password (optional)" msgid "Password:" msgstr "Password:" +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 @@ -2011,12 +2036,12 @@ msgstr "Password:" msgid "Phone number (optional)" msgstr "Phone number (optional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 -#: templates/web/default/admin/report_edit.html:43 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 +#: templates/web/default/admin/report_edit.html:68 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Rhif ffôn:" @@ -2026,6 +2051,8 @@ msgstr "Rhif ffôn:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" @@ -2047,15 +2074,15 @@ msgstr "Ffotograffau o adroddiadau cyfagos diweddar" msgid "Place pin on map" msgstr "Place pin on map" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 msgid "Planned" msgstr "Planned" @@ -2089,10 +2116,10 @@ msgstr "Rhowch eich cyfeiriad e-bost" msgid "Please check your email address is correct" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:852 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:871 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:914 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:917 #: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" @@ -2346,11 +2373,11 @@ msgstr "Cofnodwch a yw'r eiddo gwag wedi cael ei adfer i'w ddefnyddio, ai peidio msgid "Please take a look at the updates that have been left." msgstr "Ewch i fwrw golwg ar y diweddariadau sydd wedi cael eu gadael." -#: perllib/FixMyStreet/App/Controller/Photo.pm:172 +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 msgid "Please upload a JPEG image only" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." -#: perllib/FixMyStreet/App/Controller/Photo.pm:179 +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 msgid "Please upload a JPEG image only\n" msgstr "Please upload a JPEG image only\n" @@ -2370,7 +2397,7 @@ msgstr "Please write your update here" #: templates/web/default/report/update-form.html:109 #: templates/web/default/report/update-form.html:131 #: templates/web/default/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/contact/index.html:105 #: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/fixmystreet/report/update-form.html:71 #: templates/web/fixmystreet/report/update-form.html:95 @@ -2395,7 +2422,7 @@ msgstr "Previous" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "Private" @@ -2424,7 +2451,7 @@ msgstr "Empty property %s sent to council %s" msgid "Empty property breakdown by state" msgstr "Empty property breakdown by state" -#: perllib/FixMyStreet/App/Controller/Admin.pm:917 +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 msgid "Empty property marked as open." msgstr "Ewch i fwrw golwg " @@ -2460,15 +2487,15 @@ msgstr "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi msgid "Empty properties within %.1fkm of this location" msgstr "Empty properties within %.1fkm of this location" -#: perllib/FixMyStreet/Cobrand/Default.pm:615 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/Default.pm:626 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:228 msgid "Empty properties within %s" msgstr "Eiddo gwag yn %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:241 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:242 msgid "Empty properties within %s ward" msgstr "Eiddo gwag yn ward %s" @@ -2487,7 +2514,7 @@ msgstr "Eiddo gwag o fewn ffiniau:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael eu hadfer i'w defnyddio" -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" @@ -2507,6 +2534,11 @@ msgstr "Provide a title" msgid "Provide an update" msgstr "Rhowch ddiweddariad" +#: templates/web/fixmystreet/auth/general.html:53 +#, fuzzy +msgid "Providing a name and password is optional, but doing so will allow you to more easily report empty properties, leave updates and manage your reports." +msgstr "Providing a password is optional, but doing so will allow you to more easily report empty properties, leave updates and manage your reports." + #: templates/web/bromley/report/new/fill_in_details_form.html:180 msgid "Providing a password is optional, but doing so will allow you to more easily report future empty properties, leave updates and manage your reports." msgstr "Providing a password is optional, but doing so will allow you to more easily report future empty properties, leave updates and manage your reports." @@ -2528,17 +2560,17 @@ msgstr "Public" msgid "Public information (shown on site)" msgstr "Gwybodaeth gyhoeddus (caiff ei dangos ar y safle)" -#: templates/web/zurich/admin/report_edit.html:172 -#: templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:194 msgid "Public response:" msgstr "Public response:" -#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "Publish photo" -#: templates/web/zurich/admin/report_edit.html:196 +#: templates/web/zurich/admin/report_edit.html:202 msgid "Publish the response" msgstr "Publish the response" @@ -2578,11 +2610,11 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" msgid "RSS feed" msgstr "Porthiant RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "RSS feed for %s" msgstr "RSS feed for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed for %s ward, %s" msgstr "RSS feed for %s ward, %s" @@ -2590,11 +2622,11 @@ msgstr "RSS feed for %s ward, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 -#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "RSS feed of %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed of %s, within %s ward" @@ -2607,15 +2639,15 @@ msgstr "Porthiant RSS o eiddo gwag sydd gerllaw" msgid "RSS feed of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:616 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 -#: perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/UK.pm:235 msgid "RSS feed of empty properties within %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "RSS feed of empty properties within %s ward" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" @@ -2654,7 +2686,8 @@ msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" msgid "Recently returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" -#: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 +#: templates/web/fixmystreet/index.html:45 msgid "Recently reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" @@ -2671,13 +2704,13 @@ msgstr "Remember that, for the pilot project, FixMyBarangay is only for reportin msgid "Remove flag" msgstr "Remove flag" -#: templates/web/default/admin/report_edit.html:64 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:89 +#: templates/web/default/admin/update_edit.html:57 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Remove photo (can't be undone!)" -#: templates/web/default/index.html:9 templates/web/emptyhomes/header.html:12 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "Rhoi gwybod am eiddo gwag" @@ -2710,7 +2743,7 @@ msgstr "Report created" msgid "Report on %s" msgstr "Report on %s" -#: templates/web/default/index.html:18 +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/stevenage/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 @@ -2727,7 +2760,7 @@ msgstr "Reported %s, to %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 -#: templates/web/fixmystreet/contact/index.html:46 +#: templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddi-enw am %s" @@ -2743,7 +2776,7 @@ msgstr "Adroddwyd gan %s yn ddi-enw am %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 -#: templates/web/fixmystreet/contact/index.html:48 +#: templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -2787,8 +2820,8 @@ msgstr "Adroddwyd yn y categori %s gan %s am %s" msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:198 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:201 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2810,7 +2843,7 @@ msgstr "Adroddiadau ar ac yng nghyffiniau'r map" msgid "Reports published" msgstr "Reports published" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Resend report" msgstr "Resend report" @@ -2826,16 +2859,16 @@ msgstr "Road operator for this named road (derived from road reference number an msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Road operator for this named road (from OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1343 -#: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: templates/web/default/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Left" msgstr "Rotate Left" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: templates/web/default/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:75 msgid "Rotate Right" msgstr "Rotate Right" @@ -2882,11 +2915,11 @@ msgstr "Dewiswch y math o hysbysiad yr hoffech ei gael a chliciwch y botwm ar gy msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Sent:" msgstr "Sent:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:73 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Service:" @@ -2987,7 +3020,7 @@ msgstr "Sorry, that appears to be a Crown dependency postcode, which we don't co msgid "Sorry, there has been an error confirming your empty property." msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 #: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 #: perllib/FixMyStreet/Geocode/Google.pm:74 #: perllib/FixMyStreet/Geocode/OSM.pm:66 @@ -3025,17 +3058,17 @@ msgstr "Start month:" msgid "State" msgstr "State" -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/update_edit.html:21 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:54 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "State:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1138 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:213 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:216 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -3051,7 +3084,7 @@ msgstr "Status" msgid "Still open, via questionnaire, %s" msgstr "Still open, via questionnaire, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 msgid "Subcategory: %s" msgstr "Subcategory: %s" @@ -3060,16 +3093,16 @@ msgid "Subdivision/Body" msgstr "Subdivision/Body" #: templates/web/bromley/report/new/fill_in_details_form.html:48 -#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/contact/index.html:91 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "Subject" -#: templates/web/default/admin/report_edit.html:13 +#: templates/web/default/admin/report_edit.html:19 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:34 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Subject:" msgstr "Pwnc:" @@ -3089,11 +3122,11 @@ msgstr "Pwnc:" msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:67 -#: templates/web/default/admin/update_edit.html:54 +#: templates/web/default/admin/report_edit.html:92 +#: templates/web/default/admin/update_edit.html:60 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:65 -#: templates/web/zurich/admin/report_edit.html:198 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:204 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Submit changes" @@ -3103,14 +3136,14 @@ msgstr "Submit changes" msgid "Submit questionnaire" msgstr "Anfon yr holiadur" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:88 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 msgid "Submitted" @@ -3134,8 +3167,8 @@ msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "Subscribe to an alert based upon what baranagay you’re in:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:200 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3154,7 +3187,7 @@ msgstr "Summary" msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 msgid "Survey" msgstr "Survey" @@ -3171,7 +3204,7 @@ msgstr "Text" msgid "Text only version" msgstr "Text only version" -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/update_edit.html:20 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "Text:" @@ -3225,7 +3258,7 @@ msgstr "Diolch am eich adborth. Byddwn yn eich ateb cyn gynted ag y gallwn!" msgid "Thanks, glad to hear it's been returned to use! Could we just ask if you have ever reported an empty property to a council before?" msgstr "Diolch, falch o glywed ei fod wedi cael ei adfer i'w ddefnyddio! Fyddai modd i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag cyn hyn?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:186 +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Nid yw'n ymddangos bod y ddelwedd honno wedi llwytho i fyny'n gywir (%s), rhowch gynnig arni eto." @@ -3242,7 +3275,7 @@ msgstr "That location does not appear to be in the UK; please try again." msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:683 msgid "That empty property will now be resent." msgstr "That empty property will now be resent." @@ -3254,7 +3287,7 @@ msgstr "That report cannot be viewed on %s." msgid "That report has been removed from reportemptyhomes.com." msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com" -#: templates/web/default/open311/index.html:23 +#: templates/web/default/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the empty property report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "The Open311 v2 attribute agency_responsible is used to list the administrations that received the empty property report, which is not quite the way the attribute is defined in the Open311 v2 specification." @@ -3277,11 +3310,11 @@ msgid "The details of your empty property are available on the right hand side o msgstr "Mae manylion eich eiddo gwag ar gael ar ochr dde'r dudalen hon." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:67 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "The error was: %s" -#: templates/web/default/open311/index.html:19 +#: templates/web/default/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." @@ -3358,11 +3391,11 @@ msgstr "Yr hysbysiad symlaf yw ein hysbysiad daearyddol:" msgid "The subject and details of the empty property will be public, plus your name if you give us permission." msgstr "The subject and details of the empty property will be public, plus your name if you give us permission." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "The user could not locate the empty property on a map, but to see the area around the location they entered" msgstr "Ni allai'r defnyddiwr leoli'r eiddo gwag ar fap, ond i weld yr ardal o gwmpas y lleoliad a gofnodwyd ganddynt " -#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was an empty property showing the All Reports page. Please try again later." msgstr "There was an empty property showing the All Reports page. Please try again later." @@ -3371,7 +3404,7 @@ msgstr "There was an empty property showing the All Reports page. Please try aga msgid "There was an empty property showing this page. Please try again later." msgstr "There was an empty property showing this page. Please try again later." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3396,20 +3429,20 @@ msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod." msgid "There were problems with your update. Please see below." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" -#: templates/web/default/open311/index.html:10 +#: templates/web/default/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 msgid "This email has been sent to both councils covering the location of the empty property, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of empty property this is so we can add it to our system." msgstr "This email has been sent to both councils covering the location of the empty property, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of empty property this is so we can add it to our system." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 msgid "This email has been sent to several councils covering the location of the empty property, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "This email has been sent to several councils covering the location of the empty property, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Mae’r wybodaeth hon yn ofynnol" @@ -3422,8 +3455,12 @@ msgstr "This is a developer site; things might break at any time, and the databa msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." msgstr "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." -#: templates/web/default/reports/index.html:7 #: templates/web/emptyhomes/reports/index.html:4 +#, fuzzy +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." +msgstr "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i weld yr adroddiadau a anfonwyd ato." + +#: templates/web/default/reports/index.html:7 #: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." @@ -3459,8 +3496,8 @@ msgstr "This empty property is in progress" msgid "This empty property is old and of unknown status." msgstr "Mae'r eiddo gwag hwn yn hen ac nid yw ei statws yn hysbys." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "This report is awaiting moderation." @@ -3477,15 +3514,15 @@ msgstr "This report is currently marked as returned to use." msgid "This report is currently marked as open." msgstr "This report is currently marked as open." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "Cyflwynwyd yr adroddiad hwn yn ddi-enw" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 msgid "This web page also contains a photo of the empty property, provided by the user." msgstr "Mae'r dudalen we hon hefyd yn cynnwys ffotograff o'r eiddo gwag, wedi'i ddarparu gan y defnyddiwr." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Timeline" @@ -3503,7 +3540,7 @@ msgstr "I <strong> roi gwybod am broblem</strong>, cliciwch ar y lleoliad cywir msgid "To find out what local alerts we have in your area, council or ward, please enter your postcode or street name and area" msgstr "To find out what local alerts we have in your area, council or ward, please enter your postcode or street name and area" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 msgid "To view a map of the precise location of this issue" msgstr "Gweld map o union leoliad y broblem hon" @@ -3525,6 +3562,8 @@ msgstr "Try again" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3532,11 +3571,11 @@ msgstr "Try again" msgid "Unable to fix" msgstr "Unable to fix" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:59 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Unconfirmed" @@ -3567,12 +3606,12 @@ msgid "Update %s created for empty property %d; by %s" msgstr "Update %s created for empty property %d; by %s" #: templates/web/default/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:22 +#: templates/web/fixmystreet/contact/index.html:34 msgid "Update below added anonymously at %s" msgstr "Update below added anonymously at %s" #: templates/web/default/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:24 +#: templates/web/fixmystreet/contact/index.html:36 msgid "Update below added by %s at %s" msgstr "Update below added by %s at %s" @@ -3589,16 +3628,16 @@ msgstr "Update breakdown by state" msgid "Update by {{name}}" msgstr "Diweddariadau yn ôl {{name}}" -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed empty property state to %s" msgstr "Update changed empty property state to %s" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/default/admin/update_edit.html:44 msgid "Update marked empty property as returned to use" msgstr "Update marked empty property as returned to use" -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/update_edit.html:46 msgid "Update reopened empty property" msgstr "Update reopened empty property" @@ -3616,12 +3655,12 @@ msgstr "Diweddariad:" msgid "Updated" msgstr "Updated" -#: perllib/FixMyStreet/App/Controller/Admin.pm:763 -#: perllib/FixMyStreet/App/Controller/Admin.pm:907 -#: perllib/FixMyStreet/App/Controller/Admin.pm:960 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:485 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:972 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:488 msgid "Updated!" msgstr "Updated!" @@ -3650,30 +3689,30 @@ msgstr "Diweddariadau am {{title}}" msgid "Updates to this empty property, reportemptyhomes.com" msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "User flag removed" msgstr "User flag removed" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 msgid "User flagged" msgstr "User flagged" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:215 #: templates/web/default/admin/flagged.html:24 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Users" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "Values updated" msgstr "Values updated" -#: templates/web/default/admin/report_edit.html:12 -#: templates/web/default/admin/update_edit.html:12 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:23 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "View report on site" @@ -3736,7 +3775,7 @@ msgstr "We never show your email" msgid "We never show your email address or phone number." msgstr "We never show your email address or phone number." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 msgid "We realise this empty property might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "We realise this empty property might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." @@ -3772,15 +3811,15 @@ msgstr "Byddai'n dda gennym glywed eich barn am y wefan hon. Llenwch y ffurflen, msgid "When edited" msgstr "When edited" -#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/problem_row.html:35 msgid "When sent" msgstr "When sent" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Whole block of empty flats" msgstr "Bloc cyfan o fflatiau gwag" -#: templates/web/default/open311/index.html:25 +#: templates/web/default/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." @@ -3814,13 +3853,13 @@ msgstr "Year" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:63 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:109 @@ -3838,12 +3877,12 @@ msgid "Yes I have a password" msgstr "Yes I have a password" #: templates/web/default/contact/index.html:37 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/fixmystreet/contact/index.html:50 msgid "You are reporting the following empty property report for being abusive, containing personal information, or similar:" msgstr "Rydych yn cwyno am yr adroddiad canlynol am eiddo gwag gan ei fod yn sarhaus, neu'n cynnwys gwybodaeth bersonol, neu debyg:" #: templates/web/default/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:16 +#: templates/web/fixmystreet/contact/index.html:28 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "You are reporting the following update for being abusive, containing personal information, or similar:" @@ -3927,7 +3966,7 @@ msgstr "You have successfully created your alert." msgid "You have successfully deleted your alert." msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "You have successfully signed in; please check and confirm your details are accurate:" @@ -3936,7 +3975,7 @@ msgstr "You have successfully signed in; please check and confirm your details a msgid "You must now click the link in the email we've just sent you." msgstr "Rhaid i chi nawr glicio ar y ddolen yn y neges e-bost rydym newydd ei hanfon atoch chi." -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "You really want to resend?" @@ -3953,7 +3992,7 @@ msgstr "Your Reports" #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/contact/index.html:84 #: templates/web/fixmystreet/report/display.html:65 #: templates/web/fixmystreet/report/display.html:67 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 @@ -4004,7 +4043,7 @@ msgid "Your last name" msgstr "Your last name" #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/contact/index.html:77 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 @@ -4085,16 +4124,12 @@ msgstr "cyngor" msgid "council ref: %s" msgstr "council ref: %s" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "didn't use map" msgstr "didn't use map" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 -msgid "duplicate report" -msgstr "duplicate report" - #: templates/web/default/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 #: templates/web/seesomething/around/postcode_form.html:9 @@ -4115,28 +4150,62 @@ msgstr "last updated %s" msgid "less than a minute" msgstr "llai na munud" -#: templates/web/default/report/updates.html:38 -msgid "marked as %s" +#: templates/web/default/report/updates.html:57 +#, fuzzy +msgid "marked as a duplicate report" +msgstr "duplicate report" + +#: templates/web/default/report/updates.html:47 +#, fuzzy +msgid "marked as action scheduled" +msgstr "Action Scheduled" + +#: templates/web/default/report/updates.html:59 +#, fuzzy +msgid "marked as an internal referral" +msgstr "Internal notes:" + +#: templates/web/default/report/updates.html:49 +#, fuzzy +msgid "marked as closed" msgstr "marked as %s" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:28 +#: templates/web/default/report/updates.html:51 msgid "marked as returned to use" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" +#: templates/web/default/report/updates.html:45 +#, fuzzy +msgid "marked as in progress" +msgstr "marked as %s" + +#: templates/web/default/report/updates.html:41 +#, fuzzy +msgid "marked as investigating" +msgstr "Investigating" + +#: templates/web/default/report/updates.html:55 +#, fuzzy +msgid "marked as not the council's responsibility" +msgstr "not the council's responsibility" + +#: templates/web/default/report/updates.html:43 +#, fuzzy +msgid "marked as planned" +msgstr "marked as %s" + +#: templates/web/default/report/updates.html:53 +#, fuzzy +msgid "marked as unable to fix" +msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" + #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "n/a" -#: templates/web/default/report/updates.html:32 -msgid "no further action" -msgstr "unrhyw gamau pellach" - -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 -msgid "not the council's responsibility" -msgstr "not the council's responsibility" - #: templates/web/default/alert/_list.html:87 #: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 @@ -4147,27 +4216,27 @@ msgstr "neu" msgid "or locate me automatically" msgstr "neu dewch o hyd i mi’n awtomatig" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:27 -#: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:38 -#: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:50 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:53 msgid "originally entered: “%s”" msgstr "originally entered: “%s”" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "other areas:" msgstr "other areas:" -#: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:36 +#: templates/web/default/report/updates.html:29 +#: templates/web/default/report/updates.html:39 msgid "reopened" msgstr "wedi'i ailagor" @@ -4197,11 +4266,7 @@ msgstr "y cyngor lleol" msgid "there is no pin shown as the user did not use the map" msgstr "there is no pin shown as the user did not use the map" -#: templates/web/default/report/updates.html:33 -msgid "third party responsibility" -msgstr "third party responsibility" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 msgid "this type of local empty property" msgstr "math hwn o eiddo gwag lleol" @@ -4209,17 +4274,17 @@ msgstr "math hwn o eiddo gwag lleol" msgid "today" msgstr "heddiw" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "used map" msgstr "used map" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:35 msgid "user is from same council as empty property - %d" msgstr "user is from same council as empty property - %d" -#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/update_edit.html:38 msgid "user is empty property owner" msgstr "user is empty property owner" @@ -4305,6 +4370,12 @@ msgid_plural "%d days" msgstr[0] "%d diwrnod" msgstr[1] "%d diwrnod" +#~ msgid "no further action" +#~ msgstr "unrhyw gamau pellach" + +#~ msgid "third party responsibility" +#~ msgstr "third party responsibility" + #, fuzzy #~ msgid "All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the empty property, plus your name if you give us permission." #~ msgstr "" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index 1e17fa9b4..05a9f1581 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-04-24 08:59+0100\n" +"POT-Creation-Date: 2013-09-05 17:39+0100\n" "PO-Revision-Date: 2013-06-03 11:59+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid " and " msgstr "und" @@ -38,7 +38,7 @@ msgstr "" msgid " or " msgstr "oder" -#: templates/web/default/admin/bodies.html:32 +#: templates/web/default/admin/bodies.html:36 msgid "%d addresses" msgstr "%d Adressen" @@ -76,7 +76,7 @@ msgstr "Alle Meldungen" msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "%s ward, %s" msgstr "" @@ -84,7 +84,7 @@ msgstr "" msgid "%s, reported at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "%s, within %s ward" msgstr "" @@ -129,7 +129,7 @@ msgstr "(beantwortet)" msgid "(fixed)" msgstr "(beantwortet)" -#: templates/web/default/index.html:11 templates/web/default/index.html:15 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" @@ -158,13 +158,13 @@ msgstr "(Ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)" msgid "(we never show your email)" msgstr "(Ihre E-Mail Adresse wird nie angezeigt)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 #: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "" @@ -286,6 +286,8 @@ msgstr "Passwort" #: templates/web/default/static/about-en-gb.html:1 #: templates/web/default/static/about-en-gb.html:3 #: templates/web/emptyhomes/header.html:34 +#: templates/web/emptyhomes/static/about-cy.html:1 +#: templates/web/emptyhomes/static/about-cy.html:3 #: templates/web/emptyhomes/static/about-en-gb.html:1 #: templates/web/emptyhomes/static/about-en-gb.html:3 msgid "About us" @@ -293,6 +295,8 @@ msgstr "Über uns" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -300,7 +304,8 @@ msgstr "Über uns" msgid "Action Scheduled" msgstr "" -#: templates/web/default/admin/bodies.html:47 +#: templates/web/default/admin/bodies.html:53 +#: templates/web/default/admin/bodies.html:57 #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" @@ -401,12 +406,12 @@ msgid "An update marked this problem as fixed." msgstr "" #: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/problem_row.html:14 +#: templates/web/default/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonym:" @@ -429,30 +434,30 @@ msgstr "" msgid "Area covered" msgstr "Gebiet" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:124 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "Einer anderen Kategorie (DA) zuweisen:" -#: templates/web/zurich/admin/report_edit.html:127 +#: templates/web/zurich/admin/report_edit.html:133 msgid "Assign to external body:" msgstr "Einer externen Stelle zuweisen:" -#: templates/web/zurich/admin/report_edit.html:107 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:113 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Assign to subdivision:" msgstr "An Fachbereich zuweisen:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:99 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Besten Dank für Ihre Meldung. Wir haben Ihr Anliegen an %s weitergeleitet, da es nicht in den Zuständigkeitsbereich der am Pilot beteiligten Fachbereiche fällt.<br/>Freundliche Grüsse <br/>Ihre Stadt Zürich" -#: templates/web/default/open311/index.html:17 +#: templates/web/default/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/default/open311/index.html:9 +#: templates/web/default/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "" @@ -473,8 +478,8 @@ msgstr "" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:208 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -527,16 +532,16 @@ msgstr "" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:61 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/report_edit.html:123 msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "Category: %s" msgstr "Kategorie: %s" @@ -546,22 +551,23 @@ msgstr "Kategorie: %s" msgid "Change Password" msgstr "Passwort ändern" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/default/js/translation_strings.html:41 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Mangel lokalisieren" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:76 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:90 -#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit.html:98 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -575,7 +581,7 @@ msgstr "" msgid "Closed reports" msgstr "" -#: templates/web/default/admin/problem_row.html:32 +#: templates/web/default/admin/problem_row.html:38 msgid "Closed:" msgstr "Beantwortet:" @@ -584,9 +590,9 @@ msgstr "Beantwortet:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Co-ordinates:" msgstr "Koordinaten:" @@ -594,17 +600,17 @@ msgstr "Koordinaten:" msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:50 -#: templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:75 +#: templates/web/default/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:49 -#: templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:74 +#: templates/web/default/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Aktualisiert" @@ -651,8 +657,8 @@ msgstr "Bestätigt" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/default/admin/problem_row.html:30 -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/problem_row.html:36 +#: templates/web/default/admin/report_edit.html:70 msgid "Confirmed:" msgstr "Bestätigt:" @@ -677,12 +683,12 @@ msgstr "" #: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 -#: templates/web/fixmystreet/contact/index.html:7 +#: templates/web/fixmystreet/contact/index.html:19 msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1265 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1293 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 msgid "Could not find user" msgstr "" @@ -721,15 +727,15 @@ msgid "Create category" msgstr "" #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/problem_row.html:34 #: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Erstellt" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:45 +#: templates/web/default/admin/report_edit.html:69 +#: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 -#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Erstellt:" @@ -768,12 +774,12 @@ msgstr "Beschreibung" msgid "Details" msgstr "Beschreibung" -#: templates/web/default/admin/report_edit.html:14 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:25 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:36 msgid "Details:" msgstr "Beschreibung:" @@ -803,6 +809,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -810,10 +818,10 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 -#: templates/web/default/admin/problem_row.html:35 +#: templates/web/default/admin/list_updates.html:42 +#: templates/web/default/admin/problem_row.html:41 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:36 +#: templates/web/zurich/admin/problem_row.html:44 msgid "Edit" msgstr "" @@ -826,7 +834,7 @@ msgstr "Details editieren" #: templates/web/zurich/admin/report_edit-sdm.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:4 +#: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Meldung %d bearbeiten" @@ -860,11 +868,11 @@ msgstr "" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1241 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 msgid "Email already in abuse list" msgstr "" @@ -878,30 +886,30 @@ msgstr "Schicken Sie mir Aktualisierungen" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:42 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:67 +#: templates/web/default/admin/update_edit.html:33 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit.html:58 msgid "Email:" msgstr "E-mail:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "E-mail:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 msgid "Empty office or other commercial" msgstr "" @@ -909,11 +917,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -933,7 +941,7 @@ msgstr "" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:29 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 msgid "Enter a Zürich street name" msgstr "Ungefähre Adresse des Mangels" @@ -988,11 +996,11 @@ msgstr "Fehler" msgid "Example postcode %s" msgstr "Beispieladresse" -#: templates/web/default/open311/index.html:27 +#: templates/web/default/open311/index.html:96 msgid "Examples:" msgstr "Beispiele:" -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:76 msgid "Extra data:" msgstr "" @@ -1001,8 +1009,8 @@ msgstr "" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "" -#: templates/web/zurich/admin/index-dm.html:32 -#: templates/web/zurich/admin/index-sdm.html:29 +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" msgstr "Alle Meldungen" @@ -1055,8 +1063,9 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1067,13 +1076,13 @@ msgstr "" msgid "Fixed" msgstr "Beantwortet" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:42 msgid "Fixed - User" msgstr "" @@ -1081,7 +1090,7 @@ msgstr "" msgid "Fixed reports" msgstr "" -#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/problem_row.html:37 msgid "Fixed:" msgstr "" @@ -1089,12 +1098,12 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:78 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -1104,7 +1113,7 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "For council(s):" msgstr "" @@ -1118,6 +1127,7 @@ msgstr "Ihr Passwort" #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmindelo/faq/faq-pt-cv.html:1 #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 @@ -1125,11 +1135,12 @@ msgstr "Ihr Passwort" msgid "Frequently Asked Questions" msgstr "Hilfe" -#: templates/web/default/open311/index.html:69 +#: templates/web/default/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "" #: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/around/_updates.html:3 #: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "" @@ -1158,7 +1169,7 @@ msgstr "" msgid "Go" msgstr "Los" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "" @@ -1167,7 +1178,6 @@ msgid "Graph of problem creation by status over time" msgstr "Grafik der Meldungen nach Status und Zeit" #: templates/web/default/reports/index.html:8 -#: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "" @@ -1214,13 +1224,14 @@ msgstr "" msgid "Hi %s" msgstr "Hallo %s" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:91 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1250,7 +1261,7 @@ msgstr "Erfassen Sie eine neue Meldung:" msgid "How to send successful reports" msgstr "Anleitung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:700 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1329,17 +1340,17 @@ msgstr "" msgid "In Progress" msgstr "In Bearbeitung" -#: templates/web/default/open311/index.html:21 +#: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:79 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:94 +#: templates/web/zurich/admin/report_edit.html:100 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In Bearbeitung" @@ -1348,7 +1359,7 @@ msgstr "In Bearbeitung" msgid "Incident Category" msgstr "Kategorie" -#: templates/web/zurich/admin/report_edit.html:137 +#: templates/web/zurich/admin/report_edit.html:143 msgid "Include reporter personal details" msgstr "Persönliche Angaben des Meldenden mitsenden" @@ -1356,35 +1367,41 @@ msgstr "Persönliche Angaben des Meldenden mitsenden" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:56 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:82 msgid "Internal notes:" msgstr "Interne Notizen" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:48 +#, fuzzy +msgid "Internal referral" +msgstr "Interne Notizen" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1052 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" -#: perllib/FixMyStreet/App/Controller/Open311.pm:424 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1423,11 +1440,11 @@ msgstr "Letzte Bearbeitung" msgid "Last editor" msgstr "Letzter Bearbeiter" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:72 msgid "Last update:" msgstr "Letzte Bearbeitung" -#: templates/web/default/admin/problem_row.html:33 +#: templates/web/default/admin/problem_row.html:39 msgid "Last update:" msgstr "Letzte Bearbeitung" @@ -1493,7 +1510,7 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "" -#: templates/web/fixmystreet/contact/index.html:86 +#: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "Nachricht" @@ -1501,7 +1518,7 @@ msgstr "Nachricht" msgid "Message:" msgstr "Nachricht:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "" @@ -1525,7 +1542,7 @@ msgstr "Meldungen in der Nähe" #: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 -#: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:9 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmybarangay/reports/index.html:15 @@ -1543,16 +1560,16 @@ msgstr "Name" msgid "Name (optional)" msgstr "(optional)" -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:66 +#: templates/web/default/admin/update_edit.html:32 #: templates/web/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:57 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Name:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Name: %s" @@ -1570,12 +1587,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:415 -#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:458 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1590,11 +1607,11 @@ msgstr "Fast Fertig! Bitte checken Sie Ihre Mailbox..." msgid "New <br>problems" msgstr "Neue <br>Meldungen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:249 +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 msgid "New body added" msgstr "Neue Organisation hinzugefügt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 msgid "New category contact added" msgstr "" @@ -1606,7 +1623,7 @@ msgstr "" msgid "New local reports on reportemptyhomes.com" msgstr "" -#: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New problems" @@ -1660,7 +1677,7 @@ msgstr "" msgid "New state" msgstr "Neuer Status" -#: templates/web/zurich/admin/report_edit-sdm.html:59 +#: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" msgstr "Neue Antwort" @@ -1678,13 +1695,13 @@ msgstr "Weiter" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:25 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 #: templates/web/default/questionnaire/index.html:68 @@ -1717,7 +1734,7 @@ msgstr "" msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:66 +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" msgstr "Bearbeitung abschliessen" @@ -1744,14 +1761,16 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 msgid "None" msgstr "Keine" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1787,7 +1806,7 @@ msgstr "" msgid "Note:" msgstr "" -#: templates/web/default/open311/index.html:6 +#: templates/web/default/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "" @@ -1845,23 +1864,25 @@ msgstr "" msgid "Older fixed" msgstr "" -#: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/emptyhomes/reports/index.html:11 #: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:83 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1871,15 +1892,15 @@ msgstr "Aufgenommen" msgid "Open reports" msgstr "Offene Meldungen" -#: templates/web/default/open311/index.html:3 +#: templates/web/default/open311/index.html:72 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/default/open311/index.html:13 +#: templates/web/default/open311/index.html:82 msgid "Open311 initiative web page" msgstr "" -#: templates/web/default/open311/index.html:14 +#: templates/web/default/open311/index.html:83 msgid "Open311 specification" msgstr "" @@ -1893,15 +1914,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1046 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:588 #: perllib/FixMyStreet/DB/Result/Problem.pm:598 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Other" msgstr "" @@ -1923,8 +1944,8 @@ msgstr "" msgid "Parent" msgstr "Gehört zu" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 msgid "Partial" msgstr "" @@ -1942,6 +1963,10 @@ msgstr "Passwort" msgid "Password:" msgstr "" +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 @@ -1951,12 +1976,12 @@ msgstr "" msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 -#: templates/web/default/admin/report_edit.html:43 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 +#: templates/web/default/admin/report_edit.html:68 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonnummer:" @@ -1966,6 +1991,8 @@ msgstr "Telefonnummer:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" @@ -1987,15 +2014,15 @@ msgstr "Fotos von neuen Meldungen in der Nähe" msgid "Place pin on map" msgstr "Pin auf der Karte absetzen" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 msgid "Planned" msgstr "Rückmeldung ausstehend" @@ -2029,10 +2056,10 @@ msgstr "Bitte überprüfen Sie Ihr E-Mail" msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:852 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:871 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:914 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:917 #: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" @@ -2272,11 +2299,11 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:172 +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 msgid "Please upload a JPEG image only" msgstr "Bitte laden Sie nur JPEG Bilder hoch." -#: perllib/FixMyStreet/App/Controller/Photo.pm:179 +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 msgid "Please upload a JPEG image only\n" msgstr "Bitte laden Sie nur JPEG Bilder hoch\n" @@ -2296,7 +2323,7 @@ msgstr "" #: templates/web/default/report/update-form.html:109 #: templates/web/default/report/update-form.html:131 #: templates/web/default/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/contact/index.html:105 #: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/fixmystreet/report/update-form.html:71 #: templates/web/fixmystreet/report/update-form.html:95 @@ -2321,7 +2348,7 @@ msgstr "Zurück" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "" @@ -2350,7 +2377,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:917 +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 msgid "Problem marked as open." msgstr "" @@ -2386,15 +2413,15 @@ msgstr "Meldungen, welche kürzlich beantwortet wurden" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:615 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/Default.pm:626 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:228 msgid "Problems within %s" msgstr "Meldungen innerhalb %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:241 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:242 msgid "Problems within %s ward" msgstr "" @@ -2413,7 +2440,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 #, fuzzy msgid "Property address:" @@ -2434,6 +2461,10 @@ msgstr "" msgid "Provide an update" msgstr "Meldung aktualisieren" +#: templates/web/fixmystreet/auth/general.html:53 +msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:180 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" @@ -2455,17 +2486,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:172 -#: templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:194 msgid "Public response:" msgstr "Offizielle Antwort" -#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "Foto veröffentlichen" -#: templates/web/zurich/admin/report_edit.html:196 +#: templates/web/zurich/admin/report_edit.html:202 msgid "Publish the response" msgstr "Antwort veröffentlichen" @@ -2505,11 +2536,11 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2517,11 +2548,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 -#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2534,15 +2565,15 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:616 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 -#: perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/UK.pm:235 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2581,7 +2612,8 @@ msgstr "Kürzlich <br>beantwortet" msgid "Recently fixed" msgstr "Kürzlich beantwortet" -#: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 +#: templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Kürzlich erfasste Meldungen:" @@ -2598,13 +2630,13 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:64 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:89 +#: templates/web/default/admin/update_edit.html:57 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/default/index.html:9 templates/web/emptyhomes/header.html:12 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "" @@ -2638,7 +2670,7 @@ msgstr "Missbrauch melden" msgid "Report on %s" msgstr "" -#: templates/web/default/index.html:18 +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/stevenage/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 @@ -2655,7 +2687,7 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 -#: templates/web/fixmystreet/contact/index.html:46 +#: templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" @@ -2671,7 +2703,7 @@ msgstr "Anonym gemeldet von %s um %s " #: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 -#: templates/web/fixmystreet/contact/index.html:48 +#: templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -2715,8 +2747,8 @@ msgstr "Gemeldet in der Kategorie %s" msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:198 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:201 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2738,7 +2770,7 @@ msgstr "" msgid "Reports published" msgstr "Beantwortet" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Resend report" msgstr "" @@ -2754,16 +2786,16 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1343 -#: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: templates/web/default/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Left" msgstr "Links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: templates/web/default/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:75 msgid "Rotate Right" msgstr "Rechts drehen" @@ -2810,11 +2842,11 @@ msgstr "" msgid "Sent to %s %s later" msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Sent:" msgstr "Gesendet:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:73 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2915,7 +2947,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 #: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 #: perllib/FixMyStreet/Geocode/Google.pm:74 #: perllib/FixMyStreet/Geocode/OSM.pm:66 @@ -2953,17 +2985,17 @@ msgstr "" msgid "State" msgstr "Status" -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/update_edit.html:21 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:54 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1138 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:213 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:216 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2979,7 +3011,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 #, fuzzy msgid "Subcategory: %s" msgstr "Kategorie: %s" @@ -2989,16 +3021,16 @@ msgid "Subdivision/Body" msgstr "FB/Externe" #: templates/web/bromley/report/new/fill_in_details_form.html:48 -#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/contact/index.html:91 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "Titel" -#: templates/web/default/admin/report_edit.html:13 +#: templates/web/default/admin/report_edit.html:19 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:34 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Subject:" msgstr "Titel:" @@ -3018,11 +3050,11 @@ msgstr "Titel:" msgid "Submit" msgstr "Abschicken" -#: templates/web/default/admin/report_edit.html:67 -#: templates/web/default/admin/update_edit.html:54 +#: templates/web/default/admin/report_edit.html:92 +#: templates/web/default/admin/update_edit.html:60 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:65 -#: templates/web/zurich/admin/report_edit.html:198 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:204 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Speichern" @@ -3032,14 +3064,14 @@ msgstr "Speichern" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:88 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 msgid "Submitted" @@ -3063,8 +3095,8 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:200 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3083,7 +3115,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "Alle Meldungen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 msgid "Survey" msgstr "" @@ -3100,7 +3132,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/update_edit.html:20 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "" @@ -3145,7 +3177,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/Controller/Photo.pm:186 +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -3162,7 +3194,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:683 msgid "That problem will now be resent." msgstr "" @@ -3174,7 +3206,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/default/open311/index.html:23 +#: templates/web/default/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" @@ -3197,11 +3229,11 @@ msgid "The details of your problem are available on the right hand side of this msgstr "" #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:67 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "" -#: templates/web/default/open311/index.html:19 +#: templates/web/default/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3278,11 +3310,11 @@ msgstr "" msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3291,7 +3323,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3316,20 +3348,20 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/default/open311/index.html:10 +#: templates/web/default/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 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:891 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3342,8 +3374,11 @@ msgstr "" msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." msgstr "" -#: templates/web/default/reports/index.html:7 #: templates/web/emptyhomes/reports/index.html:4 +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." +msgstr "" + +#: templates/web/default/reports/index.html:7 #: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." @@ -3379,8 +3414,8 @@ msgstr "Dieser Mangel ist in Bearbeitung" msgid "This problem is old and of unknown status." msgstr "Dieses Problem ist alt und hat einen unbekannten Status" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Überprüfung ausstehend" @@ -3397,16 +3432,16 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 #, fuzzy msgid "This report was submitted anonymously" msgstr "%s, gemeldet um %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3424,7 +3459,7 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Geben Sie eine Adresse an" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3446,6 +3481,8 @@ msgstr "Erneut versuchen" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3453,11 +3490,11 @@ msgstr "Erneut versuchen" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:59 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Unbestätigt" @@ -3488,12 +3525,12 @@ msgid "Update %s created for problem %d; by %s" msgstr "" #: templates/web/default/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:22 +#: templates/web/fixmystreet/contact/index.html:34 msgid "Update below added anonymously at %s" msgstr "" #: templates/web/default/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:24 +#: templates/web/fixmystreet/contact/index.html:36 msgid "Update below added by %s at %s" msgstr "" @@ -3510,16 +3547,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/default/admin/update_edit.html:44 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/update_edit.html:46 msgid "Update reopened problem" msgstr "" @@ -3537,12 +3574,12 @@ msgstr "" msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:763 -#: perllib/FixMyStreet/App/Controller/Admin.pm:907 -#: perllib/FixMyStreet/App/Controller/Admin.pm:960 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:485 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:972 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:488 msgid "Updated!" msgstr "Aktualisiert!" @@ -3571,30 +3608,30 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:215 #: templates/web/default/admin/flagged.html:24 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "Values updated" msgstr "" -#: templates/web/default/admin/report_edit.html:12 -#: templates/web/default/admin/update_edit.html:12 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:23 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Meldung auf der Webseite betrachten" @@ -3658,7 +3695,7 @@ msgstr "Ihr E-Mail wird nie angezeigt" msgid "We never show your email address or phone number." msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 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 "" @@ -3691,15 +3728,15 @@ msgstr "" msgid "When edited" msgstr "Wann editiert" -#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/problem_row.html:35 msgid "When sent" msgstr "Wann gesendet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Whole block of empty flats" msgstr "" -#: templates/web/default/open311/index.html:25 +#: templates/web/default/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3733,13 +3770,13 @@ msgstr "Jahr" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:63 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:109 @@ -3757,12 +3794,12 @@ msgid "Yes I have a password" msgstr "" #: templates/web/default/contact/index.html:37 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/fixmystreet/contact/index.html:50 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" #: templates/web/default/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:16 +#: templates/web/fixmystreet/contact/index.html:28 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3846,7 +3883,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -3855,7 +3892,7 @@ msgstr "" msgid "You must now click the link in the email we've just sent you." msgstr "Sie können Ihre Meldung bestätigen, indem Sie auf den Link im E-Mail klicken." -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "" @@ -3872,7 +3909,7 @@ msgstr "Ihre Meldungen" #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/contact/index.html:84 #: templates/web/fixmystreet/report/display.html:65 #: templates/web/fixmystreet/report/display.html:67 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 @@ -3924,7 +3961,7 @@ msgid "Your last name" msgstr "Ihr Name" #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/contact/index.html:77 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 @@ -4005,17 +4042,12 @@ msgstr "" msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "didn't use map" msgstr "hat Karte nicht verwendet" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 -#, fuzzy -msgid "duplicate report" -msgstr "Erfasse eine Meldung" - #: templates/web/default/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 #: templates/web/seesomething/around/postcode_form.html:9 @@ -4036,28 +4068,60 @@ msgstr "letzte Bearbeitung %s" msgid "less than a minute" msgstr "weniger als einer Minute" -#: templates/web/default/report/updates.html:38 -msgid "marked as %s" +#: templates/web/default/report/updates.html:57 +#, fuzzy +msgid "marked as a duplicate report" +msgstr "Erfasse eine Meldung" + +#: templates/web/default/report/updates.html:47 +#, fuzzy +msgid "marked as action scheduled" +msgstr "als beantwortet markiert" + +#: templates/web/default/report/updates.html:59 +msgid "marked as an internal referral" msgstr "" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:49 +#, fuzzy +msgid "marked as closed" +msgstr "als beantwortet markiert" + +#: templates/web/default/report/updates.html:28 +#: templates/web/default/report/updates.html:51 msgid "marked as fixed" msgstr "als beantwortet markiert" +#: templates/web/default/report/updates.html:45 +#, fuzzy +msgid "marked as in progress" +msgstr "Dieser Mangel ist in Bearbeitung" + +#: templates/web/default/report/updates.html:41 +#, fuzzy +msgid "marked as investigating" +msgstr "als beantwortet markiert" + +#: templates/web/default/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "" + +#: templates/web/default/report/updates.html:43 +#, fuzzy +msgid "marked as planned" +msgstr "als beantwortet markiert" + +#: templates/web/default/report/updates.html:53 +#, fuzzy +msgid "marked as unable to fix" +msgstr "als beantwortet markiert" + #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "" -#: templates/web/default/report/updates.html:32 -msgid "no further action" -msgstr "Abschliessen" - -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 -msgid "not the council's responsibility" -msgstr "" - #: templates/web/default/alert/_list.html:87 #: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 @@ -4068,27 +4132,27 @@ msgstr "oder" msgid "or locate me automatically" msgstr "oder automatisch lokalisieren" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:27 -#: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:38 -#: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:50 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:53 msgid "originally entered: “%s”" msgstr "Originaltext: “%s”" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:36 +#: templates/web/default/report/updates.html:29 +#: templates/web/default/report/updates.html:39 msgid "reopened" msgstr "" @@ -4118,11 +4182,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "Es wird keine Stecknadel angezeigt, da der User die Karte nicht benützt hat" -#: templates/web/default/report/updates.html:33 -msgid "third party responsibility" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 msgid "this type of local problem" msgstr "" @@ -4130,17 +4190,17 @@ msgstr "" msgid "today" msgstr "heute" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "used map" msgstr "Karte verwendet" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:35 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/update_edit.html:38 msgid "user is problem owner" msgstr "" @@ -4225,6 +4285,9 @@ msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" +#~ msgid "no further action" +#~ msgstr "Abschliessen" + #~ msgid "Enter a nearby GB postcode, or street name and area" #~ msgstr "Geben Sie die ungefähre Adresse des Mangels an" diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po index 5a31045f1..89d7763fd 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-04-24 08:59+0100\n" -"PO-Revision-Date: 2012-10-24 10:32+0000\n" +"POT-Creation-Date: 2013-09-05 17:39+0100\n" +"PO-Revision-Date: 2013-05-02 21:06+0000\n" "Last-Translator: mysociety <transifex@mysociety.org>\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/fixmystreet/language/de_DE/)\n" "Language: de_DE\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid " and " msgstr "und" @@ -40,7 +40,7 @@ msgstr "" msgid " or " msgstr "oder" -#: templates/web/default/admin/bodies.html:32 +#: templates/web/default/admin/bodies.html:36 msgid "%d addresses" msgstr "%d Adressen" @@ -78,16 +78,15 @@ msgstr "" msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "%s ward, %s" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:572 -#, fuzzy msgid "%s, reported at %s" -msgstr "%s anonym gemeldet um %s" +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "%s, within %s ward" msgstr "" @@ -132,7 +131,7 @@ msgstr "" msgid "(fixed)" msgstr "(gelöst)" -#: templates/web/default/index.html:11 templates/web/default/index.html:15 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" @@ -161,21 +160,20 @@ msgstr "(ihre eMail-Adresse oder Telefonnummer werden nie angezeigt)" msgid "(we never show your email)" msgstr "(ihre eMail-Adresse wird nie angezeigt)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 #: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "" #: templates/web/emptyhomes/front/stats.html:5 -#, fuzzy msgid "<big>%s</big> reports" -msgstr "<big>%s</big> Meldung bearbeitet" +msgstr "" #: templates/web/default/questionnaire/completed.html:20 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" @@ -289,6 +287,8 @@ msgstr "" #: templates/web/default/static/about-en-gb.html:1 #: templates/web/default/static/about-en-gb.html:3 #: templates/web/emptyhomes/header.html:34 +#: templates/web/emptyhomes/static/about-cy.html:1 +#: templates/web/emptyhomes/static/about-cy.html:3 #: templates/web/emptyhomes/static/about-en-gb.html:1 #: templates/web/emptyhomes/static/about-en-gb.html:3 msgid "About us" @@ -296,6 +296,8 @@ msgstr "Über uns" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -303,7 +305,8 @@ msgstr "Über uns" msgid "Action Scheduled" msgstr "" -#: templates/web/default/admin/bodies.html:47 +#: templates/web/default/admin/bodies.html:53 +#: templates/web/default/admin/bodies.html:57 #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" @@ -404,12 +407,12 @@ msgid "An update marked this problem as fixed." msgstr "" #: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/problem_row.html:14 +#: templates/web/default/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonym:" @@ -432,30 +435,30 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:124 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:127 +#: templates/web/zurich/admin/report_edit.html:133 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:113 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:99 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" -#: templates/web/default/open311/index.html:17 +#: templates/web/default/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/default/open311/index.html:9 +#: templates/web/default/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "" @@ -476,8 +479,8 @@ msgstr "" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:208 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -530,16 +533,16 @@ msgstr "" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:61 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/report_edit.html:123 msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "Category: %s" msgstr "Kategorie: %s" @@ -549,22 +552,23 @@ msgstr "Kategorie: %s" msgid "Change Password" msgstr "Passwort ändern" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/default/js/translation_strings.html:41 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klicken Sie in die Karte um eine Meldung zu erfassen" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:76 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:90 -#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit.html:98 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -578,7 +582,7 @@ msgstr "" msgid "Closed reports" msgstr "" -#: templates/web/default/admin/problem_row.html:32 +#: templates/web/default/admin/problem_row.html:38 msgid "Closed:" msgstr "Geschlossen:" @@ -587,9 +591,9 @@ msgstr "Geschlossen:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Co-ordinates:" msgstr "Koordinaten:" @@ -597,17 +601,17 @@ msgstr "Koordinaten:" msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:50 -#: templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:75 +#: templates/web/default/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:49 -#: templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:74 +#: templates/web/default/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" @@ -654,8 +658,8 @@ msgstr "Bestätigt" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/default/admin/problem_row.html:30 -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/problem_row.html:36 +#: templates/web/default/admin/report_edit.html:70 msgid "Confirmed:" msgstr "Bestätigt:" @@ -680,12 +684,12 @@ msgstr "" #: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 -#: templates/web/fixmystreet/contact/index.html:7 +#: templates/web/fixmystreet/contact/index.html:19 msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1265 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1293 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 msgid "Could not find user" msgstr "" @@ -724,15 +728,15 @@ msgid "Create category" msgstr "" #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/problem_row.html:34 #: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Erstellt" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:45 +#: templates/web/default/admin/report_edit.html:69 +#: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 -#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Erstellt:" @@ -771,12 +775,12 @@ msgstr "" msgid "Details" msgstr "Beschreibung" -#: templates/web/default/admin/report_edit.html:14 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:25 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:36 msgid "Details:" msgstr "Beschreibung:" @@ -806,6 +810,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -813,10 +819,10 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 -#: templates/web/default/admin/problem_row.html:35 +#: templates/web/default/admin/list_updates.html:42 +#: templates/web/default/admin/problem_row.html:41 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:36 +#: templates/web/zurich/admin/problem_row.html:44 msgid "Edit" msgstr "" @@ -829,7 +835,7 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:4 +#: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "" @@ -863,11 +869,11 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1241 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 msgid "Email already in abuse list" msgstr "" @@ -881,30 +887,30 @@ msgstr "Schicken sie mir Aktualisierungen" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:42 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:67 +#: templates/web/default/admin/update_edit.html:33 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit.html:58 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 msgid "Empty office or other commercial" msgstr "" @@ -912,11 +918,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -936,10 +942,9 @@ msgstr "" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:29 -#, fuzzy +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 msgid "Enter a Zürich street name" -msgstr "Geben Sie eine Adresse an" +msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:18 msgid "Enter a nearby UK postcode, or street name and area" @@ -992,11 +997,11 @@ msgstr "Fehler" msgid "Example postcode %s" msgstr "Beispieladresse" -#: templates/web/default/open311/index.html:27 +#: templates/web/default/open311/index.html:96 msgid "Examples:" msgstr "Beispiele:" -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:76 msgid "Extra data:" msgstr "" @@ -1005,11 +1010,10 @@ msgstr "" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "" -#: templates/web/zurich/admin/index-dm.html:32 -#: templates/web/zurich/admin/index-sdm.html:29 -#, fuzzy +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" -msgstr "Alle Meldungen" +msgstr "" #: templates/web/emptyhomes/front/stats.html:6 msgid "Find latest local and national news" @@ -1060,8 +1064,9 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1072,13 +1077,13 @@ msgstr "" msgid "Fixed" msgstr "Gelöst" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:42 msgid "Fixed - User" msgstr "" @@ -1086,7 +1091,7 @@ msgstr "" msgid "Fixed reports" msgstr "" -#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/problem_row.html:37 msgid "Fixed:" msgstr "" @@ -1094,12 +1099,12 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:78 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -1109,7 +1114,7 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "For council(s):" msgstr "" @@ -1123,6 +1128,7 @@ msgstr "" #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmindelo/faq/faq-pt-cv.html:1 #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 @@ -1130,11 +1136,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "" -#: templates/web/default/open311/index.html:69 +#: templates/web/default/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "" #: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/around/_updates.html:3 #: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "" @@ -1163,7 +1170,7 @@ msgstr "" msgid "Go" msgstr "Los" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "" @@ -1172,7 +1179,6 @@ msgid "Graph of problem creation by status over time" msgstr "" #: templates/web/default/reports/index.html:8 -#: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "" @@ -1219,13 +1225,14 @@ msgstr "" msgid "Hi %s" msgstr "Hallo %s" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:91 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1255,7 +1262,7 @@ msgstr "Erfasse eine neue Meldung:" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:700 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1334,64 +1341,67 @@ msgstr "" msgid "In Progress" msgstr "In Bearbeitung" -#: templates/web/default/open311/index.html:21 +#: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:79 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:94 +#: templates/web/zurich/admin/report_edit.html:100 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In Bearbeitung" #: templates/web/seesomething/report/new/fill_in_details_form.html:38 -#, fuzzy msgid "Incident Category" -msgstr "Kategorie" +msgstr "" -#: templates/web/zurich/admin/report_edit.html:137 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:143 msgid "Include reporter personal details" -msgstr "Bitte geben Sie einiges Details an" +msgstr "" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:56 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:82 msgid "Internal notes:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:48 +msgid "Internal referral" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1052 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" -#: perllib/FixMyStreet/App/Controller/Open311.pm:424 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1430,11 +1440,11 @@ msgstr "" msgid "Last editor" msgstr "Letzter Bearbeiter" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:72 msgid "Last update:" msgstr "Letzte Bearbeitung" -#: templates/web/default/admin/problem_row.html:33 +#: templates/web/default/admin/problem_row.html:39 msgid "Last update:" msgstr "" @@ -1500,7 +1510,7 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "" -#: templates/web/fixmystreet/contact/index.html:86 +#: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "Nachricht" @@ -1508,7 +1518,7 @@ msgstr "Nachricht" msgid "Message:" msgstr "Nachricht:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "" @@ -1532,7 +1542,7 @@ msgstr "Meldungen in der Nähe" #: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 -#: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:9 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmybarangay/reports/index.html:15 @@ -1547,23 +1557,21 @@ msgid "Name" msgstr "Name" #: templates/web/seesomething/report/new/fill_in_details_form.html:74 -#, fuzzy msgid "Name (optional)" -msgstr "(optional)" +msgstr "" -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:66 +#: templates/web/default/admin/update_edit.html:32 #: templates/web/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:57 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Name:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" -msgstr "Name:" +msgstr "" #: templates/web/fiksgatami/footer.html:3 #: templates/web/fiksgatami/nn/footer.html:3 @@ -1579,12 +1587,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:415 -#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:458 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1599,11 +1607,11 @@ msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:249 +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 msgid "New category contact added" msgstr "" @@ -1615,7 +1623,7 @@ msgstr "" msgid "New local reports on reportemptyhomes.com" msgstr "" -#: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New problems" @@ -1642,9 +1650,8 @@ msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "" #: templates/web/zurich/admin/index-sdm.html:4 -#, fuzzy msgid "New reports" -msgstr "Alle Meldungen" +msgstr "" #: db/alert_types_eha.pl:23 msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -1670,10 +1677,9 @@ msgstr "" msgid "New state" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:59 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" -msgstr "Letzte Bearbeitung" +msgstr "" #: templates/web/fiksgatami/front/news.html:9 #: templates/web/fiksgatami/nn/front/news.html:9 @@ -1689,13 +1695,13 @@ msgstr "" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:25 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 #: templates/web/default/questionnaire/index.html:68 @@ -1728,7 +1734,7 @@ msgstr "" msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:66 +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" msgstr "" @@ -1755,14 +1761,16 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 msgid "None" msgstr "Keine" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1798,7 +1806,7 @@ msgstr "" msgid "Note:" msgstr "" -#: templates/web/default/open311/index.html:6 +#: templates/web/default/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "" @@ -1856,23 +1864,25 @@ msgstr "" msgid "Older fixed" msgstr "" -#: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/emptyhomes/reports/index.html:11 #: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:83 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1882,15 +1892,15 @@ msgstr "Öffnen" msgid "Open reports" msgstr "" -#: templates/web/default/open311/index.html:3 +#: templates/web/default/open311/index.html:72 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/default/open311/index.html:13 +#: templates/web/default/open311/index.html:82 msgid "Open311 initiative web page" msgstr "" -#: templates/web/default/open311/index.html:14 +#: templates/web/default/open311/index.html:83 msgid "Open311 specification" msgstr "" @@ -1904,15 +1914,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1046 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:588 #: perllib/FixMyStreet/DB/Result/Problem.pm:598 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Other" msgstr "" @@ -1934,8 +1944,8 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 msgid "Partial" msgstr "" @@ -1953,6 +1963,10 @@ msgstr "" msgid "Password:" msgstr "" +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 @@ -1962,12 +1976,12 @@ msgstr "" msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 -#: templates/web/default/admin/report_edit.html:43 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 +#: templates/web/default/admin/report_edit.html:68 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonnummer:" @@ -1977,6 +1991,8 @@ msgstr "Telefonnummer:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" @@ -1998,15 +2014,15 @@ msgstr "Fotos von neuen Meldungen in der Nähe" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 msgid "Planned" msgstr "Geplant" @@ -2040,10 +2056,10 @@ msgstr "Bitte überprüfen sie ihre eMail" msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre eMail-Adresse korrekt ist" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:852 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:871 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:914 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:917 #: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" @@ -2054,14 +2070,12 @@ msgid "Please choose a property type" msgstr "" #: templates/web/seesomething/js/translation_strings.html:6 -#, fuzzy msgid "Please choose a transport category" -msgstr "Bitte wählen Sie eine Kategorie" +msgstr "" #: templates/web/seesomething/js/translation_strings.html:7 -#, fuzzy msgid "Please choose an incident category" -msgstr "Bitte wählen Sie eine Kategorie" +msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:64 msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”" @@ -2283,11 +2297,11 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:172 +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 msgid "Please upload a JPEG image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:179 +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 msgid "Please upload a JPEG image only\n" msgstr "" @@ -2307,7 +2321,7 @@ msgstr "" #: templates/web/default/report/update-form.html:109 #: templates/web/default/report/update-form.html:131 #: templates/web/default/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/contact/index.html:105 #: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/fixmystreet/report/update-form.html:71 #: templates/web/fixmystreet/report/update-form.html:95 @@ -2332,7 +2346,7 @@ msgstr "" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "" @@ -2361,7 +2375,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:917 +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 msgid "Problem marked as open." msgstr "" @@ -2397,15 +2411,15 @@ msgstr "Meldungen, welche kürzlich gelöst wurden" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:615 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/Default.pm:626 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:228 msgid "Problems within %s" msgstr "Meldungen innerhalb %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:241 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:242 msgid "Problems within %s ward" msgstr "" @@ -2424,11 +2438,10 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 -#, fuzzy msgid "Property address:" -msgstr "Ihre eMail-Adresse:" +msgstr "" #: templates/web/default/report/new/category.html:8 msgid "Property type:" @@ -2445,6 +2458,10 @@ msgstr "" msgid "Provide an update" msgstr "Meldung aktualisieren" +#: templates/web/fixmystreet/auth/general.html:53 +msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:180 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" @@ -2466,17 +2483,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:172 -#: templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:194 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:196 +#: templates/web/zurich/admin/report_edit.html:202 msgid "Publish the response" msgstr "" @@ -2516,11 +2533,11 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2528,11 +2545,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 -#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2545,15 +2562,15 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:616 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 -#: perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/UK.pm:235 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2592,7 +2609,8 @@ msgstr "" msgid "Recently fixed" msgstr "Kürzlich gelöst" -#: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 +#: templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Kürzlich erfasste Meldungen" @@ -2609,13 +2627,13 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:64 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:89 +#: templates/web/default/admin/update_edit.html:57 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/default/index.html:9 templates/web/emptyhomes/header.html:12 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "" @@ -2641,15 +2659,14 @@ msgstr "Missbrauch melden" #: templates/web/default/report_created.html:3 #: templates/web/seesomething/report_created.html:0 #: templates/web/seesomething/report_created.html:8 -#, fuzzy msgid "Report created" -msgstr "Missbrauch melden" +msgstr "" #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" -#: templates/web/default/index.html:18 +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/stevenage/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 @@ -2666,7 +2683,7 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 -#: templates/web/fixmystreet/contact/index.html:46 +#: templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" @@ -2682,7 +2699,7 @@ msgstr "Anonym gemeldet von %s um %s " #: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 -#: templates/web/fixmystreet/contact/index.html:48 +#: templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -2699,9 +2716,8 @@ msgid "Reported by %s in the %s category by %s at %s" msgstr "" #: templates/web/zurich/report/_main.html:2 -#, fuzzy msgid "Reported in the %s category" -msgstr "Gemeldet von %s um %s" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" @@ -2727,33 +2743,30 @@ msgstr "" msgid "Reporting a problem" msgstr "Verfassen Sie eine Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:198 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:201 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 -#, fuzzy msgid "Reports" -msgstr "Alle Meldungen" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" #: templates/web/zurich/admin/index-sdm.html:7 -#, fuzzy msgid "Reports awaiting approval" -msgstr "Verfassen Sie eine Meldung" +msgstr "" #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "" #: templates/web/zurich/admin/index-sdm.html:10 -#, fuzzy msgid "Reports published" -msgstr "Missbrauch melden" +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Resend report" msgstr "" @@ -2769,16 +2782,16 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1343 -#: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: templates/web/default/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: templates/web/default/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:75 msgid "Rotate Right" msgstr "" @@ -2797,9 +2810,8 @@ msgid "Search Users" msgstr "" #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Search reports" -msgstr "Ihre Meldungen" +msgstr "" #: templates/web/default/admin/reports.html:5 #: templates/web/default/admin/users.html:5 @@ -2826,11 +2838,11 @@ msgstr "" msgid "Sent to %s %s later" msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Sent:" msgstr "Gesendet:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:73 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2931,7 +2943,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 #: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 #: perllib/FixMyStreet/Geocode/Google.pm:74 #: perllib/FixMyStreet/Geocode/OSM.pm:66 @@ -2969,17 +2981,17 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/update_edit.html:21 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:54 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1138 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:213 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:216 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2995,26 +3007,25 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 msgid "Subcategory: %s" -msgstr "Kategorie: %s" +msgstr "" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:48 -#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/contact/index.html:91 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "Titel" -#: templates/web/default/admin/report_edit.html:13 +#: templates/web/default/admin/report_edit.html:19 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:34 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Subject:" msgstr "Titel:" @@ -3034,11 +3045,11 @@ msgstr "Titel:" msgid "Submit" msgstr "Abschicken" -#: templates/web/default/admin/report_edit.html:67 -#: templates/web/default/admin/update_edit.html:54 +#: templates/web/default/admin/report_edit.html:92 +#: templates/web/default/admin/update_edit.html:60 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:65 -#: templates/web/zurich/admin/report_edit.html:198 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:204 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -3048,19 +3059,18 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:88 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 -#, fuzzy msgid "Submitted" -msgstr "Abschicken" +msgstr "" #: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 @@ -3080,8 +3090,8 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:200 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3100,7 +3110,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 msgid "Survey" msgstr "" @@ -3117,7 +3127,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/update_edit.html:20 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "" @@ -3162,7 +3172,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/Controller/Photo.pm:186 +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -3179,7 +3189,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:683 msgid "That problem will now be resent." msgstr "" @@ -3191,7 +3201,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von Fix My Zürich entfernt." -#: templates/web/default/open311/index.html:23 +#: templates/web/default/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" @@ -3202,9 +3212,8 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 -#, fuzzy msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." -msgstr "Bitte beschreiben sie Ihre Meldung weiter unten. Wir können den Mangel nur beheben, wenn Sie soviel Details wie möglich angeben: Beschreiben sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der Mangel ist, wie lange dieser schon da ist und laden sie wenn möglich ein Photo des Mangels hoch." +msgstr "" #: templates/web/fixmystreet/questionnaire/index.html:43 msgid "The details of your problem are available from the other tab above." @@ -3215,11 +3224,11 @@ msgid "The details of your problem are available on the right hand side of this msgstr "" #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:67 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "" -#: templates/web/default/open311/index.html:19 +#: templates/web/default/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3296,11 +3305,11 @@ msgstr "" msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3309,7 +3318,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3334,20 +3343,20 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/default/open311/index.html:10 +#: templates/web/default/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 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:891 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3360,8 +3369,11 @@ msgstr "" msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." msgstr "" -#: templates/web/default/reports/index.html:7 #: templates/web/emptyhomes/reports/index.html:4 +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." +msgstr "" + +#: templates/web/default/reports/index.html:7 #: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." @@ -3397,8 +3409,8 @@ msgstr "Dieser Mangel ist in Bearbeitung" msgid "This problem is old and of unknown status." msgstr "Dieses Problem ist alt und hat einen unbekannten Status" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3415,16 +3427,15 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" -msgstr "%s anonym gemeldet um %s" +msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3442,7 +3453,7 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3455,9 +3466,8 @@ msgid "Total" msgstr "Total" #: templates/web/seesomething/report/new/fill_in_details_form.html:24 -#, fuzzy msgid "Transport Category" -msgstr "Kategorie" +msgstr "" #: templates/web/default/js/translation_strings.html:23 msgid "Try again" @@ -3465,6 +3475,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3472,11 +3484,11 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:59 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Unbestätigt" @@ -3490,9 +3502,8 @@ msgid "Unknown alert type" msgstr "" #: templates/web/default/js/translation_strings.html:33 -#, fuzzy msgid "Unknown error" -msgstr "Unbekannt" +msgstr "" #: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" @@ -3508,20 +3519,19 @@ msgid "Update %s created for problem %d; by %s" msgstr "" #: templates/web/default/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:22 +#: templates/web/fixmystreet/contact/index.html:34 msgid "Update below added anonymously at %s" msgstr "" #: templates/web/default/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:24 +#: templates/web/fixmystreet/contact/index.html:36 msgid "Update below added by %s at %s" msgstr "" #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 -#, fuzzy msgid "Update body" -msgstr "Beschreibung" +msgstr "" #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" @@ -3531,16 +3541,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/default/admin/update_edit.html:44 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/update_edit.html:46 msgid "Update reopened problem" msgstr "" @@ -3555,16 +3565,15 @@ msgstr "" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Updated" -msgstr "Beschreibung" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:763 -#: perllib/FixMyStreet/App/Controller/Admin.pm:907 -#: perllib/FixMyStreet/App/Controller/Admin.pm:960 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:485 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:972 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:488 msgid "Updated!" msgstr "" @@ -3593,30 +3602,30 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:215 #: templates/web/default/admin/flagged.html:24 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "Values updated" msgstr "" -#: templates/web/default/admin/report_edit.html:12 -#: templates/web/default/admin/update_edit.html:12 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:23 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "" @@ -3679,7 +3688,7 @@ msgstr "Ihre eMail wird nie angezeigt" msgid "We never show your email address or phone number." msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 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 "" @@ -3712,15 +3721,15 @@ msgstr "" msgid "When edited" msgstr "Wann editiert" -#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/problem_row.html:35 msgid "When sent" msgstr "Wann gesendet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Whole block of empty flats" msgstr "" -#: templates/web/default/open311/index.html:25 +#: templates/web/default/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3754,13 +3763,13 @@ msgstr "Jahr" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:63 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:109 @@ -3778,12 +3787,12 @@ msgid "Yes I have a password" msgstr "" #: templates/web/default/contact/index.html:37 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/fixmystreet/contact/index.html:50 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" #: templates/web/default/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:16 +#: templates/web/fixmystreet/contact/index.html:28 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3846,9 +3855,8 @@ msgstr "" #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 -#, fuzzy msgid "You have successfully confirmed your email address." -msgstr "Sie haben Ihre Meldung erfolgreich bestätigt" +msgstr "" #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 @@ -3868,7 +3876,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -3877,7 +3885,7 @@ msgstr "" msgid "You must now click the link in the email we've just sent you." msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "" @@ -3894,7 +3902,7 @@ msgstr "" #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/contact/index.html:84 #: templates/web/fixmystreet/report/display.html:65 #: templates/web/fixmystreet/report/display.html:67 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 @@ -3904,9 +3912,8 @@ msgid "Your email" msgstr "Ihre eMail" #: templates/web/seesomething/report/new/fill_in_details_form.html:81 -#, fuzzy msgid "Your email (optional)" -msgstr "(optional)" +msgstr "" #: templates/web/bromley/report/display.html:132 #: templates/web/fixmystreet/auth/general.html:26 @@ -3946,7 +3953,7 @@ msgid "Your last name" msgstr "" #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/contact/index.html:77 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 @@ -4027,17 +4034,12 @@ msgstr "" msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "didn't use map" msgstr "hat Karte nicht verwendet" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 -#, fuzzy -msgid "duplicate report" -msgstr "Erfasse eine Meldung" - #: templates/web/default/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 #: templates/web/seesomething/around/postcode_form.html:9 @@ -4051,36 +4053,66 @@ msgstr "" #: templates/web/fixmystreet/report/_item.html:12 #: templates/web/zurich/report/_item.html:16 -#, fuzzy msgid "last updated %s" -msgstr "Letzte Bearbeitung" +msgstr "" #: perllib/Utils.pm:263 msgid "less than a minute" msgstr "weniger als einer Minute" -#: templates/web/default/report/updates.html:38 -msgid "marked as %s" +#: templates/web/default/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "" + +#: templates/web/default/report/updates.html:47 +#, fuzzy +msgid "marked as action scheduled" +msgstr "als gelöst markiert" + +#: templates/web/default/report/updates.html:59 +msgid "marked as an internal referral" msgstr "" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:49 +#, fuzzy +msgid "marked as closed" +msgstr "als gelöst markiert" + +#: templates/web/default/report/updates.html:28 +#: templates/web/default/report/updates.html:51 msgid "marked as fixed" msgstr "als gelöst markiert" +#: templates/web/default/report/updates.html:45 +#, fuzzy +msgid "marked as in progress" +msgstr "Dieser Mangel ist in Bearbeitung" + +#: templates/web/default/report/updates.html:41 +#, fuzzy +msgid "marked as investigating" +msgstr "als gelöst markiert" + +#: templates/web/default/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "" + +#: templates/web/default/report/updates.html:43 +#, fuzzy +msgid "marked as planned" +msgstr "als gelöst markiert" + +#: templates/web/default/report/updates.html:53 +#, fuzzy +msgid "marked as unable to fix" +msgstr "als gelöst markiert" + #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "" -#: templates/web/default/report/updates.html:32 -msgid "no further action" -msgstr "" - -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 -msgid "not the council's responsibility" -msgstr "" - #: templates/web/default/alert/_list.html:87 #: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 @@ -4091,27 +4123,27 @@ msgstr "oder" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:27 -#: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:38 -#: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:50 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:53 msgid "originally entered: “%s”" msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:36 +#: templates/web/default/report/updates.html:29 +#: templates/web/default/report/updates.html:39 msgid "reopened" msgstr "" @@ -4141,11 +4173,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: templates/web/default/report/updates.html:33 -msgid "third party responsibility" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 msgid "this type of local problem" msgstr "" @@ -4153,17 +4181,17 @@ msgstr "" msgid "today" msgstr "heute" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "used map" msgstr "" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:35 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/update_edit.html:38 msgid "user is problem owner" msgstr "" @@ -4248,15 +4276,3 @@ msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" - -#~ msgid "*unknown*" -#~ msgstr "*unbekannt*" - -#~ msgid "All confirmed" -#~ msgstr "Alle bestätigten" - -#~ msgid "Enter a nearby GB postcode, or street name and area" -#~ msgstr "Geben Sie eine Adresse an" - -#~ msgid "No info at all" -#~ msgstr "Keine Informationen" diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po index 769f024ea..161530706 100644 --- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-04-24 08:59+0100\n" -"PO-Revision-Date: 2012-10-24 15:06+0000\n" -"Last-Translator: fontanon <fontanon@emergya.com>\n" +"POT-Creation-Date: 2013-09-05 17:39+0100\n" +"PO-Revision-Date: 2013-05-02 21:06+0000\n" +"Last-Translator: mysociety <transifex@mysociety.org>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/fixmystreet/language/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid " and " msgstr " y " @@ -40,7 +40,7 @@ msgstr " y <strong>ahora lo enviaremos al Ayuntamiento </ strong>" msgid " or " msgstr " o " -#: templates/web/default/admin/bodies.html:32 +#: templates/web/default/admin/bodies.html:36 msgid "%d addresses" msgstr "%d direcciones" @@ -78,33 +78,29 @@ msgstr "%s - Informes de notificación" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "%s ward, %s" msgstr "%s barrio, %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:572 -#, fuzzy msgid "%s, reported at %s" -msgstr "%s , notificada por %s en %s" +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "%s, within %s ward" msgstr "%s , en %s barrio" #: templates/web/default/email_sent.html:29 -#, fuzzy msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -msgstr "Pondremos su alerta en espera mientras comprueba su email." +msgstr "" #: templates/web/default/email_sent.html:25 -#, fuzzy msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -msgstr "Pondremos su notificación de problema en espera mientras comprueba su email." +msgstr "" #: templates/web/default/email_sent.html:27 -#, fuzzy msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -msgstr "Pondremos su actualización en espera mientras comprueba su email." +msgstr "" #: templates/web/default/admin/report_blocks.html:11 #: templates/web/default/admin/users.html:26 @@ -135,7 +131,7 @@ msgstr "(cerrado)" msgid "(fixed)" msgstr "(arreglado)" -#: templates/web/default/index.html:11 templates/web/default/index.html:15 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(como graffitis, basura ilegal, pavimentación o alumbrado roto)" @@ -164,21 +160,20 @@ msgstr "(nunca se muestra su dirección de correo electrónico o número de tel msgid "(we never show your email)" msgstr "(nunca se muestra su dirección de correo electrónico)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Elige una categoría --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 #: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Escoja un tipo de propiedad --" #: templates/web/emptyhomes/front/stats.html:5 -#, fuzzy msgid "<big>%s</big> reports" -msgstr "<big>%s</big> notificaciones actualizadas" +msgstr "" #: templates/web/default/questionnaire/completed.html:20 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" @@ -327,6 +322,8 @@ msgstr "<strong>Sí</strong> tengo una contraseña" #: templates/web/default/static/about-en-gb.html:1 #: templates/web/default/static/about-en-gb.html:3 #: templates/web/emptyhomes/header.html:34 +#: templates/web/emptyhomes/static/about-cy.html:1 +#: templates/web/emptyhomes/static/about-cy.html:3 #: templates/web/emptyhomes/static/about-en-gb.html:1 #: templates/web/emptyhomes/static/about-en-gb.html:3 msgid "About us" @@ -334,6 +331,8 @@ msgstr "¿Quiénes somos?" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -341,7 +340,8 @@ msgstr "¿Quiénes somos?" msgid "Action Scheduled" msgstr "" -#: templates/web/default/admin/bodies.html:47 +#: templates/web/default/admin/bodies.html:53 +#: templates/web/default/admin/bodies.html:57 #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" @@ -442,12 +442,12 @@ msgid "An update marked this problem as fixed." msgstr "Una actualización marcó esta notificación como arreglada." #: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/problem_row.html:14 +#: templates/web/default/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anónimo" -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anónimo:" @@ -470,31 +470,30 @@ msgstr "¿Pertenece al Ayuntamiento?" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:124 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:127 +#: templates/web/zurich/admin/report_edit.html:133 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:113 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:99 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 #: templates/web/zurich/report/updates.html:11 -#, fuzzy msgid "Assigned to %s" -msgstr "Conectado como %s" +msgstr "" -#: templates/web/default/open311/index.html:17 +#: templates/web/default/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Se devuelven como máximo %d solicitudes por cada consulta. Las solicitudes devueltas se ordenan por requested_datetime, así que para obtener todas las solicitudes, es necesario hacer varias secuencias de búsqueda con start_date y end_date." -#: templates/web/default/open311/index.html:9 +#: templates/web/default/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "Por el momento sólo funcionan las búsquedas y las vistas de notificaciones." @@ -515,8 +514,8 @@ msgstr "Prohibir dirección de email" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:208 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -569,16 +568,16 @@ msgstr "Categoría ratio de arreglo de problemas > 4 semanas" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:61 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/report_edit.html:123 msgid "Category:" msgstr "Categoría:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "Category: %s" msgstr "Categoría: %s" @@ -588,22 +587,23 @@ msgstr "Categoría: %s" msgid "Change Password" msgstr "Cambiar contraseña" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/default/js/translation_strings.html:41 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Haga clic en el mapa para notificar un problema" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:76 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:90 -#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit.html:98 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -617,7 +617,7 @@ msgstr "Cerrado por el Ayuntamiento" msgid "Closed reports" msgstr "Informes cerrados" -#: templates/web/default/admin/problem_row.html:32 +#: templates/web/default/admin/problem_row.html:38 msgid "Closed:" msgstr "Cerrado:" @@ -626,9 +626,9 @@ msgstr "Cerrado:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Problemas cercanos <small>(dentro de %%s km)</small>" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Co-ordinates:" msgstr "Coordenadas:" @@ -636,17 +636,17 @@ msgstr "Coordenadas:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/default/admin/report_edit.html:50 -#: templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:75 +#: templates/web/default/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Datos cobrand:" -#: templates/web/default/admin/report_edit.html:49 -#: templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:74 +#: templates/web/default/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Configuración actualizada - los contactos se generarán automáticamente más tarde" @@ -693,8 +693,8 @@ msgstr "Confirmado" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/default/admin/problem_row.html:30 -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/problem_row.html:36 +#: templates/web/default/admin/report_edit.html:70 msgid "Confirmed:" msgstr "Confirmado:" @@ -719,12 +719,12 @@ msgstr "Contáctenos" #: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 -#: templates/web/fixmystreet/contact/index.html:7 +#: templates/web/fixmystreet/contact/index.html:19 msgid "Contact the team" msgstr "Contactar con el equipo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1265 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1293 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 msgid "Could not find user" msgstr "No se pudo encontrar usuario" @@ -763,15 +763,15 @@ msgid "Create category" msgstr "Crear una categoría" #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/problem_row.html:34 #: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Creado" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:45 +#: templates/web/default/admin/report_edit.html:69 +#: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 -#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Creado:" @@ -810,12 +810,12 @@ msgstr "" msgid "Details" msgstr "Detalles" -#: templates/web/default/admin/report_edit.html:14 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:25 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:36 msgid "Details:" msgstr "Detalles:" @@ -845,6 +845,8 @@ msgstr "No lo se" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -852,10 +854,10 @@ msgstr "No lo se" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 -#: templates/web/default/admin/problem_row.html:35 +#: templates/web/default/admin/list_updates.html:42 +#: templates/web/default/admin/problem_row.html:41 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:36 +#: templates/web/zurich/admin/problem_row.html:44 msgid "Edit" msgstr "Editar" @@ -868,7 +870,7 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:4 +#: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Editando problema %d" @@ -902,11 +904,11 @@ msgstr "Editor" msgid "Email" msgstr "Email:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1241 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 msgid "Email added to abuse list" msgstr "Email añadido a lista de abusos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 msgid "Email already in abuse list" msgstr "Email ya incluido en lista de abusos" @@ -920,31 +922,30 @@ msgstr "Recibir por email actualizaciones" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:42 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:67 +#: templates/web/default/admin/update_edit.html:33 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit.html:58 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" -msgstr "Email:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty flat or maisonette" msgstr "Piso o duplex vacío" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty house or bungalow" msgstr "Casa o bungalow vacío" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 msgid "Empty office or other commercial" msgstr "Oficina u otros establecimientos comerciales vacíos" @@ -952,11 +953,11 @@ msgstr "Oficina u otros establecimientos comerciales vacíos" msgid "Empty property details form" msgstr "Limpiar detalles de la propiedad" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Empty pub or bar" msgstr "Pub o bar vacío" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 msgid "Empty public building - school, hospital, etc." msgstr "Edificio público vacío - escuela, hospital, etc" @@ -976,10 +977,9 @@ msgstr "Mes de fin:" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:29 -#, fuzzy +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 msgid "Enter a Zürich street name" -msgstr "Introduzca un nombre de la calle y la zona cercana" +msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:18 msgid "Enter a nearby UK postcode, or street name and area" @@ -1032,11 +1032,11 @@ msgstr "Error" msgid "Example postcode %s" msgstr "Ejemplo de código postal %s" -#: templates/web/default/open311/index.html:27 +#: templates/web/default/open311/index.html:96 msgid "Examples:" msgstr "Ejemplos:" -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:76 msgid "Extra data:" msgstr "Datos adicionales:" @@ -1045,11 +1045,10 @@ msgstr "Datos adicionales:" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "No se ha podido enviar el mensaje. Por favor, inténtelo de nuevo, o <a href=\"mailto: %s\">envíenos un correo electrónico</a>." -#: templates/web/zurich/admin/index-dm.html:32 -#: templates/web/zurich/admin/index-sdm.html:29 -#, fuzzy +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" -msgstr "Notificaciones arregladas" +msgstr "" #: templates/web/emptyhomes/front/stats.html:6 msgid "Find latest local and national news" @@ -1109,8 +1108,9 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1121,13 +1121,13 @@ msgstr "" msgid "Fixed" msgstr "Arreglado" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "Arreglado - Ayuntamiento" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:42 msgid "Fixed - User" msgstr "Arreglado - Usuario" @@ -1135,7 +1135,7 @@ msgstr "Arreglado - Usuario" msgid "Fixed reports" msgstr "Notificaciones arregladas" -#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/problem_row.html:37 msgid "Fixed:" msgstr "Arreglado:" @@ -1143,12 +1143,12 @@ msgstr "Arreglado:" msgid "Flag user" msgstr "Marca usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Marcado" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:78 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Marcado:" @@ -1158,7 +1158,7 @@ msgstr "Marcado:" msgid "Follow a ward link to view only reports within that ward." msgstr "Clic en el enlace de un barrio para ver solo las notificaciones en ese barrio" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "For council(s):" msgstr "Por Concejalía(s):" @@ -1172,6 +1172,7 @@ msgstr "" #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmindelo/faq/faq-pt-cv.html:1 #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 @@ -1179,11 +1180,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Preguntas frecuentes" -#: templates/web/default/open311/index.html:69 +#: templates/web/default/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "GeoRSS en Google Maps" #: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/around/_updates.html:3 #: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "Recibe actualizaciones" @@ -1212,7 +1214,7 @@ msgstr "Dame un feed RSS" msgid "Go" msgstr "Ir" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "¿Va a enviar cuestionario?" @@ -1221,7 +1223,6 @@ msgid "Graph of problem creation by status over time" msgstr "Gráfico temporal de creación problemas por estado" #: templates/web/default/reports/index.html:8 -#: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "Líneas de color gris son las Concejalías que ya no existen." @@ -1268,13 +1269,14 @@ msgstr "Estos son los tipos de alertas de problemas locales para '%s'." msgid "Hi %s" msgstr "Hola %s" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:91 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1304,7 +1306,7 @@ msgstr "Cómo notificar un problema" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:700 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Me temo que no puede confirmar informes no confirmados." @@ -1331,19 +1333,16 @@ msgid "ID" msgstr "ID" #: templates/web/default/email_sent.html:19 -#, fuzzy msgid "If you do not, your alert will not be activated." -msgstr "Su alerta no se activará" +msgstr "" #: templates/web/default/email_sent.html:15 -#, fuzzy msgid "If you do not, your problem will not be posted." -msgstr "Su problema no se publicará" +msgstr "" #: templates/web/default/email_sent.html:17 -#, fuzzy msgid "If you do not, your update will not be posted." -msgstr "Su actualización no se publicará" +msgstr "" #: templates/web/default/report/new/councils_text_none.html:8 #: templates/web/default/report/new/councils_text_none.html:9 @@ -1389,64 +1388,67 @@ msgstr "Selección de feed ilegal" msgid "In Progress" msgstr "En Progreso" -#: templates/web/default/open311/index.html:21 +#: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Además, los siguientes atributos que no forman parte de la especificación Open311 v2 son devueltos: agency_sent_datetime, título (también se devuelve como parte de la descripción), interface_used, comment_count, requestor_name (sólo presente si solicitante permitió que el nombre que se mostrará en el sitio)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:79 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:94 +#: templates/web/zurich/admin/report_edit.html:100 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "En Progreso" #: templates/web/seesomething/report/new/fill_in_details_form.html:38 -#, fuzzy msgid "Incident Category" -msgstr "Categoría" +msgstr "" -#: templates/web/zurich/admin/report_edit.html:137 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:143 msgid "Include reporter personal details" -msgstr "Por favor, introduzca algunos detalles" +msgstr "" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Incluir notificaciones no confirmadas" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "Valor incorrecto para has_photo \"%s\"" -#: templates/web/zurich/admin/report_edit-sdm.html:56 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:82 msgid "Internal notes:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:48 +msgid "Internal referral" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "Valor inválido para agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1052 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 msgid "Invalid end date" msgstr "Fecha de fin inválida" -#: perllib/FixMyStreet/App/Controller/Open311.pm:424 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "Formato no válido %s especificado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 msgid "Invalid start date" msgstr "Fecha de inicio no válida" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1485,11 +1487,11 @@ msgstr "Apellido" msgid "Last editor" msgstr "Último editor" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:72 msgid "Last update:" msgstr "Última actualización:" -#: templates/web/default/admin/problem_row.html:33 +#: templates/web/default/admin/problem_row.html:39 msgid "Last update:" msgstr "Última actualización:" @@ -1555,7 +1557,7 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "Mapa © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</ a> y colaboradores, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" -#: templates/web/fixmystreet/contact/index.html:86 +#: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "Mensaje:" @@ -1563,7 +1565,7 @@ msgstr "Mensaje:" msgid "Message:" msgstr "Mensaje:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "Falta jurisdiction_id" @@ -1587,7 +1589,7 @@ msgstr "Más problemas cercanos" #: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 -#: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:9 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmybarangay/reports/index.html:15 @@ -1602,23 +1604,21 @@ msgid "Name" msgstr "Nombre" #: templates/web/seesomething/report/new/fill_in_details_form.html:74 -#, fuzzy msgid "Name (optional)" -msgstr "(opcional)" +msgstr "" -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:66 +#: templates/web/default/admin/update_edit.html:32 #: templates/web/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:57 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Nombre:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" -msgstr "Nombre:" +msgstr "" #: templates/web/fiksgatami/footer.html:3 #: templates/web/fiksgatami/nn/footer.html:3 @@ -1634,12 +1634,12 @@ msgstr "Camino más cercano al pin colocado en el mapa (se genera automáticamen msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Código postal más cercano al pin colocado en el mapa (generado automáticamente): %s (%sm de distancia)" -#: perllib/FixMyStreet/Cobrand/Default.pm:415 -#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:458 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Camino más cercano al pin colocado en el mapa (generado automáticamente por Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1656,12 +1656,11 @@ msgstr "¡Casi terminado! Ahora compruebe su correo electrónico ..." msgid "New <br>problems" msgstr "Nuevos <br>problemas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:249 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 msgid "New body added" -msgstr "Añadida nueva categoría de contactos" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 msgid "New category contact added" msgstr "Añadida nueva categoría de contactos" @@ -1673,7 +1672,7 @@ msgstr "Nuevos problemas locales en FixMyStreet" msgid "New local reports on reportemptyhomes.com" msgstr "Nuevas notificaciones locales en reportemptyhomes.com" -#: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New problems" @@ -1700,9 +1699,8 @@ msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "Nuevos problemas en los límites de {{NAME}} en FixMyStreet" #: templates/web/zurich/admin/index-sdm.html:4 -#, fuzzy msgid "New reports" -msgstr "Notificaciones abiertas" +msgstr "" #: db/alert_types_eha.pl:23 msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -1728,10 +1726,9 @@ msgstr "Nuevas notificaciones dentro de los límites de {{NAME}} en reportemptyh msgid "New state" msgstr "Nuevo estado" -#: templates/web/zurich/admin/report_edit-sdm.html:59 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" -msgstr "Recibe actualizaciones" +msgstr "" #: templates/web/fiksgatami/front/news.html:9 #: templates/web/fiksgatami/nn/front/news.html:9 @@ -1747,13 +1744,13 @@ msgstr "" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:25 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 #: templates/web/default/questionnaire/index.html:68 @@ -1786,10 +1783,9 @@ msgstr "No se encontraron problemas marcados" msgid "No flagged users found" msgstr "No se encontraron usuarios marcados" -#: templates/web/zurich/admin/report_edit-sdm.html:66 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" -msgstr "Sus actualizaciones" +msgstr "" #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 @@ -1814,14 +1810,16 @@ msgstr "No hay seguidores" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 msgid "None" msgstr "Nada" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1857,7 +1855,7 @@ msgstr "Tenga en cuenta que al incluir notificaciones no confirmadas usamos la f msgid "Note:" msgstr "Nota:" -#: templates/web/default/open311/index.html:6 +#: templates/web/default/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "Nota: <strong>%s</strong>" @@ -1915,23 +1913,25 @@ msgstr "Problemas <br>antiguos" msgid "Older fixed" msgstr "Antiguo arreglado" -#: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/emptyhomes/reports/index.html:11 #: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "Problemas antiguos" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:83 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1941,15 +1941,15 @@ msgstr "Abierto" msgid "Open reports" msgstr "Notificaciones abiertas" -#: templates/web/default/open311/index.html:3 +#: templates/web/default/open311/index.html:72 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 para el servidor FixMyStreet de mySociety" -#: templates/web/default/open311/index.html:13 +#: templates/web/default/open311/index.html:82 msgid "Open311 initiative web page" msgstr "Página web de la iniciativa Open311" -#: templates/web/default/open311/index.html:14 +#: templates/web/default/open311/index.html:83 msgid "Open311 specification" msgstr "Especificación Open311" @@ -1963,15 +1963,15 @@ msgstr "O problemas notificados a:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "O puede suscribirse a una alerta basada en el barrio o Ayuntamiento en el que estás:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1046 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:588 #: perllib/FixMyStreet/DB/Result/Problem.pm:598 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Other" msgstr "Otros" @@ -1993,8 +1993,8 @@ msgstr "Página no encontrada" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 msgid "Partial" msgstr "Parcial" @@ -2012,6 +2012,10 @@ msgstr "Contraseña (opcional)" msgid "Password:" msgstr "Contraseña:" +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 @@ -2021,12 +2025,12 @@ msgstr "Contraseña:" msgid "Phone number (optional)" msgstr "Número de teléfono (opcional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 -#: templates/web/default/admin/report_edit.html:43 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 +#: templates/web/default/admin/report_edit.html:68 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Teléfono:" @@ -2036,6 +2040,8 @@ msgstr "Teléfono:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" @@ -2057,15 +2063,15 @@ msgstr "Fotos notificaciones cercanas recientes" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 msgid "Planned" msgstr "Planificado" @@ -2099,10 +2105,10 @@ msgstr "Por favor, consulte su email" msgid "Please check your email address is correct" msgstr "Por favor, compruebe que su dirección de email es correcta" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:852 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:871 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:914 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:917 #: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" @@ -2113,14 +2119,12 @@ msgid "Please choose a property type" msgstr "Por favor, elija un tipo de propiedad" #: templates/web/seesomething/js/translation_strings.html:6 -#, fuzzy msgid "Please choose a transport category" -msgstr "Por favor, elija una categoría" +msgstr "" #: templates/web/seesomething/js/translation_strings.html:7 -#, fuzzy msgid "Please choose an incident category" -msgstr "Por favor, elija una categoría" +msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:64 msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”" @@ -2139,9 +2143,8 @@ msgstr "" #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:7 #: templates/web/oxfordshire/report/new/notes.html:6 -#, fuzzy msgid "Please do not be abusive — abusing your council devalues the service for all users." -msgstr "Por favor, no seas abusivo - abusar de su Ayuntamiento devalúa el servicio para el resto de los usuarios." +msgstr "" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 msgid "Please do not give address or personal information in this section." @@ -2356,11 +2359,11 @@ msgstr "Por favor, indique si el problema se ha solucionado" msgid "Please take a look at the updates that have been left." msgstr "Por favor eche un vistazo a las actualizaciones que se han dejado." -#: perllib/FixMyStreet/App/Controller/Photo.pm:172 +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 msgid "Please upload a JPEG image only" msgstr "Por favor, suba una imagen JPEG" -#: perllib/FixMyStreet/App/Controller/Photo.pm:179 +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 msgid "Please upload a JPEG image only\n" msgstr "Por favor, suba una imagen JPEG\n" @@ -2380,7 +2383,7 @@ msgstr "Por favor, escriba su actualización aquí" #: templates/web/default/report/update-form.html:109 #: templates/web/default/report/update-form.html:131 #: templates/web/default/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/contact/index.html:105 #: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/fixmystreet/report/update-form.html:71 #: templates/web/fixmystreet/report/update-form.html:95 @@ -2405,14 +2408,13 @@ msgstr "" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:108 -#, fuzzy msgid "Private information (not shown on site)" -msgstr "Más información sobre nuestro trabajo sobre casas vacías." +msgstr "" #: templates/web/default/maps/openlayers.html:85 msgid "Problem" @@ -2435,7 +2437,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:917 +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 msgid "Problem marked as open." msgstr "Problema marcado como abierto." @@ -2471,15 +2473,15 @@ msgstr "Problemas recientemente notificados como arreglados en FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemas en %.1fkm alrededor" -#: perllib/FixMyStreet/Cobrand/Default.pm:615 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/Default.pm:626 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:228 msgid "Problems within %s" msgstr "Problemas en %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:241 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:242 msgid "Problems within %s ward" msgstr "Problemas en el barrio %s" @@ -2498,11 +2500,10 @@ msgstr "Problemas en los alrededores de:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Propiedades recientemente notificadas como vueltas a usar en reportemptyhomes.com" -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 -#, fuzzy msgid "Property address:" -msgstr "Tipo de propiedad:" +msgstr "" #: templates/web/default/report/new/category.html:8 msgid "Property type:" @@ -2519,6 +2520,11 @@ msgstr "Proporcionar un título" msgid "Provide an update" msgstr "Proporcionar una actualización" +#: templates/web/fixmystreet/auth/general.html:53 +#, fuzzy +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 una contraseña es opcional, pero al hacerlo le permitirá informar problemas con mayor facilidad, deje actualizaciones y administrar sus notificaciones." + #: templates/web/bromley/report/new/fill_in_details_form.html:180 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "Proporcionar una contraseña es opcional, pero al hacerlo le permitirá informar más fácilmente problemas en el futuro, dejar actualizaciones y administrar sus notificaciones." @@ -2540,17 +2546,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:172 -#: templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:194 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:196 +#: templates/web/zurich/admin/report_edit.html:202 msgid "Publish the response" msgstr "" @@ -2590,11 +2596,11 @@ msgstr "Cuestionario cumplimentado por el notificador problema" msgid "RSS feed" msgstr "Feed RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "RSS feed for %s" msgstr "Feed RSS para %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed for %s ward, %s" msgstr "Feed RSS para %s del barrio, %s" @@ -2602,11 +2608,11 @@ msgstr "Feed RSS para %s del barrio, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 -#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "RSS feed of %s" msgstr "Feed RSS para %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "RSS feed of %s, within %s ward" msgstr "Feed RSS para %s, en el barrio %s" @@ -2619,15 +2625,15 @@ msgstr "Feed RSS de los problemas más cercanos" msgid "RSS feed of problems in this %s" msgstr "Feed RSS de los problemas en este %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:616 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 -#: perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/UK.pm:235 msgid "RSS feed of problems within %s" msgstr "Feed RSS de los problemas dentro de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "RSS feed of problems within %s ward" msgstr "Feed RSS feed de los problemas dentro del barrio %s" @@ -2666,7 +2672,8 @@ msgstr "Recientemente <br>arreglado" msgid "Recently fixed" msgstr "Recientemente arreglado" -#: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 +#: templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Problemas recientemente notificados" @@ -2683,13 +2690,13 @@ msgstr "" msgid "Remove flag" msgstr "Eliminar Marca" -#: templates/web/default/admin/report_edit.html:64 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:89 +#: templates/web/default/admin/update_edit.html:57 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Quitar foto (¡no se puede deshacer!)" -#: templates/web/default/index.html:9 templates/web/emptyhomes/header.html:12 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "Notificar viviendas vacías" @@ -2715,15 +2722,14 @@ msgstr "Denunciar abuso" #: templates/web/default/report_created.html:3 #: templates/web/seesomething/report_created.html:0 #: templates/web/seesomething/report_created.html:8 -#, fuzzy msgid "Report created" -msgstr "Denunciar abuso" +msgstr "" #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Notificar sobre %s" -#: templates/web/default/index.html:18 +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/stevenage/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 @@ -2740,7 +2746,7 @@ msgstr "Notificados %s, a %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 -#: templates/web/fixmystreet/contact/index.html:46 +#: templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Notificado anónimamente en %s" @@ -2756,7 +2762,7 @@ msgstr "Notificado por %s de forma anónima en %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 -#: templates/web/fixmystreet/contact/index.html:48 +#: templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Notificado por %s en %s" @@ -2773,9 +2779,8 @@ msgid "Reported by %s in the %s category by %s at %s" msgstr "Notificado por %s en la categoría %s por %s en %s" #: templates/web/zurich/report/_main.html:2 -#, fuzzy msgid "Reported in the %s category" -msgstr "Notificado en la categoría %s por %s en %s" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" @@ -2801,33 +2806,30 @@ msgstr "Notificado en la categoría %s por %s en %s" msgid "Reporting a problem" msgstr "Notificar un problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:198 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:201 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 -#, fuzzy msgid "Reports" -msgstr "Todas las notificaciones" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" #: templates/web/zurich/admin/index-sdm.html:7 -#, fuzzy msgid "Reports awaiting approval" -msgstr "Notificar un problema" +msgstr "" #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Notificaciones en y alrededor del mapa" #: templates/web/zurich/admin/index-sdm.html:10 -#, fuzzy msgid "Reports published" -msgstr "Denunciar abuso" +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Resend report" msgstr "Vuelva a enviar la notificación" @@ -2843,16 +2845,16 @@ msgstr "Operador de camino operador para este camino (derivado del número de re msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador de ruta para esta ruta con nombre (de OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1343 -#: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: templates/web/default/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: templates/web/default/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:75 msgid "Rotate Right" msgstr "" @@ -2871,9 +2873,8 @@ msgid "Search Users" msgstr "Buscar Usuarios" #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Search reports" -msgstr "Buscar Notificaciones" +msgstr "" #: templates/web/default/admin/reports.html:5 #: templates/web/default/admin/users.html:5 @@ -2900,11 +2901,11 @@ msgstr "Seleccione el tipo de alerta que desea y haga clic en el botón correspo msgid "Sent to %s %s later" msgstr "Enviado a %s %s después" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Sent:" msgstr "Enviado:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:73 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Servicio:" @@ -3005,7 +3006,7 @@ msgstr "Lo sentimos, eso parece ser un código postal dependiente de La Corona, msgid "Sorry, there has been an error confirming your problem." msgstr "Lo sentimos, hubo un error confirmando su problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 #: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 #: perllib/FixMyStreet/Geocode/Google.pm:74 #: perllib/FixMyStreet/Geocode/OSM.pm:66 @@ -3043,17 +3044,17 @@ msgstr "Mes de inicio:" msgid "State" msgstr "Estado" -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/update_edit.html:21 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:54 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Estado/Prov.:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1138 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:213 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:216 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -3062,34 +3063,32 @@ msgstr "Estadísticas" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Status" -msgstr "Estadísticas" +msgstr "" #: templates/web/default/report/updates.html:10 msgid "Still open, via questionnaire, %s" msgstr "Sigue abierta, a través de cuestionario, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 msgid "Subcategory: %s" -msgstr "Categoría: %s" +msgstr "" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:48 -#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/contact/index.html:91 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "Título:" -#: templates/web/default/admin/report_edit.html:13 +#: templates/web/default/admin/report_edit.html:19 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:34 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Subject:" msgstr "Título:" @@ -3109,11 +3108,11 @@ msgstr "Título:" msgid "Submit" msgstr "Enviar" -#: templates/web/default/admin/report_edit.html:67 -#: templates/web/default/admin/update_edit.html:54 +#: templates/web/default/admin/report_edit.html:92 +#: templates/web/default/admin/update_edit.html:60 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:65 -#: templates/web/zurich/admin/report_edit.html:198 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:204 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Enviar Cambios" @@ -3123,19 +3122,18 @@ msgstr "Enviar Cambios" msgid "Submit questionnaire" msgstr "Enviar cuestionario" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:88 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 -#, fuzzy msgid "Submitted" -msgstr "Enviar" +msgstr "" #: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 @@ -3155,8 +3153,8 @@ msgstr "Suscríbeme a alertas por email" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "Suscríbeme a una alerta basada en la baranagay en la que estás:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:200 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3175,10 +3173,9 @@ msgstr "Resumen" msgid "Summary reports" msgstr "Resumen de notificaciones" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 msgid "Survey" -msgstr "Resultados de la Encuesta" +msgstr "" #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" @@ -3193,7 +3190,7 @@ msgstr "Texto" msgid "Text only version" msgstr "Versión solo texto" -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/update_edit.html:20 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "Texto:" @@ -3242,7 +3239,7 @@ msgstr "Gracias por tus comentarios. ¡Nos pondremos en contacto con usted tan p msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Gracias, me alegro de oír que fue arreglado! ¿Podríamos preguntar si alguna vez ha notificado de un problema a un Ayuntamiento con anterioridad?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:186 +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Esa imagen no parece que haya cargado correctamente (%s), por favor inténtelo de nuevo." @@ -3259,7 +3256,7 @@ 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:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:683 msgid "That problem will now be resent." msgstr "El problema ahora será reenviado." @@ -3271,7 +3268,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "Esa notificación ha sido eliminada de FixMyStreet." -#: templates/web/default/open311/index.html:23 +#: templates/web/default/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "El atributo Open311 v2 agency_responsible se utiliza para listar las administraciones que han recibido la notificación de problemas, que no es exactamente la forma en que se define dicho atributo en la especificación Open311 v2." @@ -3282,13 +3279,8 @@ msgstr "El email de confirmación <strong>puede</strong> tardar unos minutos en #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 -#, fuzzy msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -"El Ayuntamiento no podrá ayudar a menos que lo detalle\n" -"todo lo que pueda. Por favor, describa la ubicación exacta del problema (por ejemplo, en un \n" -"muro), lo que es, cuánto tiempo lleva allí, una descripción (y una foto del\n" -" problema si dispusiera de ella), etc" #: templates/web/fixmystreet/questionnaire/index.html:43 msgid "The details of your problem are available from the other tab above." @@ -3299,11 +3291,11 @@ msgid "The details of your problem are available on the right hand side of this msgstr "Los detalles de su problema están disponibles en el lado derecho de esta página." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:67 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "El error fue: %s" -#: templates/web/default/open311/index.html:19 +#: templates/web/default/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Los siguientes atributos Open311 v2 son devueltos para cada petición: service_request_id, descripción, lat, long, media_url, status, requested_datetime, updated_datetime, service_code y service_name." @@ -3380,11 +3372,11 @@ msgstr "La alerta más sencilla es nuestra alerta geográfica:" msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "El título y detalles del problema serán públicos, además de su nombre, si nos da su permiso." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "El usuario no pudo situar el problema en el mapa, salvo para ver el área alrededor de la localización que introdujo." -#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por favor, inténtelo de nuevo más tarde." @@ -3393,7 +3385,7 @@ msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por f msgid "There was a problem showing this page. Please try again later." msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3418,20 +3410,20 @@ msgstr "Hubo problemas con su notificación. Por favor, vea más abajo." msgid "There were problems with your update. Please see below." msgstr "Hubo problemas con la actualización. Por favor, vea más abajo." -#: templates/web/default/open311/index.html:10 +#: templates/web/default/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Esta implementación de la API es un trabajo aún progreso y no es estable todavía. Se cambiará sin advertencias en el futuro." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Este correo electrónico ha sido enviado a los dos Ayuntamientos que cubren la ubicación del problema, ya que el usuario no lo categorizar, por favor, hacer caso omiso de él si usted no es el consejo correcto para hacer frente al problema, o háganos saber qué clase de problema es por lo que podemos añadir a nuestro sistema." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Este correo electrónico ha sido enviado a varios consejos que cubren la ubicación del problema, como la categoría seleccionada se proporciona para todos ellos, por favor, hacer caso omiso de él si usted no es el consejo correcto para hacer frente a la cuestión." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Esta información es necesaria" @@ -3441,12 +3433,15 @@ msgid "This is a developer site; things might break at any time, and the databas msgstr "Este es un sitio para desarrolladores, las cosas podrían romperse en cualquier momento, y la base de datos se eliminará periódicamente." #: templates/web/fixmybarangay/reports/index.html:7 -#, fuzzy msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." +msgstr "" + +#: templates/web/emptyhomes/reports/index.html:4 +#, fuzzy +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." msgstr "Este es un resumen de todas las notificaciones sobre este sitio, seleccione un Ayuntamiento especial para ver los informes enviados allí." #: templates/web/default/reports/index.html:7 -#: templates/web/emptyhomes/reports/index.html:4 #: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." @@ -3482,12 +3477,11 @@ msgstr "Este problema se encuentra en progreso" msgid "This problem is old and of unknown status." msgstr "Este problema es antiguo y de estatus desconocido." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/report/_main.html:14 -#, fuzzy msgid "This report is awaiting moderation." -msgstr "Esta notificación está marcada como abierta." +msgstr "" #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." @@ -3501,16 +3495,15 @@ msgstr "Esta notificación está actualmente marcada como arreglada." msgid "This report is currently marked as open." msgstr "Esta notificación está marcada como abierta." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" -msgstr "%s , notificó anónimamente en %s" +msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Esta página web también contiene una foto del problema, proporcionada por el usuario." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Cronología" @@ -3528,7 +3521,7 @@ msgstr "Para <strong>notificar de un problema</strong>, haz clic en el mapa en l msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Para saber cuáles son las alertas locales que tenemos para usted, por favor introduzca su código postal o el nombre de la calle y el área" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 msgid "To view a map of the precise location of this issue" msgstr "Para ver un mapa de la ubicación precisa de este problema" @@ -3541,9 +3534,8 @@ msgid "Total" msgstr "Total" #: templates/web/seesomething/report/new/fill_in_details_form.html:24 -#, fuzzy msgid "Transport Category" -msgstr "Crear una categoría" +msgstr "" #: templates/web/default/js/translation_strings.html:23 msgid "Try again" @@ -3551,6 +3543,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3558,11 +3552,11 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:59 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Sin confirmar" @@ -3576,9 +3570,8 @@ msgid "Unknown alert type" msgstr "Tipo de alerta desconocida" #: templates/web/default/js/translation_strings.html:33 -#, fuzzy msgid "Unknown error" -msgstr "Desconocido" +msgstr "" #: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" @@ -3594,20 +3587,19 @@ msgid "Update %s created for problem %d; by %s" msgstr "Actualización %s creada para el problema %d; por %s" #: templates/web/default/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:22 +#: templates/web/fixmystreet/contact/index.html:34 msgid "Update below added anonymously at %s" msgstr "La actualización de abajo fue añadida de forma anónima en %s" #: templates/web/default/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:24 +#: templates/web/fixmystreet/contact/index.html:36 msgid "Update below added by %s at %s" msgstr "La actualización de abajo fue añadida por %s en %s" #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 -#, fuzzy msgid "Update body" -msgstr "¡Actualizado!" +msgstr "" #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" @@ -3617,16 +3609,16 @@ msgstr "Actualizar desglose por estado" msgid "Update by {{name}}" msgstr "Actualización por {{name}}" -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "La actualización modificó el estado del problema a %s" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/default/admin/update_edit.html:44 msgid "Update marked problem as fixed" msgstr "La actualización marcó el problema como arreglado" -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/update_edit.html:46 msgid "Update reopened problem" msgstr "La actualización reabrió el problema" @@ -3641,16 +3633,15 @@ msgstr "Actualizar:" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Updated" -msgstr "¡Actualizado!" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:763 -#: perllib/FixMyStreet/App/Controller/Admin.pm:907 -#: perllib/FixMyStreet/App/Controller/Admin.pm:960 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:485 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:972 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:488 msgid "Updated!" msgstr "¡Actualizado!" @@ -3679,30 +3670,30 @@ msgstr "Actualizaciones en {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Actualizaciones para este problema, FixMyStreet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 msgid "User flagged" msgstr "Usuario marcado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:215 #: templates/web/default/admin/flagged.html:24 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Usuarios" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "Values updated" msgstr "Valores actualizados" -#: templates/web/default/admin/report_edit.html:12 -#: templates/web/default/admin/update_edit.html:12 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:23 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Ver notificaciones en el site" @@ -3740,9 +3731,8 @@ msgid "We found more than one match for that location. We show up to ten matches msgstr "Hemos encontrado más de una coincidencia para esa ubicación. Se muestra un máximo de diez, intenta una búsqueda diferente si no lo encuentra aquí." #: templates/web/default/auth/token.html:8 -#, fuzzy msgid "We have not been able to confirm your account - sorry." -msgstr "Te hemos enviado un correo electrónico con un enlace para confirmar tu cuenta." +msgstr "" #: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." @@ -3766,7 +3756,7 @@ msgstr "Nunca mostramos su dirección de email" msgid "We never show your email address or phone number." msgstr "Nunca mostramos su dirección de email o número de teléfono." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Somos conscientes de este problema podría ser responsabilidad de %s , sin embargo, actualmente no tenemos ningún datos de contacto de ellos. Si sabe de alguna dirección de contacto adecuada, por favor póngase contáctenos." @@ -3799,15 +3789,15 @@ msgstr "Nos encantaría saber lo que piensas acerca de este sitio. Sólo tienes msgid "When edited" msgstr "Una vez editada" -#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/problem_row.html:35 msgid "When sent" msgstr "Una vez enviada" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Whole block of empty flats" msgstr "Todo el bloque de pisos vacíos" -#: templates/web/default/open311/index.html:25 +#: templates/web/default/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "En las búsquedas de solicitudes, es también posible buscar por agency_responsible para limitar las solicitudes a las enviados a una sola administración. El término de búsqueda es el ID de administración proporcionada por <a href=\"%s\">MapIT</a>." @@ -3841,13 +3831,13 @@ msgstr "Año" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:63 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:109 @@ -3865,12 +3855,12 @@ msgid "Yes I have a password" msgstr "Sí, tengo una contraseña" #: templates/web/default/contact/index.html:37 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/fixmystreet/contact/index.html:50 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Estás reportando por abusiva la siguiente notificación, que contiene información personal, o similar:" #: templates/web/default/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:16 +#: templates/web/fixmystreet/contact/index.html:28 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Estás reportando por abusiva la siguiente actualización, que contiene información personal, o similar:" @@ -3878,9 +3868,8 @@ msgstr "Estás reportando por abusiva la siguiente actualización, que contiene #: templates/web/default/tokens/confirm_problem.html:21 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 -#, fuzzy msgid "You can <a href=\"%s%s\">view the problem on this site</a>." -msgstr ". Usted puede <a href =\"%s%s\"> ver el problema en este sitio web</ a>." +msgstr "" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:13 @@ -3934,9 +3923,8 @@ msgstr "Ha confirmado su alerta." #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 -#, fuzzy msgid "You have successfully confirmed your email address." -msgstr "Ha confirmado su alerta." +msgstr "" #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 @@ -3956,17 +3944,16 @@ msgstr "Ha creado la alerta." msgid "You have successfully deleted your alert." msgstr "Ha borrado la alerta." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Ha iniciado sesión correctamente, por favor revise y confirme si sus detalles son precisos:" #: templates/web/default/email_sent.html:13 -#, fuzzy msgid "You must now click the link in the email we've just sent you." -msgstr "Ahora debe hacer clic en el enlace del correo electrónico que se le acaba de enviar - si no lo hace, %s." +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "¿De verdad quiere volver a enviar?" @@ -3983,7 +3970,7 @@ msgstr "Sus notificaciones" #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/contact/index.html:84 #: templates/web/fixmystreet/report/display.html:65 #: templates/web/fixmystreet/report/display.html:67 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 @@ -3993,9 +3980,8 @@ msgid "Your email" msgstr "Su email:" #: templates/web/seesomething/report/new/fill_in_details_form.html:81 -#, fuzzy msgid "Your email (optional)" -msgstr "Contraseña (opcional)" +msgstr "" #: templates/web/bromley/report/display.html:132 #: templates/web/fixmystreet/auth/general.html:26 @@ -4035,7 +4021,7 @@ msgid "Your last name" msgstr "Sus Apellidos" #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/contact/index.html:77 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 @@ -4116,17 +4102,12 @@ msgstr "Ayuntamiento" msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "didn't use map" msgstr "no utilizó mapa" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 -#, fuzzy -msgid "duplicate report" -msgstr "Crear una notificación" - #: templates/web/default/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 #: templates/web/seesomething/around/postcode_form.html:9 @@ -4140,36 +4121,66 @@ msgstr "de %d usuarios diferentes" #: templates/web/fixmystreet/report/_item.html:12 #: templates/web/zurich/report/_item.html:16 -#, fuzzy msgid "last updated %s" -msgstr "Última actualización:" +msgstr "" #: perllib/Utils.pm:263 msgid "less than a minute" msgstr "menos de un minuto" -#: templates/web/default/report/updates.html:38 -msgid "marked as %s" +#: templates/web/default/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "" + +#: templates/web/default/report/updates.html:47 +#, fuzzy +msgid "marked as action scheduled" +msgstr "marcado como arreglado" + +#: templates/web/default/report/updates.html:59 +msgid "marked as an internal referral" +msgstr "" + +#: templates/web/default/report/updates.html:49 +#, fuzzy +msgid "marked as closed" msgstr "marcado como %s" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:28 +#: templates/web/default/report/updates.html:51 msgid "marked as fixed" msgstr "marcado como arreglado" +#: templates/web/default/report/updates.html:45 +#, fuzzy +msgid "marked as in progress" +msgstr "Este problema se encuentra en progreso" + +#: templates/web/default/report/updates.html:41 +#, fuzzy +msgid "marked as investigating" +msgstr "Investigando" + +#: templates/web/default/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "" + +#: templates/web/default/report/updates.html:43 +#, fuzzy +msgid "marked as planned" +msgstr "marcado como arreglado" + +#: templates/web/default/report/updates.html:53 +#, fuzzy +msgid "marked as unable to fix" +msgstr "marcado como arreglado" + #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "n/a" -#: templates/web/default/report/updates.html:32 -msgid "no further action" -msgstr "" - -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 -msgid "not the council's responsibility" -msgstr "" - #: templates/web/default/alert/_list.html:87 #: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 @@ -4180,28 +4191,27 @@ msgstr "o" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:27 -#: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:38 -#: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:50 -#: templates/web/zurich/admin/report_edit.html:52 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:53 msgid "originally entered: “%s”" -msgstr "originalmente introducido" +msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "other areas:" msgstr "otras áreas:" -#: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:36 +#: templates/web/default/report/updates.html:29 +#: templates/web/default/report/updates.html:39 msgid "reopened" msgstr "reabierto" @@ -4231,11 +4241,7 @@ msgstr "el Ayuntamiento local" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: templates/web/default/report/updates.html:33 -msgid "third party responsibility" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 msgid "this type of local problem" msgstr "este tipo de problema local" @@ -4243,17 +4249,17 @@ msgstr "este tipo de problema local" msgid "today" msgstr "hoy" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "used map" msgstr "mapa utilizado" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:35 msgid "user is from same council as problem - %d" msgstr "El usuario es del mismo Ayuntamiento que el problema - %d" -#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/update_edit.html:38 msgid "user is problem owner" msgstr "El usuario es el propietario del problema" @@ -4277,11 +4283,11 @@ msgstr[0] "" msgstr[1] "" #: templates/web/default/report/_support.html:6 -#, fuzzy, perl-format +#, perl-format msgid "%d supporter" msgid_plural "%d supporters" -msgstr[0] "%d seguidores" -msgstr[1] "%d seguidores" +msgstr[0] "" +msgstr[1] "" #: perllib/Utils.pm:284 #, perl-format @@ -4338,123 +4344,3 @@ msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" - -#~ msgid "(Don't worry — %s)" -#~ msgstr "(No se preocupe - %s )" - -#~ msgid "*unknown*" -#~ msgstr "*desconocido*" - -#~ msgid "1 supporter" -#~ msgstr "1 seguidor" - -#~ msgid "All confirmed" -#~ msgstr "Todas confirmadas" - -#~ msgid "All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your name if you give us permission." -#~ msgstr "Toda la información proporcionada será enviada a <strong>%s</strong>. En el sitio, vamos a mostrar el título y los detalles de la notificación, además de su nombre, si nos da su permiso." - -#~ msgid "Configuration updated" -#~ msgstr "Configuración actualizada" - -#~ msgid "Configure Open311" -#~ msgstr "Configurar Open311" - -#~ msgid "Configure Open311 integration" -#~ msgstr "Configurar integración de Open311" - -#~ msgid "Council contacts" -#~ msgstr "Contactos del Ayuntamiento" - -#~ msgid "Councils" -#~ msgstr "Ayuntamientos" - -#~ msgid "Currently has 1+ deleted" -#~ msgstr "Actualmente se ha eliminado +1" - -#~ msgid "Enter a nearby GB postcode, or street name and area" -#~ msgstr "Introduzca un código postal nacional cercano, nombre de calle y área" - -#~ msgid "FixMyStreet administration" -#~ msgstr "Administración de FixMyStreet" - -#~ msgid "List Flagged" -#~ msgstr "Lista de Marcado" - -#~ msgid "No info at all" -#~ msgstr "No hay información en absoluto" - -#~ msgid "Report empty properties" -#~ msgstr "Notificar viviendas vacías" - -#~ msgid "Search Abuse" -#~ msgstr "Buscar Abuso" - -#~ msgid "Search Abuse Table" -#~ msgstr "Búsqueda en tabla de abuso" - -#~ msgid "Shelter Cymru" -#~ msgstr "Shelter Cymru" - -#~ msgid "" -#~ "Shelter Cymru is Wales’ people and homes charity and wants\n" -#~ " everyone in Wales to have a decent home. We believe a home is a fundamental\n" -#~ " right and essential to the health and well-being of people and communities.\n" -#~ " We work for people in housing need. We have offices all over Wales and\n" -#~ " prevent people from losing their homes by offering free, confidential and\n" -#~ " independent advice. When necessary we constructively challenge on behalf of\n" -#~ " people to ensure they are properly assisted and to improve practice and\n" -#~ " learning. We believe that bringing empty homes back into use can make a\n" -#~ " significant contribution to the supply of affordable homes in Wales." -#~ msgstr "" -#~ "Shelter Cymru es una organización caritativa en Gales por las personas y hogares y aboga\n" -#~ " por una vivienda digna para todos en Gales. Creemos que una vivienda es un derecho fundamental\n" -#~ " y esencial para la salud y el bienestar de las personas y las comunidades\n" -#~ ". Trabajamos por personas con necesidad de vivienda. Tenemos oficinas en todo Gales, \n" -#~ "evitando que las personas pierdan sus hogares y ofreciendo asesoramiento confidencial e independiente de forma gratuita. Cuando es necesario, representamos \n" -#~ "a las personas para asegurar que estén bien asistidos y mejoramos la práctica y\n" -#~ " aprendizaje. Creemos que poner de nuevo en uso las viviendas vacías puede ser una\n" -#~ " contribución significativa a la oferta de viviendas asequibles en Gales." - -#~ msgid "Some unconfirmeds" -#~ msgstr "Algunos sin confirmar" - -#~ msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :" -#~ msgstr "Gracias por subir tu foto. Ahora necesitamos situar el problema, así que por favor escriba el nombre o código postal de una calle cercana en el cuadro de abajo:" - -#~ msgid "The Empty Homes Agency" -#~ msgstr "The Empty Homes Agency" - -#~ msgid "" -#~ "The Empty Homes agency is an independent campaigning charity. We\n" -#~ " are not part of government, and have no formal links with local councils\n" -#~ " although we work in cooperation with both. We exist to highlight the waste\n" -#~ " of empty property and work with others to devise and promote sustainable\n" -#~ " solutions to bring empty property back into use. We are based in London but\n" -#~ " work across England. We also work in partnership with other charities across\n" -#~ " the UK." -#~ msgstr "" -#~ "La Empty Homes agency es una organización independiente. No\n" -#~ " somos parte del gobierno, y no tenemos vínculos formales con los Ayuntamientos\n" -#~ " aunque trabajamos en cooperación con ambos. Existimos para denunciar la existencia de vivienda vacía y desperdiciada, y trabajar con otros para diseñar y promover soluciones sostenibles\n" -#~ " volver a poner en uso esos bienes. Nuestra sede se encuentra en Londres, pero\n" -#~ " trabajamos a lo largo de Inglaterra. También trabajamos en colaboración con otras organizaciones de caridad a través de\n" -#~ " UK." - -#~ msgid "This is a summary of all reports for one %s." -#~ msgstr "Este es un resumen de todas las notificaciones para un %s ." - -#~ msgid "This is a summary of all reports for this %s." -#~ msgstr "Este es un resumen de todas las notificaciones de este %s ." - -#~ msgid "To <strong>report a problem</strong>, simply click on the map at the correct location." -#~ msgstr "Para <strong>notificar de un problema</strong>, simplemente haz clic en el mapa en la ubicación correcta." - -#~ msgid "Unable to look up areas in MaPit. Please try again later." -#~ msgstr "Imposible buscar áreas en MapIT. Por favor, inténtelo de nuevo más tarde." - -#~ msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>." -#~ msgstr "Puede <a href=\"%s\"> ver todas las notificaciones para el Ayuntamiento</a> o <a href=\"/reports\"> mostrar todos los Ayuntamientos</ a>." - -#~ msgid "You can <a href=\"/reports\">show all councils</a>." -#~ msgstr "Puede <a href=\"/reports\">mostrar todos los Ayuntamientos</a>." diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po index d58a22986..e9da21155 100644 --- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-04-24 08:59+0100\n" -"PO-Revision-Date: 2012-10-29 23:07+0000\n" -"Last-Translator: Tim Morley <>\n" +"POT-Creation-Date: 2013-09-05 17:39+0100\n" +"PO-Revision-Date: 2013-05-02 21:06+0000\n" +"Last-Translator: mysociety <transifex@mysociety.org>\n" "Language-Team: French (France) (http://www.transifex.com/projects/p/fixmystreet/language/fr_FR/)\n" "Language: fr_FR\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid " and " msgstr " et " @@ -41,7 +41,7 @@ msgstr " et <strong>nous allons maintenant l'envoyer à l'administration</strong msgid " or " msgstr " ou " -#: templates/web/default/admin/bodies.html:32 +#: templates/web/default/admin/bodies.html:36 msgid "%d addresses" msgstr "%d adresses" @@ -79,33 +79,29 @@ msgstr "%s - Rapports sommaires" msgid "%s ref: %s" msgstr "%s réf : %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "%s ward, %s" msgstr "Localité %s, %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:572 -#, fuzzy msgid "%s, reported at %s" -msgstr "%s, signalé par %s à %s" +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "%s, within %s ward" msgstr "%s, dans la localité %s" #: templates/web/default/email_sent.html:29 -#, fuzzy msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -msgstr "nous garderons votre alerte sous la main pendant que vous vérifiez votre e-mail." +msgstr "" #: templates/web/default/email_sent.html:25 -#, fuzzy msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -msgstr "nous garderons votre rapport de problème sous la main pendant que vous vérifiez votre e-mail." +msgstr "" #: templates/web/default/email_sent.html:27 -#, fuzzy msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -msgstr "nous garderons votre mise à jour sous la main pendant que vous vérifiez votre e-mail." +msgstr "" #: templates/web/default/admin/report_blocks.html:11 #: templates/web/default/admin/users.html:26 @@ -136,7 +132,7 @@ msgstr "(fermé)" msgid "(fixed)" msgstr "(résolu)" -#: templates/web/default/index.html:11 templates/web/default/index.html:15 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(comme des graffitis, immondices, trottoirs abimés ou éclairage public)" @@ -165,21 +161,20 @@ msgstr "(nous n’affichons jamais votre email ou numéro de téléphone)" msgid "(we never show your email)" msgstr "(nous n’affichons jamais votre email)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Choisissez une catégorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 #: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Choisissez un type de propriété --" #: templates/web/emptyhomes/front/stats.html:5 -#, fuzzy msgid "<big>%s</big> reports" -msgstr "<big>%s</big> mise à jour de rapport" +msgstr "" #: templates/web/default/questionnaire/completed.html:20 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" @@ -296,6 +291,8 @@ msgstr "<strong>Oui</strong>, j'ai un mot de passe :" #: templates/web/default/static/about-en-gb.html:1 #: templates/web/default/static/about-en-gb.html:3 #: templates/web/emptyhomes/header.html:34 +#: templates/web/emptyhomes/static/about-cy.html:1 +#: templates/web/emptyhomes/static/about-cy.html:3 #: templates/web/emptyhomes/static/about-en-gb.html:1 #: templates/web/emptyhomes/static/about-en-gb.html:3 msgid "About us" @@ -303,6 +300,8 @@ msgstr "À propos" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -310,7 +309,8 @@ msgstr "À propos" msgid "Action Scheduled" msgstr "" -#: templates/web/default/admin/bodies.html:47 +#: templates/web/default/admin/bodies.html:53 +#: templates/web/default/admin/bodies.html:57 #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" @@ -411,12 +411,12 @@ msgid "An update marked this problem as fixed." msgstr "Une mise à jour a marqué ce problème comme résolu" #: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/problem_row.html:14 +#: templates/web/default/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonyme" -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonyme :" @@ -439,31 +439,30 @@ msgstr "Vous faites partie d'une administration ?" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:124 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:127 +#: templates/web/zurich/admin/report_edit.html:133 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:113 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:99 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 #: templates/web/zurich/report/updates.html:11 -#, fuzzy msgid "Assigned to %s" -msgstr "Connecté en tant que %s" +msgstr "" -#: templates/web/default/open311/index.html:17 +#: templates/web/default/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Un maximum de %d requètes sont renvoyées pour chaque requète. Les requètes sont triées par requested_datetime; pour obtenir toutes les requètes, faites plusieurs recherches avec une succession de start_date et end_date." -#: templates/web/default/open311/index.html:9 +#: templates/web/default/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "Pour le moment, seul la recherche et la consultation de rapports sont supportés." @@ -484,8 +483,8 @@ msgstr "Bannir l'adresse mail" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "Vérifiez bien la catégorie, car nous l'utilisons pour bien choisir le destinataire de votre rapport." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:208 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -538,16 +537,16 @@ msgstr "Taux de résolution pour problèmes > 4 semaines" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:61 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/report_edit.html:123 msgid "Category:" msgstr "Catégorie :" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "Category: %s" msgstr "Catégorie : %s" @@ -557,22 +556,23 @@ msgstr "Catégorie : %s" msgid "Change Password" msgstr "Changer le mot de passe" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/default/js/translation_strings.html:41 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Cliquez sur le plan pour signaler un problème" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:76 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:90 -#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit.html:98 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -586,7 +586,7 @@ msgstr "Clos par l'administration" msgid "Closed reports" msgstr "Rapports clos" -#: templates/web/default/admin/problem_row.html:32 +#: templates/web/default/admin/problem_row.html:38 msgid "Closed:" msgstr "Clos :" @@ -595,9 +595,9 @@ msgstr "Clos :" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Problèmes clos à proximité <small>(dans l'intervalle de %skm)</small>" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Co-ordinates:" msgstr "Coordonnées" @@ -605,17 +605,17 @@ msgstr "Coordonnées" msgid "Cobrand" msgstr "Collaboration" -#: templates/web/default/admin/report_edit.html:50 -#: templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:75 +#: templates/web/default/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Données de collaboration :" -#: templates/web/default/admin/report_edit.html:49 -#: templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:74 +#: templates/web/default/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Collaboration :" -#: perllib/FixMyStreet/App/Controller/Admin.pm:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Configuration mise à jour - les contacts seront génerés automatiquement par la suite" @@ -662,8 +662,8 @@ msgstr "Confirmé" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/default/admin/problem_row.html:30 -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/problem_row.html:36 +#: templates/web/default/admin/report_edit.html:70 msgid "Confirmed:" msgstr "Confirmé :" @@ -688,12 +688,12 @@ msgstr "Nous contacter" #: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 -#: templates/web/fixmystreet/contact/index.html:7 +#: templates/web/fixmystreet/contact/index.html:19 msgid "Contact the team" msgstr "Contacter l'équipe" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1265 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1293 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 msgid "Could not find user" msgstr "Impossible de trouver l'utilisateur" @@ -732,15 +732,15 @@ msgid "Create category" msgstr "Créer une catégorie" #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/problem_row.html:34 #: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Créé" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:45 +#: templates/web/default/admin/report_edit.html:69 +#: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 -#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Créé :" @@ -779,12 +779,12 @@ msgstr "" msgid "Details" msgstr "Détails :" -#: templates/web/default/admin/report_edit.html:14 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:25 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:36 msgid "Details:" msgstr "Détails :" @@ -814,6 +814,8 @@ msgstr "Je ne sais pas" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -821,10 +823,10 @@ msgstr "Je ne sais pas" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 -#: templates/web/default/admin/problem_row.html:35 +#: templates/web/default/admin/list_updates.html:42 +#: templates/web/default/admin/problem_row.html:41 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:36 +#: templates/web/zurich/admin/problem_row.html:44 msgid "Edit" msgstr "Éditer" @@ -837,7 +839,7 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:4 +#: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Édition du problème %d" @@ -871,11 +873,11 @@ msgstr "Éditeur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1241 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 msgid "Email added to abuse list" msgstr "Email rajouté à la liste des abus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 msgid "Email already in abuse list" msgstr "Email déjà présent dans la liste des abus" @@ -889,31 +891,30 @@ msgstr "Envoyez-moi les mises à jour" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:42 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:67 +#: templates/web/default/admin/update_edit.html:33 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit.html:58 msgid "Email:" msgstr "Email :" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" -msgstr "Email :" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 msgid "Empty office or other commercial" msgstr "" @@ -921,11 +922,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -942,11 +943,10 @@ msgid "End month:" msgstr "Fin mois :" #: templates/web/default/admin/body-form.html:40 -#, fuzzy msgid "Endpoint" -msgstr "Configurez Endpoint" +msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:29 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 msgid "Enter a Zürich street name" msgstr "" @@ -1001,11 +1001,11 @@ msgstr "Erreur" msgid "Example postcode %s" msgstr "Exemple de code postal %s" -#: templates/web/default/open311/index.html:27 +#: templates/web/default/open311/index.html:96 msgid "Examples:" msgstr "Exemples :" -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:76 msgid "Extra data:" msgstr "" @@ -1014,11 +1014,10 @@ msgstr "" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "Échec lors de l'envoi du message. Merci de réessayer, ou <a href=\"mailto:%s\">de nous écrire</a>." -#: templates/web/zurich/admin/index-dm.html:32 -#: templates/web/zurich/admin/index-sdm.html:29 -#, fuzzy +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" -msgstr "Rapports résolus" +msgstr "" #: templates/web/emptyhomes/front/stats.html:6 msgid "Find latest local and national news" @@ -1077,8 +1076,9 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1089,13 +1089,13 @@ msgstr "" msgid "Fixed" msgstr "Résolu" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "Résolu - Administration" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:42 msgid "Fixed - User" msgstr "Résolu - Usager" @@ -1103,7 +1103,7 @@ msgstr "Résolu - Usager" msgid "Fixed reports" msgstr "Rapports résolus" -#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/problem_row.html:37 msgid "Fixed:" msgstr "Résolu :" @@ -1111,12 +1111,12 @@ msgstr "Résolu :" msgid "Flag user" msgstr "Signaler l'usager" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Signalé" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:78 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Signalé :" @@ -1126,7 +1126,7 @@ msgstr "Signalé :" msgid "Follow a ward link to view only reports within that ward." msgstr "Suivez un lien de localité pour voir uniquement les rapports à l'intérieur de cette localité" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "For council(s):" msgstr "Pour la ou les administration(s) :" @@ -1140,6 +1140,7 @@ msgstr "" #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmindelo/faq/faq-pt-cv.html:1 #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 @@ -1147,11 +1148,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Foire Aux Questions" -#: templates/web/default/open311/index.html:69 +#: templates/web/default/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "GeoRSS sur Google Maps" #: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/around/_updates.html:3 #: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "Recevoir les mises à jour" @@ -1180,7 +1182,7 @@ msgstr "Donnez-moi un flux RSS" msgid "Go" msgstr "C'est parti !" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "Envoi du questionnaire ?" @@ -1189,7 +1191,6 @@ msgid "Graph of problem creation by status over time" msgstr "Graphique historique des problèmes créés, par statut" #: templates/web/default/reports/index.html:8 -#: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "Les lignes grisées sont des communes qui n'existent plus" @@ -1236,13 +1237,14 @@ msgstr "Voici les types de problèmes locaux pour « %s »." msgid "Hi %s" msgstr "Moien %s" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:91 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1272,7 +1274,7 @@ msgstr "Comment signaler un problème" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:700 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Je suis désolé, vous ne pouvez pas confirmer des rapports non confirmés" @@ -1299,19 +1301,16 @@ msgid "ID" msgstr "ID" #: templates/web/default/email_sent.html:19 -#, fuzzy msgid "If you do not, your alert will not be activated." -msgstr "votre alerte ne sera pas activée" +msgstr "" #: templates/web/default/email_sent.html:15 -#, fuzzy msgid "If you do not, your problem will not be posted." -msgstr "votre problème ne sera pas affiché" +msgstr "" #: templates/web/default/email_sent.html:17 -#, fuzzy msgid "If you do not, your update will not be posted." -msgstr "votre mise à jour ne sera pas affichée" +msgstr "" #: templates/web/default/report/new/councils_text_none.html:8 #: templates/web/default/report/new/councils_text_none.html:9 @@ -1357,64 +1356,67 @@ msgstr "Sélection de flux invalide" msgid "In Progress" msgstr "En cours" -#: templates/web/default/open311/index.html:21 +#: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "En plus, les attributs suivants qui ne font pas partie de la spécification Open311 v2 sont renvoyés : agency_sent_datetime, title (qui est aussi renvoyé dans la description), interface_used, comment_count, requestor_name (seulement s'il est présent et que le requérant nous a autorisé à l'afficher sur le site)" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:79 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:94 +#: templates/web/zurich/admin/report_edit.html:100 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "En cours" #: templates/web/seesomething/report/new/fill_in_details_form.html:38 -#, fuzzy msgid "Incident Category" -msgstr "Catégorie" +msgstr "" -#: templates/web/zurich/admin/report_edit.html:137 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:143 msgid "Include reporter personal details" -msgstr "Merci d'entrer quelques détails" +msgstr "" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Inclure les rapports non confirmés" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "Valeur has_photo invalide \"%s\"" -#: templates/web/zurich/admin/report_edit-sdm.html:56 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:82 msgid "Internal notes:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:48 +msgid "Internal referral" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "Valeur agency_responsible invalide \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1052 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 msgid "Invalid end date" msgstr "Date de fin invalide" -#: perllib/FixMyStreet/App/Controller/Open311.pm:424 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "Format spécifié %s invalide" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 msgid "Invalid start date" msgstr "Date de début invalide" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1453,11 +1455,11 @@ msgstr "" msgid "Last editor" msgstr "Dernier auteur" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:72 msgid "Last update:" msgstr "Dernière actualisation :" -#: templates/web/default/admin/problem_row.html:33 +#: templates/web/default/admin/problem_row.html:39 msgid "Last update:" msgstr "Dernière actualisation :" @@ -1523,7 +1525,7 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "Plan © <a id=\"osm_link\" href=\"http://www.openstreetmap.lu/\">OpenStreetMap</a> et contributeurs, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" -#: templates/web/fixmystreet/contact/index.html:86 +#: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "Message" @@ -1531,7 +1533,7 @@ msgstr "Message" msgid "Message:" msgstr "Message :" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "jurisdiction_id manquant" @@ -1555,7 +1557,7 @@ msgstr "Encore plus de problèmes aux alentours" #: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 -#: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:9 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmybarangay/reports/index.html:15 @@ -1570,23 +1572,21 @@ msgid "Name" msgstr "Nom" #: templates/web/seesomething/report/new/fill_in_details_form.html:74 -#, fuzzy msgid "Name (optional)" -msgstr "(facultatif)" +msgstr "" -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:66 +#: templates/web/default/admin/update_edit.html:32 #: templates/web/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:57 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Nom :" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" -msgstr "Nom :" +msgstr "" #: templates/web/fiksgatami/footer.html:3 #: templates/web/fiksgatami/nn/footer.html:3 @@ -1602,12 +1602,12 @@ 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:415 -#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:458 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Route la plus proche de l'épingle placée sur le plan (génerée automatiquement à partir de Bing Maps): %s%s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1624,12 +1624,11 @@ msgstr "Presque fini! Maintenant allez voir vos emails…" msgid "New <br>problems" msgstr "Nouveaux <br />problèmes" -#: perllib/FixMyStreet/App/Controller/Admin.pm:249 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 msgid "New body added" -msgstr "Nouveau contact de catégorie rajouté" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 msgid "New category contact added" msgstr "Nouveau contact de catégorie rajouté" @@ -1641,7 +1640,7 @@ msgstr "Nouveaux problèmes locaux sur Fix.lu" msgid "New local reports on reportemptyhomes.com" msgstr "" -#: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New problems" @@ -1668,9 +1667,8 @@ msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "Nouveaux problèmes dans les limites de {{NAME}} sur Fix.lu" #: templates/web/zurich/admin/index-sdm.html:4 -#, fuzzy msgid "New reports" -msgstr "Rapports ouverts" +msgstr "" #: db/alert_types_eha.pl:23 msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -1696,10 +1694,9 @@ msgstr "" msgid "New state" msgstr "Nouvel état" -#: templates/web/zurich/admin/report_edit-sdm.html:59 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" -msgstr "Recevoir les mises à jour" +msgstr "" #: templates/web/fiksgatami/front/news.html:9 #: templates/web/fiksgatami/nn/front/news.html:9 @@ -1715,13 +1712,13 @@ msgstr "" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:25 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 #: templates/web/default/questionnaire/index.html:68 @@ -1754,10 +1751,9 @@ msgstr "Aucun problème signalé n'a été trouvé" msgid "No flagged users found" msgstr "Aucun utilisateur signalé n'a été trouvé" -#: templates/web/zurich/admin/report_edit-sdm.html:66 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" -msgstr "Vos mises à jour" +msgstr "" #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 @@ -1782,14 +1778,16 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 msgid "None" msgstr "Aucun" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1825,7 +1823,7 @@ msgstr "Notez que quand les rapports non confirmés sont inclus nous utilisons l msgid "Note:" msgstr "Note :" -#: templates/web/default/open311/index.html:6 +#: templates/web/default/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "Note : <strong>%s</strong>" @@ -1883,23 +1881,25 @@ msgstr "Anciens <br />problèmes" msgid "Older fixed" msgstr "Anciens résolus" -#: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/emptyhomes/reports/index.html:11 #: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "Anciens problèmes" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:83 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1909,15 +1909,15 @@ msgstr "Ouvert" msgid "Open reports" msgstr "Rapports ouverts" -#: templates/web/default/open311/index.html:3 +#: templates/web/default/open311/index.html:72 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 pour le serveur Fix.lu" -#: templates/web/default/open311/index.html:13 +#: templates/web/default/open311/index.html:82 msgid "Open311 initiative web page" msgstr "Page web de l'initiative Open311" -#: templates/web/default/open311/index.html:14 +#: templates/web/default/open311/index.html:83 msgid "Open311 specification" msgstr "Spécification Open311" @@ -1931,15 +1931,15 @@ msgstr "Ou problèmes signalés à :" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ou vous pouvez vous abonner à une alerte en fonction de la commune dans laquelle vous êtes :" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1046 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:588 #: perllib/FixMyStreet/DB/Result/Problem.pm:598 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Other" msgstr "Autres" @@ -1961,8 +1961,8 @@ msgstr "Page Introuvable" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 msgid "Partial" msgstr "Partiel" @@ -1980,6 +1980,10 @@ msgstr "Mot de passe (facultatif)" msgid "Password:" msgstr "Mot de passe :" +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 @@ -1989,12 +1993,12 @@ msgstr "Mot de passe :" msgid "Phone number (optional)" msgstr "Téléphone (facultatif)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 -#: templates/web/default/admin/report_edit.html:43 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 +#: templates/web/default/admin/report_edit.html:68 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Téléphone" @@ -2004,6 +2008,8 @@ msgstr "Téléphone" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" @@ -2025,15 +2031,15 @@ msgstr "Photos de rapports récents à proximité" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 msgid "Planned" msgstr "Planifié" @@ -2067,10 +2073,10 @@ msgstr "Merci de consulter vos emails" msgid "Please check your email address is correct" msgstr "Merci de vérifier que votre adresse email est correcte" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:852 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:871 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:914 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:917 #: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" @@ -2081,14 +2087,12 @@ msgid "Please choose a property type" msgstr "Merci de choisir un type de propriété" #: templates/web/seesomething/js/translation_strings.html:6 -#, fuzzy msgid "Please choose a transport category" -msgstr "Merci de sélectionner une catégorie" +msgstr "" #: templates/web/seesomething/js/translation_strings.html:7 -#, fuzzy msgid "Please choose an incident category" -msgstr "Merci de sélectionner une catégorie" +msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:64 msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”" @@ -2107,9 +2111,8 @@ msgstr "" #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:7 #: templates/web/oxfordshire/report/new/notes.html:6 -#, fuzzy msgid "Please do not be abusive — abusing your council devalues the service for all users." -msgstr "Merci de rester courtois — se fâcher contre l'administration dévalue le service pour tous les utilisateurs." +msgstr "" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 msgid "Please do not give address or personal information in this section." @@ -2319,11 +2322,11 @@ msgstr "Merci de préciser si le problème a été réglé ou non." msgid "Please take a look at the updates that have been left." msgstr "Merci de consulter les mises à jour qui ont été laissées." -#: perllib/FixMyStreet/App/Controller/Photo.pm:172 +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 msgid "Please upload a JPEG image only" msgstr "Merci de charger uniquement des images JPEG" -#: perllib/FixMyStreet/App/Controller/Photo.pm:179 +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 msgid "Please upload a JPEG image only\n" msgstr "" @@ -2343,7 +2346,7 @@ msgstr "Merci d'écrire votre mise à jour ici" #: templates/web/default/report/update-form.html:109 #: templates/web/default/report/update-form.html:131 #: templates/web/default/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/contact/index.html:105 #: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/fixmystreet/report/update-form.html:71 #: templates/web/fixmystreet/report/update-form.html:95 @@ -2368,7 +2371,7 @@ msgstr "" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "" @@ -2397,7 +2400,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:917 +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 msgid "Problem marked as open." msgstr "Problème signalé comme ouvert." @@ -2433,15 +2436,15 @@ msgstr "Problèmes récemment signalés sur Fix.lu" msgid "Problems within %.1fkm of this location" msgstr "Problèmes à moins de %.1fkm de ce lieu" -#: perllib/FixMyStreet/Cobrand/Default.pm:615 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/Default.pm:626 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:228 msgid "Problems within %s" msgstr "Problèmes à l'intérieur de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:241 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:242 msgid "Problems within %s ward" msgstr "Problèmes dans la localité %s" @@ -2460,11 +2463,10 @@ msgstr "Problèmes à l'intérieur des limites de :" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 -#, fuzzy msgid "Property address:" -msgstr "Type de propriété:" +msgstr "" #: templates/web/default/report/new/category.html:8 msgid "Property type:" @@ -2481,6 +2483,11 @@ msgstr "Entrez un titre" msgid "Provide an update" msgstr "Apporter une mise à jour" +#: templates/web/fixmystreet/auth/general.html:53 +#, fuzzy +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 "Un mot de passe n'est pas obligatoire, mais vous permettra de créer, mettre à jour et administrer vos rapports plus facilement." + #: templates/web/bromley/report/new/fill_in_details_form.html:180 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" @@ -2502,17 +2509,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:172 -#: templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:194 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:196 +#: templates/web/zurich/admin/report_edit.html:202 msgid "Publish the response" msgstr "" @@ -2552,11 +2559,11 @@ msgstr "Questionnaire rempli par le requérant" msgid "RSS feed" msgstr "Flux RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "RSS feed for %s" msgstr "Flux RSS pour %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed for %s ward, %s" msgstr "Flux RSS pour la localité %s, %s" @@ -2564,11 +2571,11 @@ msgstr "Flux RSS pour la localité %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 -#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "RSS feed of %s" msgstr "Flux RSS de %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "RSS feed of %s, within %s ward" msgstr "Flux RSS de %s, dans la localité %s" @@ -2581,15 +2588,15 @@ msgstr "Flux RSS de problèmes à proximité" msgid "RSS feed of problems in this %s" msgstr "Flux RSS de problèmes à l'intérieur de cette %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:616 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 -#: perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/UK.pm:235 msgid "RSS feed of problems within %s" msgstr "Flux RSS de problèmes à l'intérieur de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "RSS feed of problems within %s ward" msgstr "Flux RSS de problèmes à l'intérieur de la localité %s" @@ -2628,7 +2635,8 @@ msgstr "Récemment<br />résolus" msgid "Recently fixed" msgstr "Récemment résolus" -#: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 +#: templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Problèmes signalés récemment" @@ -2645,13 +2653,13 @@ msgstr "" msgid "Remove flag" msgstr "Effacer le signalement" -#: templates/web/default/admin/report_edit.html:64 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:89 +#: templates/web/default/admin/update_edit.html:57 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Effacer la photo (ne peut pas être annulé !)" -#: templates/web/default/index.html:9 templates/web/emptyhomes/header.html:12 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "" @@ -2677,15 +2685,14 @@ msgstr "Signaler un abus" #: templates/web/default/report_created.html:3 #: templates/web/seesomething/report_created.html:0 #: templates/web/seesomething/report_created.html:8 -#, fuzzy msgid "Report created" -msgstr "Signaler un abus" +msgstr "" #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Signaler sur %s" -#: templates/web/default/index.html:18 +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/stevenage/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 @@ -2702,7 +2709,7 @@ msgstr "Signalé %s, à %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 -#: templates/web/fixmystreet/contact/index.html:46 +#: templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Signalé anonymement à %s" @@ -2718,7 +2725,7 @@ msgstr "Signalé par %s anonymement à %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 -#: templates/web/fixmystreet/contact/index.html:48 +#: templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Signalé par %s à %s" @@ -2735,9 +2742,8 @@ msgid "Reported by %s in the %s category by %s at %s" msgstr "Signalé par %s dans la catégorie %s par %s" #: templates/web/zurich/report/_main.html:2 -#, fuzzy msgid "Reported in the %s category" -msgstr "Signalé dans la catégorie %s par %s à %s" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" @@ -2763,33 +2769,30 @@ msgstr "Signalé dans la catégorie %s par %s à %s" msgid "Reporting a problem" msgstr "Signalisation d'un problème" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:198 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:201 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 -#, fuzzy msgid "Reports" -msgstr "Tous les rapports" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" #: templates/web/zurich/admin/index-sdm.html:7 -#, fuzzy msgid "Reports awaiting approval" -msgstr "Signalisation d'un problème" +msgstr "" #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Rapports sur et autour du plan" #: templates/web/zurich/admin/index-sdm.html:10 -#, fuzzy msgid "Reports published" -msgstr "Signaler un abus" +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Resend report" msgstr "Renvoyer le rapport" @@ -2805,16 +2808,16 @@ msgstr "Opérateur pour cette route (déterminé à partir de la référence et msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Opérateur pour cette route (selon OpenStreetMAp): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1343 -#: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: templates/web/default/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: templates/web/default/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:75 msgid "Rotate Right" msgstr "" @@ -2833,9 +2836,8 @@ msgid "Search Users" msgstr "Rechercher utilisateurs" #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Search reports" -msgstr "Rechercher rapports" +msgstr "" #: templates/web/default/admin/reports.html:5 #: templates/web/default/admin/users.html:5 @@ -2862,11 +2864,11 @@ msgstr "Sélectionnez le type d'alerte que vous souhaitez et cliquez sur le bout msgid "Sent to %s %s later" msgstr "Envoyé à %s %s plus tard)" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Sent:" msgstr "Envoyé :" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:73 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Service:" @@ -2967,7 +2969,7 @@ msgstr "Désolé, ceci semble être un code postal d'une dépendance de la Couro msgid "Sorry, there has been an error confirming your problem." msgstr "Désolé, il n'y a eu une erreur lors de la confirmation de votre problème." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 #: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 #: perllib/FixMyStreet/Geocode/Google.pm:74 #: perllib/FixMyStreet/Geocode/OSM.pm:66 @@ -3005,17 +3007,17 @@ msgstr "Mois de début :" msgid "State" msgstr "État actuel" -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/update_edit.html:21 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:54 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "État actuel :" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1138 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:213 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:216 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -3024,34 +3026,32 @@ msgstr "Stats" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Status" -msgstr "Stats" +msgstr "" #: templates/web/default/report/updates.html:10 msgid "Still open, via questionnaire, %s" msgstr "Encore ouvert, via questionnaire, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 msgid "Subcategory: %s" -msgstr "Catégorie : %s" +msgstr "" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:48 -#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/contact/index.html:91 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "Sujet" -#: templates/web/default/admin/report_edit.html:13 +#: templates/web/default/admin/report_edit.html:19 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:34 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Subject:" msgstr "Sujet :" @@ -3071,11 +3071,11 @@ msgstr "Sujet :" msgid "Submit" msgstr "Envoyer" -#: templates/web/default/admin/report_edit.html:67 -#: templates/web/default/admin/update_edit.html:54 +#: templates/web/default/admin/report_edit.html:92 +#: templates/web/default/admin/update_edit.html:60 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:65 -#: templates/web/zurich/admin/report_edit.html:198 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:204 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Envoyer les modifications" @@ -3085,19 +3085,18 @@ msgstr "Envoyer les modifications" msgid "Submit questionnaire" msgstr "Envoi du questionnaire" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:88 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 -#, fuzzy msgid "Submitted" -msgstr "Envoyer" +msgstr "" #: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 @@ -3117,8 +3116,8 @@ msgstr "M'abonner à une alerte par email" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:200 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3137,10 +3136,9 @@ msgstr "Sommaires" msgid "Summary reports" msgstr "Rapports sommaires" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 msgid "Survey" -msgstr "Résultats de l'enquête" +msgstr "" #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" @@ -3155,7 +3153,7 @@ msgstr "Texte" msgid "Text only version" msgstr "Version texte seulement" -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/update_edit.html:20 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "Texte :" @@ -3200,7 +3198,7 @@ msgstr "Merci pour vos commentaires. Nous reviendrons vers vous dès que nous le 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'entendre que ça a été résolu ! Pourrions-nous juste vous demander si vous avez déjà signalé un problème à une administration auparavant ?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:186 +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Cette image ne semble pas avoir été chargés correctement (% s), réessayez s'il vous plaît." @@ -3217,7 +3215,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Ce code postal n'a pas été reconnu, désolé." -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:683 msgid "That problem will now be resent." msgstr "Ce problème va maintenant être renvoyé." @@ -3229,7 +3227,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "Ce rapport a été retiré de Fix.lu." -#: templates/web/default/open311/index.html:23 +#: templates/web/default/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "L'attribut Open311 v2 agency_responsible est utilisé pour lister les administrations qui ont reçu le rapport de problème, ce qui n'est pas tout à fait la façon dont l'attribut est défini dans la spécification Open311 v2." @@ -3240,13 +3238,8 @@ msgstr "L'email de confirmation <strong>peut</ strong> prendre quelques minutes #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 -#, fuzzy msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -"L'administration ne sera pas en mesure d'aider à moins que vous laissiez autant de \n" -"détails que possible. Décrivez s'il vous plaît l'emplacement exact du problème (par exemple sur un \n" -"mur), ce qu'il est, depuis combien de temps il est là, une description (et une photo du \n" -"problème si vous en avez une), etc." #: templates/web/fixmystreet/questionnaire/index.html:43 msgid "The details of your problem are available from the other tab above." @@ -3257,11 +3250,11 @@ msgid "The details of your problem are available on the right hand side of this msgstr "Les détails de votre problème sont disponibles sur le côté droit de cette page." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:67 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "L'erreur était : %s" -#: templates/web/default/open311/index.html:19 +#: templates/web/default/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Les attributs Open311 v2 suivants sont retournés pour chaque requête : service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code et service_name." @@ -3338,11 +3331,11 @@ msgstr "La plus simple de nos alertes est la géographique :" msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "Le sujet et les détails du problème seront rendus publics, ainsi que votre nom si vous nous donnez la permission." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "L'utilisateur n'a pas pu localiser le problème sur une carte, mais pour voir la zone autour de l'endroit qu'il ou elle a entré" -#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Il y a eu un problème pour montrer la page tous les rapports. Réessayez s'il vous plaît ultérieurement." @@ -3351,7 +3344,7 @@ msgstr "Il y a eu un problème pour montrer la page tous les rapports. Réessaye msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3376,20 +3369,20 @@ msgstr "Il y a un problème avec votre rapport. Voir s'il vous plaît plus bas." msgid "There were problems with your update. Please see below." msgstr "Il y a un problème avec votre mise à jour. Voir s'il vous plaît plus bas." -#: templates/web/default/open311/index.html:10 +#: templates/web/default/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Cette implémentation de l'API est en cours de travaux en cours et n'est pas encore stabilisée. Elle est susceptible de changer sans avertissement préalable à l'avenir." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Cet email a été envoyé aux deux administrations couvrant l'emplacement du problème parce que l'utilisateur ne l'a pas classé ; ignorez-le s'il vous plaît si vous n'êtes pas l'administration responsable pour la question, ou faites-nous savoir la bonne catégorie de problèmes afin que nous puissions l'ajouter à notre système." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 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:891 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Ces renseignements sont nécessaires" @@ -3399,12 +3392,15 @@ msgid "This is a developer site; things might break at any time, and the databas msgstr "Ceci est un site de développement, les choses pourraient casser à tout moment, et la base de données sera régulièrement effacée." #: templates/web/fixmybarangay/reports/index.html:7 -#, fuzzy msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." +msgstr "" + +#: templates/web/emptyhomes/reports/index.html:4 +#, fuzzy +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." msgstr "Ceci est un résumé de tous les rapports pour ce site ; sélectionnez une administration pour voir les rapports qui lui ont été envoyés." #: templates/web/default/reports/index.html:7 -#: templates/web/emptyhomes/reports/index.html:4 #: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." @@ -3440,12 +3436,11 @@ msgstr "Ce problème est en cours" msgid "This problem is old and of unknown status." msgstr "Ce problème est vieux et de statut inconnu." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/report/_main.html:14 -#, fuzzy msgid "This report is awaiting moderation." -msgstr "Ce rapport est actuellement marqué comme ouvert." +msgstr "" #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." @@ -3459,16 +3454,15 @@ msgstr "Ce rapport est actuellement marqué comme résolu." msgid "This report is currently marked as open." msgstr "Ce rapport est actuellement marqué comme ouvert." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" -msgstr "%s, signalé anonymement à %s" +msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Cette page Web contient également une photo du problème, fournie par l'utilisateur." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Chronologie" @@ -3486,7 +3480,7 @@ msgstr "Pour <strong>signaler un problème</ strong>, cliquez sur la carte à l' msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 msgid "To view a map of the precise location of this issue" msgstr "Pour voir une carte de l'emplacement précis de ce problème" @@ -3499,9 +3493,8 @@ msgid "Total" msgstr "Total" #: templates/web/seesomething/report/new/fill_in_details_form.html:24 -#, fuzzy msgid "Transport Category" -msgstr "Créer une catégorie" +msgstr "" #: templates/web/default/js/translation_strings.html:23 msgid "Try again" @@ -3509,6 +3502,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3516,11 +3511,11 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:59 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Non confirmé" @@ -3534,9 +3529,8 @@ msgid "Unknown alert type" msgstr "Type d'alerte inconnu" #: templates/web/default/js/translation_strings.html:33 -#, fuzzy msgid "Unknown error" -msgstr "Inconnu" +msgstr "" #: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" @@ -3552,20 +3546,19 @@ msgid "Update %s created for problem %d; by %s" msgstr "Mise à jour %s créée pour le problème %d; par %s" #: templates/web/default/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:22 +#: templates/web/fixmystreet/contact/index.html:34 msgid "Update below added anonymously at %s" msgstr "Mise à jour ci-dessous ajoutée anonymement à %s" #: templates/web/default/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:24 +#: templates/web/fixmystreet/contact/index.html:36 msgid "Update below added by %s at %s" msgstr "Mise à jour ci-dessous ajoutée par %s à %s" #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 -#, fuzzy msgid "Update body" -msgstr "Mis à jour !" +msgstr "" #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" @@ -3575,16 +3568,16 @@ msgstr "Répartition des problèmes par état" msgid "Update by {{name}}" msgstr "Mise à jour par {{name}}" -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Mise à jour du statut du problème vers %s" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/default/admin/update_edit.html:44 msgid "Update marked problem as fixed" msgstr "Une mise à jour a marqué ce problème comme résolu" -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/update_edit.html:46 msgid "Update reopened problem" msgstr "Mettre a jour le problème réouvert" @@ -3599,16 +3592,15 @@ msgstr "Mise à jour :" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Updated" -msgstr "Mis à jour !" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:763 -#: perllib/FixMyStreet/App/Controller/Admin.pm:907 -#: perllib/FixMyStreet/App/Controller/Admin.pm:960 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:485 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:972 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:488 msgid "Updated!" msgstr "Mis à jour !" @@ -3637,30 +3629,30 @@ msgstr "Mises à jour sur {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Mises à jour pour ce problème, Fix.lu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "User flag removed" msgstr "Utilisateur dé–signalé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 msgid "User flagged" msgstr "Utilisateur signalé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:215 #: templates/web/default/admin/flagged.html:24 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Utilisateurs" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "Values updated" msgstr "Valeurs mises à jour" -#: templates/web/default/admin/report_edit.html:12 -#: templates/web/default/admin/update_edit.html:12 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:23 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Voir le rapport sur le site" @@ -3698,9 +3690,8 @@ msgid "We found more than one match for that location. We show up to ten matches msgstr "Nous avons trouvé plus d'une correspondance pour cet endroit. Nous montrons jusqu'à dix résultats, essayez s'il vous plaît une recherche différente si le vôtre n'est pas ici." #: templates/web/default/auth/token.html:8 -#, fuzzy msgid "We have not been able to confirm your account - sorry." -msgstr "Nous vous avons envoyé un email contenant un lien pour confirmer votre compte." +msgstr "" #: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." @@ -3724,7 +3715,7 @@ msgstr "Nous n’affichons jamais votre email" msgid "We never show your email address or phone number." msgstr "Nous n’affichons jamais votre email ou numéro de téléphone." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 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." @@ -3757,15 +3748,15 @@ msgstr "Nous aimerions beaucoup entendre ce que vous pensez de ce site. Il suffi msgid "When edited" msgstr "Édité quand" -#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/problem_row.html:35 msgid "When sent" msgstr "Envoyé quand" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Whole block of empty flats" msgstr "" -#: templates/web/default/open311/index.html:25 +#: templates/web/default/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "Avec les recherches à requètes, il est également possible de rechercher des agency_responsible pour limiter les demandes à celles qui sont envoyées à une administration unique. Le terme de recherche est l'ID de l'administration fourni par <a href=\"%s\">MapIt</ a>." @@ -3799,13 +3790,13 @@ msgstr "Année" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:63 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:109 @@ -3823,12 +3814,12 @@ msgid "Yes I have a password" msgstr "Oui j'ai un mot de passe" #: templates/web/default/contact/index.html:37 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/fixmystreet/contact/index.html:50 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Vous signalez le rapport de problème suivant comme étant violent, contenant des renseignements personnels, ou semblables :" #: templates/web/default/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:16 +#: templates/web/fixmystreet/contact/index.html:28 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Vous signalez la mise à jour suivante comme étant violente, contenant des renseignements personnels, ou semblables :" @@ -3836,9 +3827,8 @@ msgstr "Vous signalez la mise à jour suivante comme étant violente, contenant #: templates/web/default/tokens/confirm_problem.html:21 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 -#, fuzzy msgid "You can <a href=\"%s%s\">view the problem on this site</a>." -msgstr ". Vous pouvez <a href=\"%s%s\">voir le problème sur ce site</a>." +msgstr "" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:13 @@ -3892,9 +3882,8 @@ msgstr "Vous avez réussi à confirmer votre alerte." #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 -#, fuzzy msgid "You have successfully confirmed your email address." -msgstr "Vous avez réussi à confirmer votre alerte." +msgstr "" #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 @@ -3914,17 +3903,16 @@ msgstr "Vous avez réussi à créer votre alerte." msgid "You have successfully deleted your alert." msgstr "Vous avez réussi à effacer votre alerte." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Vous avez réussi à vous connecter ; veuillez vérifier et confirmer que vos coordonnées sont exactes :" #: templates/web/default/email_sent.html:13 -#, fuzzy msgid "You must now click the link in the email we've just sent you." -msgstr "Vous devez maintenant cliquer sur le lien dans l'e-mail que nous venons de vous envoyer - si vous ne le faites pas, %s." +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "Vous voulez vraiment renvoyer?" @@ -3941,7 +3929,7 @@ msgstr "Vos rapports" #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/contact/index.html:84 #: templates/web/fixmystreet/report/display.html:65 #: templates/web/fixmystreet/report/display.html:67 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 @@ -3951,9 +3939,8 @@ msgid "Your email" msgstr "Votre email" #: templates/web/seesomething/report/new/fill_in_details_form.html:81 -#, fuzzy msgid "Your email (optional)" -msgstr "Mot de passe (facultatif)" +msgstr "" #: templates/web/bromley/report/display.html:132 #: templates/web/fixmystreet/auth/general.html:26 @@ -3993,7 +3980,7 @@ msgid "Your last name" msgstr "" #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/contact/index.html:77 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 @@ -4074,17 +4061,12 @@ msgstr "administration" msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "didn't use map" msgstr "n'a pas utilisé le plan" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 -#, fuzzy -msgid "duplicate report" -msgstr "Créer un rapport" - #: templates/web/default/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 #: templates/web/seesomething/around/postcode_form.html:9 @@ -4098,36 +4080,66 @@ msgstr "de %d utilisateurs différents" #: templates/web/fixmystreet/report/_item.html:12 #: templates/web/zurich/report/_item.html:16 -#, fuzzy msgid "last updated %s" -msgstr "Dernière actualisation :" +msgstr "" #: perllib/Utils.pm:263 msgid "less than a minute" msgstr "moins d'une minute" -#: templates/web/default/report/updates.html:38 -msgid "marked as %s" +#: templates/web/default/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "" + +#: templates/web/default/report/updates.html:47 +#, fuzzy +msgid "marked as action scheduled" +msgstr "marqué(s) comme réglé(s)" + +#: templates/web/default/report/updates.html:59 +msgid "marked as an internal referral" +msgstr "" + +#: templates/web/default/report/updates.html:49 +#, fuzzy +msgid "marked as closed" msgstr "marqué(s) comme %s" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:28 +#: templates/web/default/report/updates.html:51 msgid "marked as fixed" msgstr "marqué(s) comme réglé(s)" +#: templates/web/default/report/updates.html:45 +#, fuzzy +msgid "marked as in progress" +msgstr "Ce problème est en cours" + +#: templates/web/default/report/updates.html:41 +#, fuzzy +msgid "marked as investigating" +msgstr "En examen" + +#: templates/web/default/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "" + +#: templates/web/default/report/updates.html:43 +#, fuzzy +msgid "marked as planned" +msgstr "marqué(s) comme réglé(s)" + +#: templates/web/default/report/updates.html:53 +#, fuzzy +msgid "marked as unable to fix" +msgstr "marqué(s) comme réglé(s)" + #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "s.o." -#: templates/web/default/report/updates.html:32 -msgid "no further action" -msgstr "" - -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 -msgid "not the council's responsibility" -msgstr "" - #: templates/web/default/alert/_list.html:87 #: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 @@ -4138,28 +4150,27 @@ msgstr " ou " msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:27 -#: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:38 -#: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:50 -#: templates/web/zurich/admin/report_edit.html:52 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:53 msgid "originally entered: “%s”" -msgstr "initialement entré" +msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "other areas:" msgstr "autres lieux:" -#: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:36 +#: templates/web/default/report/updates.html:29 +#: templates/web/default/report/updates.html:39 msgid "reopened" msgstr "réouvert" @@ -4189,11 +4200,7 @@ msgstr "L'administration locale" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: templates/web/default/report/updates.html:33 -msgid "third party responsibility" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 msgid "this type of local problem" msgstr "Ce type de problème local" @@ -4201,17 +4208,17 @@ msgstr "Ce type de problème local" msgid "today" msgstr "aujourd'hui" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "used map" msgstr "plan utilisé" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:35 msgid "user is from same council as problem - %d" msgstr "l'utilisateur est de la même administration que le problème - %d" -#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/update_edit.html:38 msgid "user is problem owner" msgstr "utilisateurs propriétaire du problème" @@ -4235,11 +4242,11 @@ msgstr[0] "" msgstr[1] "" #: templates/web/default/report/_support.html:6 -#, fuzzy, perl-format +#, perl-format msgid "%d supporter" msgid_plural "%d supporters" -msgstr[0] "%d gens soutiennent" -msgstr[1] "%d gens soutiennent" +msgstr[0] "" +msgstr[1] "" #: perllib/Utils.pm:284 #, perl-format @@ -4296,72 +4303,3 @@ msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" - -#~ msgid "(Don't worry — %s)" -#~ msgstr "(Ne vous inquiétez pas — %s)" - -#~ msgid "*unknown*" -#~ msgstr "*inconnu*" - -#~ msgid "All confirmed" -#~ msgstr "Tous les confirmés" - -#~ msgid "All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your name if you give us permission." -#~ msgstr "Toutes les informations que vous fournissez ici seront envoyées à <strong>%s</strong>. Sur ce site, nous afficherons le sujet et les détails du problème, et votre nom si vous nous le permettez." - -#~ msgid "Configuration updated" -#~ msgstr "Configuration mise à jour" - -#~ msgid "Configure Open311" -#~ msgstr "Configurer Open311" - -#~ msgid "Configure Open311 integration" -#~ msgstr "Configurer integration Open311" - -#~ msgid "Council contacts" -#~ msgstr "Contacts de l'administration" - -#~ msgid "Councils" -#~ msgstr "Administrations" - -#~ msgid "Currently has 1+ deleted" -#~ msgstr "A actuellement 1+ effacés" - -#~ msgid "Enter a nearby GB postcode, or street name and area" -#~ msgstr "Entrez un code postal proche, ou une rue et une localité" - -#~ msgid "FixMyStreet administration" -#~ msgstr "Administration Fix.lu" - -#~ msgid "List Flagged" -#~ msgstr "Lister les signalés" - -#~ msgid "No info at all" -#~ msgstr "Pas d'info du tout" - -#~ msgid "Search Abuse" -#~ msgstr "Rechercher abus" - -#~ msgid "Search Abuse Table" -#~ msgstr "Rechercher dans la liste des abus" - -#~ msgid "Some unconfirmeds" -#~ msgstr "Quelques non-confirmés" - -#~ msgid "This is a summary of all reports for one %s." -#~ msgstr "Ceci est un résumé de tous les rapports pour un(e) %s." - -#~ msgid "This is a summary of all reports for this %s." -#~ msgstr "Ceci est un résumé de tous les rapports pour ce(tte) %s." - -#~ msgid "To <strong>report a problem</strong>, simply click on the map at the correct location." -#~ msgstr "Pour <strong>signaler un problème</ strong>, cliquez simplement sur la carte à l'emplacement correct." - -#~ msgid "Unable to look up areas in MaPit. Please try again later." -#~ msgstr "Impossible de rechercher les lieux dans MapIt. Réessayez s'il vous plaît ultérieurement." - -#~ msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>." -#~ msgstr "Vous pouvez <a href=\"%s\">voir tous les rapports pour cette administration</a> or <a href=\"/reports\">voir toutes les administrations</a>." - -#~ msgid "You can <a href=\"/reports\">show all councils</a>." -#~ msgstr "Vous pouvez <a href=\"/reports\">voir toutes les administrations</a>." diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po index 265ce6237..64ce4826a 100644 --- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -5,16 +5,14 @@ # # Translators: # Antonia <antonia.banovic@gmail.com>, 2013 -# Antonia <antonia.banovic@gmail.com>, 2013 # BojanOpacak <bojan@rationalinternational.net>, 2012 -# matesuba <matesuba@gmail.com>, 2012-2013 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-04-24 08:59+0100\n" -"PO-Revision-Date: 2013-02-11 23:35+0000\n" -"Last-Translator: Antonia <antonia.banovic@gmail.com>\n" +"POT-Creation-Date: 2013-09-05 17:39+0100\n" +"PO-Revision-Date: 2013-05-02 21:06+0000\n" +"Last-Translator: mysociety <transifex@mysociety.org>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/fixmystreet/language/hr/)\n" "Language: hr\n" "MIME-Version: 1.0\n" @@ -23,7 +21,7 @@ msgstr "" "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:636 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid " and " msgstr "i" @@ -44,7 +42,7 @@ msgstr "i <strong>mi to sad šaljemo odgovornim tijelima</strong>" msgid " or " msgstr "ili" -#: templates/web/default/admin/bodies.html:32 +#: templates/web/default/admin/bodies.html:36 msgid "%d addresses" msgstr "%d adrese" @@ -82,33 +80,29 @@ msgstr "%s - Sažetak izvješća" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "%s ward, %s" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:572 -#, fuzzy msgid "%s, reported at %s" -msgstr "%s, prijavljeno od %s u %s" +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "%s, within %s ward" msgstr "" #: templates/web/default/email_sent.html:29 -#, fuzzy msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -msgstr "pozabavit ćemo se Vašim upozorenjem dok provjeravate e-mail." +msgstr "" #: templates/web/default/email_sent.html:25 -#, fuzzy msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -msgstr "pozabavit ćemo se Vašom prijavom dok provjeravate mail." +msgstr "" #: templates/web/default/email_sent.html:27 -#, fuzzy msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -msgstr "pozabavit ćemo se Vašim ažuriranjem dok provjeravate e-mail." +msgstr "" #: templates/web/default/admin/report_blocks.html:11 #: templates/web/default/admin/users.html:26 @@ -139,7 +133,7 @@ msgstr "(zatvoreno)" msgid "(fixed)" msgstr "(popravljeno)" -#: templates/web/default/index.html:11 templates/web/default/index.html:15 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(grafiti, ilegalno odlaganje otpada, oštećeni kolnici, klupe, lampe...)" @@ -168,21 +162,20 @@ msgstr "(vašu email adresu i broj telefona držimo u tajnosti)" msgid "(we never show your email)" msgstr "(vaš email držimo u tajnosti)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Izaberi kategoriju --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 #: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Izaberite vrstu posjeda --" #: templates/web/emptyhomes/front/stats.html:5 -#, fuzzy msgid "<big>%s</big> reports" -msgstr "<big>%s</big> ažuriranje za prijavu" +msgstr "" #: templates/web/default/questionnaire/completed.html:20 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" @@ -310,6 +303,8 @@ msgstr "<strong>Da</strong> Imam password" #: templates/web/default/static/about-en-gb.html:1 #: templates/web/default/static/about-en-gb.html:3 #: templates/web/emptyhomes/header.html:34 +#: templates/web/emptyhomes/static/about-cy.html:1 +#: templates/web/emptyhomes/static/about-cy.html:3 #: templates/web/emptyhomes/static/about-en-gb.html:1 #: templates/web/emptyhomes/static/about-en-gb.html:3 msgid "About us" @@ -317,6 +312,8 @@ msgstr "O nama" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -324,7 +321,8 @@ msgstr "O nama" msgid "Action Scheduled" msgstr "" -#: templates/web/default/admin/bodies.html:47 +#: templates/web/default/admin/bodies.html:53 +#: templates/web/default/admin/bodies.html:57 #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" @@ -425,12 +423,12 @@ msgid "An update marked this problem as fixed." msgstr "Ažuriranjem je ovaj problem evidentiran kao popravljen." #: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/problem_row.html:14 +#: templates/web/default/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonimno" -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonimno:" @@ -453,31 +451,30 @@ msgstr "Pripadate li odgovornom tijelu?" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:124 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:127 +#: templates/web/zurich/admin/report_edit.html:133 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:113 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:99 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 #: templates/web/zurich/report/updates.html:11 -#, fuzzy msgid "Assigned to %s" -msgstr "Prijavljen kao %s" +msgstr "" -#: templates/web/default/open311/index.html:17 +#: templates/web/default/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Većinom %d su zahtjevi vraćeni na query. Vraćeni zahtjevi poredani su prema traženom_datumu, pa da biste dobili sve zahtjeve, pretražite nekoliko puta sa pomičnim datumom_početka i završetka_." -#: templates/web/default/open311/index.html:9 +#: templates/web/default/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "Trenutačno radi samo pretraživanje i pregledavanje prijava." @@ -498,8 +495,8 @@ msgstr "Onemogući e-mail adrese" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "Pazite da odaberete pravu kategoriju jer je koristimo kako bismo utvrdili kome je izvješće poslano." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:208 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -552,16 +549,16 @@ msgstr " Postotak popravaka za kategoriju > staro 4 tjedna" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:61 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/report_edit.html:123 msgid "Category:" msgstr "Kategorija:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "Category: %s" msgstr "Kategorija: %s" @@ -571,22 +568,23 @@ msgstr "Kategorija: %s" msgid "Change Password" msgstr "Promijeni lozinku" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/default/js/translation_strings.html:41 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Kliknite mapu da prijavite problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:76 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:90 -#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit.html:98 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -600,7 +598,7 @@ msgstr "Zatvorilo je odgovorno tijelo" msgid "Closed reports" msgstr "Zatvorene prijave" -#: templates/web/default/admin/problem_row.html:32 +#: templates/web/default/admin/problem_row.html:38 msgid "Closed:" msgstr "Zatvoreno:" @@ -609,9 +607,9 @@ msgstr "Zatvoreno:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Najbliži problemi <small>(within %skm)</small>" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Co-ordinates:" msgstr "Koordinate:" @@ -619,17 +617,17 @@ msgstr "Koordinate:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/default/admin/report_edit.html:50 -#: templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:75 +#: templates/web/default/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Cobrand podaci:" -#: templates/web/default/admin/report_edit.html:49 -#: templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:74 +#: templates/web/default/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Konfiguracija ažurirana - kontakti će biti automatski generirani naknadno" @@ -676,8 +674,8 @@ msgstr "Potvrđeno" msgid "Confirmed reports between %s and %s" msgstr "Potvrđene prijave između %s i %s" -#: templates/web/default/admin/problem_row.html:30 -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/problem_row.html:36 +#: templates/web/default/admin/report_edit.html:70 msgid "Confirmed:" msgstr "Potvrđeno:" @@ -702,12 +700,12 @@ msgstr "Kontaktiraj nas" #: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 -#: templates/web/fixmystreet/contact/index.html:7 +#: templates/web/fixmystreet/contact/index.html:19 msgid "Contact the team" msgstr "Kontaktiraj tim" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1265 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1293 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 msgid "Could not find user" msgstr "Nepoznati korisnik" @@ -746,15 +744,15 @@ msgid "Create category" msgstr "Kreiraj kategoriju" #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/problem_row.html:34 #: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Kreirano" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:45 +#: templates/web/default/admin/report_edit.html:69 +#: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 -#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Kreirano:" @@ -793,12 +791,12 @@ msgstr "" msgid "Details" msgstr "Detalji" -#: templates/web/default/admin/report_edit.html:14 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:25 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:36 msgid "Details:" msgstr "Detalji:" @@ -828,6 +826,8 @@ msgstr "Ne’znam" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -835,10 +835,10 @@ msgstr "Ne’znam" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 -#: templates/web/default/admin/problem_row.html:35 +#: templates/web/default/admin/list_updates.html:42 +#: templates/web/default/admin/problem_row.html:41 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:36 +#: templates/web/zurich/admin/problem_row.html:44 msgid "Edit" msgstr "Uredi" @@ -851,7 +851,7 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:4 +#: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Uređivanje problema %d" @@ -885,11 +885,11 @@ msgstr "Urednik" msgid "Email" msgstr "E-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1241 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 msgid "Email added to abuse list" msgstr "E-mail dodan na listu zloupotrebe" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 msgid "Email already in abuse list" msgstr "E-mail je već na listi zloupotrebe" @@ -903,31 +903,30 @@ msgstr "Pošalji mi e-mail o ažuriranjima" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:42 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:67 +#: templates/web/default/admin/update_edit.html:33 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit.html:58 msgid "Email:" msgstr "E-mail:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" -msgstr "E-mail:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty flat or maisonette" msgstr "Prazan stan ili kućica" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty house or bungalow" msgstr "Prazna kuća ili bungalov" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 msgid "Empty office or other commercial" msgstr "Prazan ured ili poslovni prostor" @@ -935,11 +934,11 @@ msgstr "Prazan ured ili poslovni prostor" msgid "Empty property details form" msgstr "Formular o detaljima napuštene nekretnine" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Empty pub or bar" msgstr "Prazan kafić ili bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 msgid "Empty public building - school, hospital, etc." msgstr "Prazne javne zgrade - škola, bolnica, itd." @@ -956,14 +955,12 @@ msgid "End month:" msgstr "Mjesec završetka:" #: templates/web/default/admin/body-form.html:40 -#, fuzzy msgid "Endpoint" -msgstr "Konfiguriraj Endpoint" +msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:29 -#, fuzzy +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 msgid "Enter a Zürich street name" -msgstr "Unesi ime obližnje ulice i kvarta" +msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:18 msgid "Enter a nearby UK postcode, or street name and area" @@ -1016,11 +1013,11 @@ msgstr "Greška" msgid "Example postcode %s" msgstr "Primjer poštanskog broja %s" -#: templates/web/default/open311/index.html:27 +#: templates/web/default/open311/index.html:96 msgid "Examples:" msgstr "Primjeri:" -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:76 msgid "Extra data:" msgstr "Dodatni podaci:" @@ -1029,11 +1026,10 @@ msgstr "Dodatni podaci:" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "Neuspješno slanje poruke. Molimo pokušajte opet ili nas <a href=\"mailto:%s\">kontaktirajte</a>." -#: templates/web/zurich/admin/index-dm.html:32 -#: templates/web/zurich/admin/index-sdm.html:29 -#, fuzzy +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" -msgstr "Popravljene prijave" +msgstr "" #: templates/web/emptyhomes/front/stats.html:6 msgid "Find latest local and national news" @@ -1092,8 +1088,9 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1104,13 +1101,13 @@ msgstr "" msgid "Fixed" msgstr "Popravljeno" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "Popravljeno - odgovorno tijelo" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:42 msgid "Fixed - User" msgstr "Popravljeno - Korisnik" @@ -1118,7 +1115,7 @@ msgstr "Popravljeno - Korisnik" msgid "Fixed reports" msgstr "Popravljene prijave" -#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/problem_row.html:37 msgid "Fixed:" msgstr "Popravljeno:" @@ -1126,12 +1123,12 @@ msgstr "Popravljeno:" msgid "Flag user" msgstr "Označi korisnika" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Označen" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:78 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Označen:" @@ -1141,7 +1138,7 @@ msgstr "Označen:" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "For council(s):" msgstr "Za županiju(e):" @@ -1155,6 +1152,7 @@ msgstr "Zaboravili ste šifru?" #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmindelo/faq/faq-pt-cv.html:1 #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 @@ -1162,11 +1160,12 @@ msgstr "Zaboravili ste šifru?" msgid "Frequently Asked Questions" msgstr "Često postavljana pitanja" -#: templates/web/default/open311/index.html:69 +#: templates/web/default/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "GeoRSS na Google Mapama" #: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/around/_updates.html:3 #: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "Primite ažuriranja" @@ -1195,7 +1194,7 @@ msgstr "Prijavi se na RSS izvor" msgid "Go" msgstr "Idi" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "Pošalji upitnik?" @@ -1204,7 +1203,6 @@ msgid "Graph of problem creation by status over time" msgstr "Grafikon nastanka problema prema položaju tijekom vremena" #: templates/web/default/reports/index.html:8 -#: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "Sivo osjenčani su councils koji više ne postoje" @@ -1251,13 +1249,14 @@ msgstr "Vrste upozorenja za lokalne probleme ‘%s’." msgid "Hi %s" msgstr "Zdravo %s" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:91 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1287,7 +1286,7 @@ msgstr "Kako prijaviti problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:700 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Nažalost, ne možeš potvrditi nepotvrđena izvješća" @@ -1314,19 +1313,16 @@ msgid "ID" msgstr "ID" #: templates/web/default/email_sent.html:19 -#, fuzzy msgid "If you do not, your alert will not be activated." -msgstr "Vaše upozorenje neće se aktivirati" +msgstr "" #: templates/web/default/email_sent.html:15 -#, fuzzy msgid "If you do not, your problem will not be posted." -msgstr "Vaš problem neće biti objavljen" +msgstr "" #: templates/web/default/email_sent.html:17 -#, fuzzy msgid "If you do not, your update will not be posted." -msgstr "Vaše ažuriranje neće biti objavljeno" +msgstr "" #: templates/web/default/report/new/councils_text_none.html:8 #: templates/web/default/report/new/councils_text_none.html:9 @@ -1371,64 +1367,67 @@ msgstr "Ilegalan odabir izvora" msgid "In Progress" msgstr "U tijeku" -#: templates/web/default/open311/index.html:21 +#: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Nadalje, sljedeća svojstva koja nisu dio Open311 v2 specifikacija su vraćena: agencijski _poslano_datum-vrijeme, naslov (također vraćen kao dio opisa), sučelje_korišteno, brojač_komentara, ime_pretražitelja(prisutno samo ako je tražitelj dopustio prikaz imena na ovoj stranici)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:79 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:94 +#: templates/web/zurich/admin/report_edit.html:100 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "U tijeku" #: templates/web/seesomething/report/new/fill_in_details_form.html:38 -#, fuzzy msgid "Incident Category" -msgstr "Kategorija" +msgstr "" -#: templates/web/zurich/admin/report_edit.html:137 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:143 msgid "Include reporter personal details" -msgstr "Unesi detalje" +msgstr "" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Uključi nepotvrđene prijave" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "Pogrešno ima_foto vrijednost\"%s\"" -#: templates/web/zurich/admin/report_edit-sdm.html:56 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:82 msgid "Internal notes:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:48 +msgid "Internal referral" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "Nevažeća odgovorna_vrijednost agencije %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1052 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 msgid "Invalid end date" msgstr "Nevažeći datum završetka" -#: perllib/FixMyStreet/App/Controller/Open311.pm:424 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "Naveden nevažeći %s format." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 msgid "Invalid start date" msgstr "Nevažeći datum početka" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1467,11 +1466,11 @@ msgstr "Prezime" msgid "Last editor" msgstr "Posljednji " -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:72 msgid "Last update:" msgstr "Posljednje ažuriranje" -#: templates/web/default/admin/problem_row.html:33 +#: templates/web/default/admin/problem_row.html:39 msgid "Last update:" msgstr "Posljednje ažuriranje:" @@ -1537,7 +1536,7 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "Mapiraj i kopiraj; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> i kontributori, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" -#: templates/web/fixmystreet/contact/index.html:86 +#: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "Poruka" @@ -1545,7 +1544,7 @@ msgstr "Poruka" msgid "Message:" msgstr "Poruka:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "Nedostaje nadležni_ID" @@ -1569,7 +1568,7 @@ msgstr "Više problema u blizini" #: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 -#: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:9 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmybarangay/reports/index.html:15 @@ -1584,23 +1583,21 @@ msgid "Name" msgstr "Ime" #: templates/web/seesomething/report/new/fill_in_details_form.html:74 -#, fuzzy msgid "Name (optional)" -msgstr "(nije obavezno)" +msgstr "" -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:66 +#: templates/web/default/admin/update_edit.html:32 #: templates/web/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:57 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Ime:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" -msgstr "Ime:" +msgstr "" #: templates/web/fiksgatami/footer.html:3 #: templates/web/fiksgatami/nn/footer.html:3 @@ -1616,12 +1613,12 @@ 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:415 -#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:458 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Najbliža cesta smještena pokraj oznake na mapi (automatski generirano pomoću Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1638,12 +1635,11 @@ msgstr "Skoro učinjeno! Sada provjeri svoj e-mail..." msgid "New <br>problems" msgstr "Novi <br>problemi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:249 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 msgid "New body added" -msgstr "Novi kontakt dodan u kategoriju" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 msgid "New category contact added" msgstr "Novi kontakt dodan u kategoriju" @@ -1655,7 +1651,7 @@ msgstr "Novi lokalni problemi na Popravi.to" msgid "New local reports on reportemptyhomes.com" msgstr "Nove lokalne prijave na kućoprazna.joj" -#: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New problems" @@ -1682,9 +1678,8 @@ msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "Novi problemi unutar {{NAME}} granice na Popravi.to" #: templates/web/zurich/admin/index-sdm.html:4 -#, fuzzy msgid "New reports" -msgstr "Otvori izvješća" +msgstr "" #: db/alert_types_eha.pl:23 msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -1710,10 +1705,9 @@ msgstr "Nove prijave u djelokrugu {{IME}} na praznakuco.joj" msgid "New state" msgstr "Novo stanje" -#: templates/web/zurich/admin/report_edit-sdm.html:59 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" -msgstr "Primite ažuriranja" +msgstr "" #: templates/web/fiksgatami/front/news.html:9 #: templates/web/fiksgatami/nn/front/news.html:9 @@ -1729,13 +1723,13 @@ msgstr "" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:25 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 #: templates/web/default/questionnaire/index.html:68 @@ -1768,10 +1762,9 @@ msgstr "Nisu pronađeni označeni problemi" msgid "No flagged users found" msgstr "Nisu pronađeni označeni korisnici" -#: templates/web/zurich/admin/report_edit-sdm.html:66 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" -msgstr "Vaša ažuriranja" +msgstr "" #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 @@ -1796,14 +1789,16 @@ msgstr "Bez podrške" msgid "Non Public" msgstr "Bez javnosti" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 msgid "None" msgstr "Nijedan" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1839,7 +1834,7 @@ msgstr "Imajte na umu da kada uključujemo nepotvrđene prijave koristimo datum msgid "Note:" msgstr "Napomena:" -#: templates/web/default/open311/index.html:6 +#: templates/web/default/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "Napomena: <strong>%s</strong>" @@ -1897,23 +1892,25 @@ msgstr "Stariji <br>problemi" msgid "Older fixed" msgstr "Starije popravljeno" -#: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/emptyhomes/reports/index.html:11 #: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "Stariji problemi" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:83 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1923,15 +1920,15 @@ msgstr "Otvori" msgid "Open reports" msgstr "Otvori izvješća" -#: templates/web/default/open311/index.html:3 +#: templates/web/default/open311/index.html:72 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API za Popravi.to server" -#: templates/web/default/open311/index.html:13 +#: templates/web/default/open311/index.html:82 msgid "Open311 initiative web page" msgstr "Open311 prvotna web stranica" -#: templates/web/default/open311/index.html:14 +#: templates/web/default/open311/index.html:83 msgid "Open311 specification" msgstr "Open311 specifikacija" @@ -1945,15 +1942,15 @@ msgstr "Ili problemi prijavljeni:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ili se možete pretplatiti na upozorenja unutar vašeg vijeća ’:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1046 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:588 #: perllib/FixMyStreet/DB/Result/Problem.pm:598 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Other" msgstr "Drugo" @@ -1975,8 +1972,8 @@ msgstr "Stranica nije pronađena" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 msgid "Partial" msgstr "Djelomično" @@ -1994,6 +1991,10 @@ msgstr "Lozinka (neobvezno)" msgid "Password:" msgstr "Lozinka:" +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 @@ -2003,12 +2004,12 @@ msgstr "Lozinka:" msgid "Phone number (optional)" msgstr "Telefonski broj (neobavezan)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 -#: templates/web/default/admin/report_edit.html:43 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 +#: templates/web/default/admin/report_edit.html:68 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2018,6 +2019,8 @@ msgstr "Telefon:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" @@ -2039,15 +2042,15 @@ msgstr "Fotografije posljednjih obližnjih prijava" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 msgid "Planned" msgstr "Planirano" @@ -2081,10 +2084,10 @@ msgstr "Provjeri svoj e-mail" msgid "Please check your email address is correct" msgstr "Provjerite je li vaša e-mail adresa točna" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:852 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:871 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:914 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:917 #: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" @@ -2095,14 +2098,12 @@ msgid "Please choose a property type" msgstr "Izaberi tip imovine" #: templates/web/seesomething/js/translation_strings.html:6 -#, fuzzy msgid "Please choose a transport category" -msgstr "Izaberi kategoriju" +msgstr "" #: templates/web/seesomething/js/translation_strings.html:7 -#, fuzzy msgid "Please choose an incident category" -msgstr "Izaberi kategoriju" +msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:64 msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”" @@ -2121,9 +2122,8 @@ msgstr "" #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:7 #: templates/web/oxfordshire/report/new/notes.html:6 -#, fuzzy msgid "Please do not be abusive — abusing your council devalues the service for all users." -msgstr "Molimo vas da ne zlorabite uslugu— iskorištavanje odgovornog tijela obezvrjeđuje uslugu za sve korisnike." +msgstr "" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 msgid "Please do not give address or personal information in this section." @@ -2338,11 +2338,11 @@ msgstr "Navedite je li problem rješen " msgid "Please take a look at the updates that have been left." msgstr "Pregledajte ažuriranja" -#: perllib/FixMyStreet/App/Controller/Photo.pm:172 +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 msgid "Please upload a JPEG image only" msgstr "Molimo učitajte samo JPEG slike" -#: perllib/FixMyStreet/App/Controller/Photo.pm:179 +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 msgid "Please upload a JPEG image only\n" msgstr "Molimo učitajte samo JPEG slike\n" @@ -2362,7 +2362,7 @@ msgstr "Ovdje ažurirajte" #: templates/web/default/report/update-form.html:109 #: templates/web/default/report/update-form.html:131 #: templates/web/default/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/contact/index.html:105 #: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/fixmystreet/report/update-form.html:71 #: templates/web/fixmystreet/report/update-form.html:95 @@ -2387,14 +2387,13 @@ msgstr "" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "Privatno" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:108 -#, fuzzy msgid "Private information (not shown on site)" -msgstr "Dodatne informacije o našem radu na ispražnjenim stanovima." +msgstr "" #: templates/web/default/maps/openlayers.html:85 msgid "Problem" @@ -2417,7 +2416,7 @@ msgstr "Problem %s poslan odgovornom tijelu %s" msgid "Problem breakdown by state" msgstr "Analiza problema prema stanju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:917 +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 msgid "Problem marked as open." msgstr "Problem označen kao otvoren." @@ -2453,15 +2452,15 @@ msgstr "Problems nedavno prijavljeni kao popravljeni na Popravi.to" msgid "Problems within %.1fkm of this location" msgstr "Problemi unutar%.1fkm od ove lokacije" -#: perllib/FixMyStreet/Cobrand/Default.pm:615 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/Default.pm:626 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:228 msgid "Problems within %s" msgstr "Problemi unutar %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:241 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:242 msgid "Problems within %s ward" msgstr "Problemi unutar %s ward" @@ -2480,11 +2479,10 @@ msgstr "Problemi unutar granice:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Objekti nedavno prijavljeni za ponovno korištenje na praznakuco.joj" -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 -#, fuzzy msgid "Property address:" -msgstr "Tip objekta:" +msgstr "" #: templates/web/default/report/new/category.html:8 msgid "Property type:" @@ -2501,6 +2499,11 @@ msgstr "Navedite naslov" msgid "Provide an update" msgstr "Ažuriranje" +#: templates/web/fixmystreet/auth/general.html:53 +#, fuzzy +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 "Lozinka nije obvezna, ali će vam omogućiti lakše prijavljivanje problema, ažuriranja i upravljanje vašim izvješćima." + #: templates/web/bromley/report/new/fill_in_details_form.html:180 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "Lozinka nije obvezna, ali će vam omogućiti lakše prijavljivanje budućih problema, ažuriranja i upravljanje vašim izvješćima." @@ -2522,17 +2525,17 @@ msgstr "Javno" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:172 -#: templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:194 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:196 +#: templates/web/zurich/admin/report_edit.html:202 msgid "Publish the response" msgstr "" @@ -2572,11 +2575,11 @@ msgstr "Upitnik popunila osoba koja je prijavila problem" msgid "RSS feed" msgstr "RSS izvor" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "RSS feed for %s" msgstr "RSS izvor za %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed for %s ward, %s" msgstr "RSS izvor za %s ward, %s" @@ -2584,11 +2587,11 @@ msgstr "RSS izvor za %s ward, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 -#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "RSS feed of %s" msgstr "RSS izvor za %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "RSS feed of %s, within %s ward" msgstr "RSS izvor za %s, unutar %s ward" @@ -2601,15 +2604,15 @@ msgstr "RSS izvor za okolne probleme" msgid "RSS feed of problems in this %s" msgstr "RSS izvor za probleme u ovom %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:616 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 -#: perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/UK.pm:235 msgid "RSS feed of problems within %s" msgstr "RSS izvor za probleme unutar %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "RSS feed of problems within %s ward" msgstr "RSS izvor za probleme unutar %s ward" @@ -2648,7 +2651,8 @@ msgstr "Nedavno<br>popravljeno" msgid "Recently fixed" msgstr "Nedavno popravljeno" -#: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 +#: templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Nedavno prijavljeni problemi" @@ -2665,13 +2669,13 @@ msgstr "Napominjemo da, u sklopu pilot projekt, FixMyBarangay služi samo za pri msgid "Remove flag" msgstr "Ukloni oznaku" -#: templates/web/default/admin/report_edit.html:64 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:89 +#: templates/web/default/admin/update_edit.html:57 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Ukloni fotografiju (nije moguće poništiti!)" -#: templates/web/default/index.html:9 templates/web/emptyhomes/header.html:12 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "Prijavi prazne kuće" @@ -2697,15 +2701,14 @@ msgstr "Prijavi zloupotrebu" #: templates/web/default/report_created.html:3 #: templates/web/seesomething/report_created.html:0 #: templates/web/seesomething/report_created.html:8 -#, fuzzy msgid "Report created" -msgstr "Prijavi zloupotrebu" +msgstr "" #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Prijava za %s" -#: templates/web/default/index.html:18 +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/stevenage/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 @@ -2722,7 +2725,7 @@ msgstr "Prijavljeno %s, za %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 -#: templates/web/fixmystreet/contact/index.html:46 +#: templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Prijavljeno anonimno %s" @@ -2738,7 +2741,7 @@ msgstr "Prijavio %s anonimno %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 -#: templates/web/fixmystreet/contact/index.html:48 +#: templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Prijavio %s za %s" @@ -2755,9 +2758,8 @@ msgid "Reported by %s in the %s category by %s at %s" msgstr "Prijavio %s u %s kategoriju %s u %s" #: templates/web/zurich/report/_main.html:2 -#, fuzzy msgid "Reported in the %s category" -msgstr "Prijavio %s u kategoriju %s u %s" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" @@ -2783,33 +2785,30 @@ msgstr "Prijavio %s u kategoriju %s u %s" msgid "Reporting a problem" msgstr "Prijavljivanje problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:198 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:201 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 -#, fuzzy msgid "Reports" -msgstr "Sve Prijave" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" #: templates/web/zurich/admin/index-sdm.html:7 -#, fuzzy msgid "Reports awaiting approval" -msgstr "Prijavljivanje problema" +msgstr "" #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Prijave na i oko mape" #: templates/web/zurich/admin/index-sdm.html:10 -#, fuzzy msgid "Reports published" -msgstr "Prijavi zloupotrebu" +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Resend report" msgstr "Ponovno pošalji prijavu" @@ -2825,16 +2824,16 @@ msgstr "Cestovni operater za ovu imenovanu cestu (izveden iz cestovnog referentn msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Cestovni operater za ovu imenovanu cestu (sa OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1343 -#: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: templates/web/default/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: templates/web/default/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:75 msgid "Rotate Right" msgstr "" @@ -2853,9 +2852,8 @@ msgid "Search Users" msgstr "Pretraži korisnike" #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Search reports" -msgstr "Pretraži prijave" +msgstr "" #: templates/web/default/admin/reports.html:5 #: templates/web/default/admin/users.html:5 @@ -2882,11 +2880,11 @@ msgstr "Odaberite tip upozorenja i kliknite na gumb za RSS izvor, ili unesite sv msgid "Sent to %s %s later" msgstr "Pošalji %s %s naknadno" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Sent:" msgstr "Poslano:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:73 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Servis:" @@ -2987,7 +2985,7 @@ msgstr "Žao nam je,ne pokrivamo područje na kojem se nalazi taj problem." msgid "Sorry, there has been an error confirming your problem." msgstr "Žao nam je, došlo je do greške pri potvrđivanju problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 #: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 #: perllib/FixMyStreet/Geocode/Google.pm:74 #: perllib/FixMyStreet/Geocode/OSM.pm:66 @@ -3025,17 +3023,17 @@ msgstr "Mjesec početka:" msgid "State" msgstr "Stanje" -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/update_edit.html:21 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:54 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Stanje:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1138 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:213 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:216 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -3044,34 +3042,32 @@ msgstr "Statistika" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Status" -msgstr "Statistika" +msgstr "" #: templates/web/default/report/updates.html:10 msgid "Still open, via questionnaire, %s" msgstr "I dalje otvoreno, putem upitnika %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 msgid "Subcategory: %s" -msgstr "Kategorija: %s" +msgstr "" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:48 -#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/contact/index.html:91 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "Predmet" -#: templates/web/default/admin/report_edit.html:13 +#: templates/web/default/admin/report_edit.html:19 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:34 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Subject:" msgstr "Predmet:" @@ -3091,11 +3087,11 @@ msgstr "Predmet:" msgid "Submit" msgstr "Pošalji" -#: templates/web/default/admin/report_edit.html:67 -#: templates/web/default/admin/update_edit.html:54 +#: templates/web/default/admin/report_edit.html:92 +#: templates/web/default/admin/update_edit.html:60 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:65 -#: templates/web/zurich/admin/report_edit.html:198 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:204 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Pošalji promjene" @@ -3105,19 +3101,18 @@ msgstr "Pošalji promjene" msgid "Submit questionnaire" msgstr "Pošalji upitnik" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:88 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 -#, fuzzy msgid "Submitted" -msgstr "Pošalji" +msgstr "" #: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 @@ -3137,8 +3132,8 @@ msgstr "Pretplati se na e-mail upozorenja" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "Pretplati se na upozorenja svog kvarta ’" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:200 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3157,10 +3152,9 @@ msgstr "Sažetak" msgid "Summary reports" msgstr "Sažetak prijava" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 msgid "Survey" -msgstr "Rezultati ispitivanja" +msgstr "" #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" @@ -3175,7 +3169,7 @@ msgstr "Tekst" msgid "Text only version" msgstr "Tekst samo verzija" -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/update_edit.html:20 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "Tekst:" @@ -3223,7 +3217,7 @@ msgstr "Zahvaljujemo se na feedbacku. Javit ćemo se čim stignemo!" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Hvala, drago nam je čuti da je problem riješen! Htjeli bismo vas još samo upitati jeste li dosada prijavljivali problem odgovornom tijelu?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:186 +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 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." @@ -3240,20 +3234,19 @@ 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:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:683 msgid "That problem will now be resent." msgstr "Navedeni problem će biti ponovno poslan" #: perllib/FixMyStreet/App/Controller/Report.pm:117 -#, fuzzy msgid "That report cannot be viewed on %s." -msgstr "Navedena prijava se ne može vidjeti na Popravi.to" +msgstr "" #: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." msgstr "Navedena prijava je uklonjena s Popravi.to" -#: templates/web/default/open311/index.html:23 +#: templates/web/default/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Open311 v2 atribut agency_responsible koristi se za popis uprava koje su zaprimile prijavu problema te ne odgovara posve načinu na koji je atribut definiran u specifikaciji Open311 v2." @@ -3264,11 +3257,8 @@ msgstr "Molimo<strong> pričekajte </strong> — <em>email</em> potvrde." #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 -#, fuzzy msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -"Odgovorno tijelo’neće moći raditi na rješavanju problema ukoliko\n" -"ne dostavite što više detalja. Molimo opišite točnu lokaciju problema (npr. na zidu), o čemu je riječ, koliko je dugo na tom mjestu, opis (i fotografiju ako imate), itd." #: templates/web/fixmystreet/questionnaire/index.html:43 msgid "The details of your problem are available from the other tab above." @@ -3279,11 +3269,11 @@ msgid "The details of your problem are available on the right hand side of this msgstr "Pojedinosti problema dostupne su u desnom dijelu stranice" #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:67 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "Greška je: %s" -#: templates/web/default/open311/index.html:19 +#: templates/web/default/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" @@ -3360,11 +3350,11 @@ msgstr "Dojavljivanja problema preko karte:" msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "Predmet i detalji problema bit će javni. Ukoliko se slažete, bit će prikazano i Vaše ime." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Korisnik nije mogao locirati problem na karti, ali možete vidjeti područje oko navedene lokacije" -#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Došlo je do problema pri učitavanju svih prijava. Molimo pokušajte ponovno." @@ -3373,7 +3363,7 @@ msgstr "Došlo je do problema pri učitavanju svih prijava. Molimo pokušajte po msgid "There was a problem showing this page. Please try again later." msgstr "Došlo je do problema pri učitavanju ove stranice. Molimo pokušajte ponovno." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3398,20 +3388,20 @@ msgstr "Došlo je do problema pri prijavi. Detalje pogledajte u nastavku." msgid "There were problems with your update. Please see below." msgstr "Došlo je do problema pri ažuriranju. Detalje pogledajte u nastavku." -#: templates/web/default/open311/index.html:10 +#: templates/web/default/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Razvoj API implementacije je u tijeku te još nije stabilizrana. Ubuduće će se mijenjati bez upozorenja." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Kako korisnik nije kategorizirao problem ,ovaj e-mail poslan je oboma odgovornim tijelima koji pokrivaju mjesto problema. Molimo vas da zanemarite e-mail ukoliko problem ne ulazi u vaše područje ili nam javite o kakvoj je kategoriji problema riječ kako bismo ga unijeli u naš sustav." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 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:891 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Potrebna informacija" @@ -3421,12 +3411,15 @@ msgid "This is a developer site; things might break at any time, and the databas msgstr "Ovo je stranica za razvojne programere; ovdje se sve može prekinuti u bilo kojem trenutku. Baza će biti povremeno izbrisana." #: templates/web/fixmybarangay/reports/index.html:7 -#, fuzzy msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." +msgstr "" + +#: templates/web/emptyhomes/reports/index.html:4 +#, fuzzy +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." msgstr "Ovo je sažetak svih postojećih izvješća na stranici; molimo odaberite određenu županiju kako biste vidjeli probleme prijavljene za to područje." #: templates/web/default/reports/index.html:7 -#: templates/web/emptyhomes/reports/index.html:4 #: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." @@ -3462,12 +3455,11 @@ msgstr "Problem je i dalje aktualan" msgid "This problem is old and of unknown status." msgstr "Odabrani problem je star i nismo upoznati s trenutnim stanjem." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/report/_main.html:14 -#, fuzzy msgid "This report is awaiting moderation." -msgstr "Prijava je trenutno označena kao otvorena." +msgstr "" #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." @@ -3481,16 +3473,15 @@ msgstr "Prijava je trenutno označena kao popravljena." msgid "This report is currently marked as open." msgstr "Prijava je trenutno označena kao otvorena." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" -msgstr "%s, prijavljeno annimno u %s" +msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Stranica sadrži i fotografiju problem, dodanu od strane korisnika." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Vremenska skala" @@ -3508,7 +3499,7 @@ msgstr "Kako<strong>biste prijavili problem</strong>, na karti označite točnu msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Kako biste vidjeli lokalne probleme,molimo Vas da unesete poštanski broj ili naziv ulice i područje." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 msgid "To view a map of the precise location of this issue" msgstr "Karta točne lokacije ovog problema" @@ -3521,9 +3512,8 @@ msgid "Total" msgstr "Ukupno" #: templates/web/seesomething/report/new/fill_in_details_form.html:24 -#, fuzzy msgid "Transport Category" -msgstr "Kreiraj kategoriju" +msgstr "" #: templates/web/default/js/translation_strings.html:23 msgid "Try again" @@ -3531,6 +3521,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3538,11 +3530,11 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:59 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Nepotvrđeno" @@ -3556,9 +3548,8 @@ msgid "Unknown alert type" msgstr "Nepoznat tip upozorenja" #: templates/web/default/js/translation_strings.html:33 -#, fuzzy msgid "Unknown error" -msgstr "Nepoznato" +msgstr "" #: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" @@ -3574,20 +3565,19 @@ msgid "Update %s created for problem %d; by %s" msgstr "Problem %s ažurirao %d; korisnik %s" #: templates/web/default/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:22 +#: templates/web/fixmystreet/contact/index.html:34 msgid "Update below added anonymously at %s" msgstr "Ažuriranje u nastavku dodao je anonimni korisnik u %s" #: templates/web/default/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:24 +#: templates/web/fixmystreet/contact/index.html:36 msgid "Update below added by %s at %s" msgstr "Ažuriranje u nastavku dodao %s u %s" #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 -#, fuzzy msgid "Update body" -msgstr "Ažurirano!" +msgstr "" #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" @@ -3597,16 +3587,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "Ažuraranje dodao {{ime}}" -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Ažuriranjem se status problema promijenio u %s" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/default/admin/update_edit.html:44 msgid "Update marked problem as fixed" msgstr "Ažuriranjem je problem označen kao popravljen" -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/update_edit.html:46 msgid "Update reopened problem" msgstr "Ažuriranjem je problem ponovno otvoren" @@ -3621,16 +3611,15 @@ msgstr "Ažuriranje:" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Updated" -msgstr "Ažurirano!" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:763 -#: perllib/FixMyStreet/App/Controller/Admin.pm:907 -#: perllib/FixMyStreet/App/Controller/Admin.pm:960 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:485 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:972 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:488 msgid "Updated!" msgstr "Ažurirano!" @@ -3659,30 +3648,30 @@ msgstr "Ažuriranja za {{naslov}}" msgid "Updates to this problem, FixMyStreet" msgstr "Ažuriranja za ovaj problem,Popravi.to" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "User flag removed" msgstr "Korisnička oznaka uklonjena" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 msgid "User flagged" msgstr "Korisnik označen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:215 #: templates/web/default/admin/flagged.html:24 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Korisnici" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "Values updated" msgstr "Vrijednosti ažurirane" -#: templates/web/default/admin/report_edit.html:12 -#: templates/web/default/admin/update_edit.html:12 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:23 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Pogledaj prijave na stranici" @@ -3720,9 +3709,8 @@ msgid "We found more than one match for that location. We show up to ten matches msgstr "Pronađeno je više rezultata za tnavedenulokaciju. Prikazano je do deset rezlutata. Ukoliko nije naveden traženi problem, molimo pokušajte s drugom pretragom." #: templates/web/default/auth/token.html:8 -#, fuzzy msgid "We have not been able to confirm your account - sorry." -msgstr "Poslali smo Vam e-mail s linkom za potvrdu korisničkog računa." +msgstr "" #: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." @@ -3746,7 +3734,7 @@ msgstr "Nikada ne prikazujemo vašu e-mail adresu" msgid "We never show your email address or phone number." msgstr "Nikada ne prikazujemo vašu e-mail adresu ili telefonski broj." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 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." @@ -3779,15 +3767,15 @@ msgstr "Rado bismo čuli Vaše mišljenje o ovoj stranici. Da biste to učinili msgid "When edited" msgstr "Prilikom ažuriranja" -#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/problem_row.html:35 msgid "When sent" msgstr "Prilikom slanja" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Whole block of empty flats" msgstr "Cijeli blok praznih stanova" -#: templates/web/default/open311/index.html:25 +#: templates/web/default/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "Osim pretraživanja prijava, moguće je pretražiti i odgovorne_agencije kako biste ograničili prijave na one poslane određenom uredu. Pojam za pretraživanje je IB pojedinog ureda kojeg možete saznati pomoću <a href=\"%s\">MaPit</a>." @@ -3821,13 +3809,13 @@ msgstr "Godina" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:63 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:109 @@ -3845,12 +3833,12 @@ msgid "Yes I have a password" msgstr "Da, imam lozinku" #: templates/web/default/contact/index.html:37 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/fixmystreet/contact/index.html:50 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Sljedeće izvješće o problemu prijavljujete jer je uvredljivo, sadrži osobne podatke ili slično:" #: templates/web/default/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:16 +#: templates/web/fixmystreet/contact/index.html:28 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Sljedeće ažuriranje prijavljujete jer je uvredljivo, sadrži osobne podatke ili slično:" @@ -3858,9 +3846,8 @@ msgstr "Sljedeće ažuriranje prijavljujete jer je uvredljivo, sadrži osobne po #: templates/web/default/tokens/confirm_problem.html:21 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 -#, fuzzy msgid "You can <a href=\"%s%s\">view the problem on this site</a>." -msgstr ". Možete <a href=\"%s%s\">pregledati problem na sljedećoj stranici</a>." +msgstr "" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:13 @@ -3914,9 +3901,8 @@ msgstr "Uspješno ste potvrdili Vaše upozorenje" #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 -#, fuzzy msgid "You have successfully confirmed your email address." -msgstr "Uspješno ste potvrdili Vaše upozorenje" +msgstr "" #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 @@ -3936,17 +3922,16 @@ msgstr "Uspješno ste dodali upozorenje." msgid "You have successfully deleted your alert." msgstr "Uspješno ste izbrisali upozorenje." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Uapješno ste se prijavili; molimo provjerite i potvrdite točnost Vaših podataka:" #: templates/web/default/email_sent.html:13 -#, fuzzy msgid "You must now click the link in the email we've just sent you." -msgstr "Sada kliknite na link u e-mailu koji smo Vam upravo poslali — ako to ne učinite, %s." +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "Jeste li sigurni da želite ponovno poslati?" @@ -3963,7 +3948,7 @@ msgstr "Vaše prijave" #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/contact/index.html:84 #: templates/web/fixmystreet/report/display.html:65 #: templates/web/fixmystreet/report/display.html:67 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 @@ -3973,9 +3958,8 @@ msgid "Your email" msgstr "Vaš e-mail" #: templates/web/seesomething/report/new/fill_in_details_form.html:81 -#, fuzzy msgid "Your email (optional)" -msgstr "Lozinka (neobvezno)" +msgstr "" #: templates/web/bromley/report/display.html:132 #: templates/web/fixmystreet/auth/general.html:26 @@ -4015,7 +3999,7 @@ msgid "Your last name" msgstr "Prezime" #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/contact/index.html:77 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 @@ -4096,17 +4080,12 @@ msgstr "odgovorno tijelo" msgid "council ref: %s" msgstr "odgovorno tijelo ref: %s" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "didn't use map" msgstr "nije korištena karta" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 -#, fuzzy -msgid "duplicate report" -msgstr "Kreiraj izvješće" - #: templates/web/default/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 #: templates/web/seesomething/around/postcode_form.html:9 @@ -4120,36 +4099,66 @@ msgstr "od %d različitih korisnika" #: templates/web/fixmystreet/report/_item.html:12 #: templates/web/zurich/report/_item.html:16 -#, fuzzy msgid "last updated %s" -msgstr "Posljednje ažuriranje" +msgstr "" #: perllib/Utils.pm:263 msgid "less than a minute" msgstr "manje od minute" -#: templates/web/default/report/updates.html:38 -msgid "marked as %s" +#: templates/web/default/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "" + +#: templates/web/default/report/updates.html:47 +#, fuzzy +msgid "marked as action scheduled" +msgstr "označeno kao popravljeno" + +#: templates/web/default/report/updates.html:59 +msgid "marked as an internal referral" +msgstr "" + +#: templates/web/default/report/updates.html:49 +#, fuzzy +msgid "marked as closed" msgstr "označeno kao %s" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:28 +#: templates/web/default/report/updates.html:51 msgid "marked as fixed" msgstr "označeno kao popravljeno" +#: templates/web/default/report/updates.html:45 +#, fuzzy +msgid "marked as in progress" +msgstr "Problem je i dalje aktualan" + +#: templates/web/default/report/updates.html:41 +#, fuzzy +msgid "marked as investigating" +msgstr "Istražujem" + +#: templates/web/default/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "" + +#: templates/web/default/report/updates.html:43 +#, fuzzy +msgid "marked as planned" +msgstr "označeno kao popravljeno" + +#: templates/web/default/report/updates.html:53 +#, fuzzy +msgid "marked as unable to fix" +msgstr "označeno kao popravljeno" + #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "n/a" -#: templates/web/default/report/updates.html:32 -msgid "no further action" -msgstr "" - -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 -msgid "not the council's responsibility" -msgstr "" - #: templates/web/default/alert/_list.html:87 #: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 @@ -4160,28 +4169,27 @@ msgstr "ili" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:27 -#: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:38 -#: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:50 -#: templates/web/zurich/admin/report_edit.html:52 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:53 msgid "originally entered: “%s”" -msgstr "izvorno uneseno" +msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "other areas:" msgstr "druga područja:" -#: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:36 +#: templates/web/default/report/updates.html:29 +#: templates/web/default/report/updates.html:39 msgid "reopened" msgstr "ponovno otvoreno" @@ -4211,11 +4219,7 @@ msgstr "lokalno odgovorno tijelo" msgid "there is no pin shown as the user did not use the map" msgstr "nema oznake jer korisnik nije označio problem na karti" -#: templates/web/default/report/updates.html:33 -msgid "third party responsibility" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 msgid "this type of local problem" msgstr "ovaj tip " @@ -4223,17 +4227,17 @@ msgstr "ovaj tip " msgid "today" msgstr "danas" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "used map" msgstr "korištena karta" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:35 msgid "user is from same council as problem - %d" msgstr "Korisnik je iz istog područja kao i problem - %d" -#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/update_edit.html:38 msgid "user is problem owner" msgstr "korisnik je vlasnik problema" @@ -4259,12 +4263,12 @@ msgstr[1] "%d sati" msgstr[2] "%d sati" #: templates/web/default/report/_support.html:6 -#, fuzzy, perl-format +#, perl-format msgid "%d supporter" msgid_plural "%d supporters" -msgstr[0] "%d podrška" -msgstr[1] "%d podrška" -msgstr[2] "%d podrška" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: perllib/Utils.pm:284 #, perl-format @@ -4329,84 +4333,3 @@ msgid_plural "%d days" msgstr[0] "%d dan" msgstr[1] "%d dani" msgstr[2] "%d dani" - -#~ msgid "(Don't worry — %s)" -#~ msgstr "(Ne brinite — %s)" - -#~ msgid "*unknown*" -#~ msgstr "*nepoznato*" - -#~ msgid "1 supporter" -#~ msgstr "1 podržavatelj" - -#~ msgid "All confirmed" -#~ msgstr "Sve potvrđeno" - -#~ msgid "All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your name if you give us permission." -#~ msgstr "Sve informacije koje nam dostavite biti će proslijeđene <strong>%s</strong>. Na internet stranici, prikazat ćemo problem i detaljno ga opisati, a ako nam dozvolite prikazat ćemo i Vaše ime." - -#~ msgid "Configuration updated" -#~ msgstr "Konfiguracija ažurirana" - -#~ msgid "Configure Open311" -#~ msgstr "Konfiguriraj Open311" - -#~ msgid "Configure Open311 integration" -#~ msgstr "Konfiguriraj Open311 integraciju" - -#~ msgid "Council contacts" -#~ msgstr "Kontakti vijeća" - -#~ msgid "Councils" -#~ msgstr "Vijeća" - -#~ msgid "Currently has 1+ deleted" -#~ msgstr "Trenutno je 1+ izbrisano" - -#~ msgid "Enter a nearby GB postcode, or street name and area" -#~ msgstr "Unesi obližnji poštanski broj ili ime ulice i kvarta" - -#~ msgid "FixMyStreet administration" -#~ msgstr "Popravi.to administracija" - -#~ msgid "List Flagged" -#~ msgstr "Izlistaj označeno" - -#~ msgid "No info at all" -#~ msgstr "Nema nikakvih informacija" - -#~ msgid "Report empty properties" -#~ msgstr "Prijavi prazne objekte" - -#~ msgid "Search Abuse" -#~ msgstr "Pretraži zloupotrebu" - -#~ msgid "Search Abuse Table" -#~ msgstr "Pretraži tablicu zloupotrebe" - -#~ msgid "Some unconfirmeds" -#~ msgstr "Nepotvrđeno" - -#~ msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :" -#~ msgstr "Hvala na učitavanju slike. Sada trebamo locirati problem pa vas molimo da unesete naziv obližnje ulice ili poštanski broj u donji okvir : :" - -#~ msgid "The Empty Homes Agency" -#~ msgstr "Agencija za prazne objekte" - -#~ msgid "This is a summary of all reports for one %s." -#~ msgstr "Sažetak svih izvještaja za jednu %s." - -#~ msgid "This is a summary of all reports for this %s." -#~ msgstr "Sažetak svih izvještaja za ovu %s." - -#~ msgid "To <strong>report a problem</strong>, simply click on the map at the correct location." -#~ msgstr "Kako biste<strong>prijavili problem</strong>, samo na karti označite točnu lokaciju." - -#~ msgid "Unable to look up areas in MaPit. Please try again later." -#~ msgstr "Nije moguće pregledati područje pomoću MapIt. Molimo pokušajte ponovo poslije." - -#~ msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>." -#~ msgstr "Možete <a href=\"%s\">vidjeti sve prijave za odgovorno tijelol</a> ili<a href=\"/reports\">pregledati sva odgovorna tijela</a>." - -#~ msgid "You can <a href=\"/reports\">show all councils</a>." -#~ msgstr "Možete<a href=\"/reports\">pregledati sva odgovorna tijela</a>." diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 8f183cf0f..ab1269c23 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,15 +6,16 @@ # Translators: # Anders Einar Hilden <hildenae@gmail.com>, 2012 # Guttorm Flatabø <post@guttormflatabo.com>, 2013 +# Anders Einar Hilden <hildenae@gmail.com>, 2013 # pere <pere-transifex@hungry.com>, 2012 # Petter Reinholdtsen <pere@hungry.com>, 2011 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-04-24 08:59+0100\n" -"PO-Revision-Date: 2013-02-16 11:55+0000\n" -"Last-Translator: Guttorm Flatabø <post@guttormflatabo.com>\n" +"POT-Creation-Date: 2013-09-05 17:39+0100\n" +"PO-Revision-Date: 2013-05-08 10:14+0000\n" +"Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/fixmystreet/language/nb_NO/)\n" "Language: nb_NO\n" "MIME-Version: 1.0\n" @@ -23,7 +24,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid " and " msgstr " og " @@ -44,7 +45,7 @@ msgstr " og <strong>vi sender det nå til administrasjonen</strong>" msgid " or " msgstr " eller " -#: templates/web/default/admin/bodies.html:32 +#: templates/web/default/admin/bodies.html:36 msgid "%d addresses" msgstr "%d adresser" @@ -71,7 +72,7 @@ msgstr "%d spørreskjema sendt – %d besvart (%s%%)" #: templates/web/default/pagination.html:10 msgid "%d to %d of %d" -msgstr "" +msgstr "%d til %d av %d" #: templates/web/default/reports/body.html:0 #: templates/web/default/reports/body.html:22 @@ -82,33 +83,29 @@ msgstr "%s - oppsummeringsrapporter" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "%s ward, %s" msgstr "%s bydel, %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:572 -#, fuzzy msgid "%s, reported at %s" -msgstr "%s, rapportert av %s %s" +msgstr "%s, rapportert %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" #: templates/web/default/email_sent.html:29 -#, fuzzy msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -msgstr "vi tar vare på ditt varsel mens du sjekker din e-post." +msgstr "(Ta det med ro; vi tar vare på varselet ditt mens du sjekker e-posten din.)" #: templates/web/default/email_sent.html:25 -#, fuzzy msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -msgstr "vi tar vare på rapporten din mens du sjekker e-post." +msgstr "(Ta det med ro — vi tar vare på varselet ditt mens du sjekker e-posten din.)" #: templates/web/default/email_sent.html:27 -#, fuzzy msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -msgstr "vi tar vare på din oppdatering mens du sjekker din e-post." +msgstr "(Ta det med ro — vi tar vare på oppdateringen din mens du sjekker e-posten din.)" #: templates/web/default/admin/report_blocks.html:11 #: templates/web/default/admin/users.html:26 @@ -139,7 +136,7 @@ msgstr "(lukket)" msgid "(fixed)" msgstr "(løst)" -#: templates/web/default/index.html:11 templates/web/default/index.html:15 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" @@ -168,21 +165,20 @@ msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" msgid "(we never show your email)" msgstr "(vi viser aldri din e-postadresse)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 #: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" #: templates/web/emptyhomes/front/stats.html:5 -#, fuzzy msgid "<big>%s</big> reports" -msgstr "<big>%s</big> rapport-<br>oppdatering" +msgstr "<big>%s</big> rapporter" #: templates/web/default/questionnaire/completed.html:20 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" @@ -239,6 +235,14 @@ msgid "" "this and other useful information please go to <a\n" "href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" msgstr "" +"<p>Å få tomme boliger i bruk igjen kan være vanskelig, men nå bør en god administrasjon \n" +"ha gjort mye fremgang og rapportert hva de har gjort på nettstedet. Likevel kan tomter \n" +"forbli tome i mange måneder hvis eieren er uvillig eller eiendommen er i svært dårlig \n" +"stand. Hvis ingenting har skjedd eller du ikke er fornøyd med fremdriften administrasjon \n" +"er å gjøre, er nå den rette tid til å si det. Vi tror det er en god idé å kontakte noen andre \n" +"som kan være i stand til å hjelpe eller legge press på kommunen. For å få råd om hvordan \n" +"du gjør dette og annen nyttig informasjon kan du gå til <a\n" +" href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" #: templates/web/default/questionnaire/index.html:26 msgid "" @@ -250,6 +254,11 @@ msgid "" "to help. For advice on how to do this and other useful information please\n" "go to <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" msgstr "" +"<p>Å få tomme boliger i bruk kan være vanskelig. Du burde ikke forvente at eiendommen \n" +"er klar til bruk enda. Men en god administrasjon bør ha begynt å arbeide, og burde \n" +"ha rapportert hva de har gjort på nettstedet. Hvis du ikke er fornøyd med fremdriften eller informasjonen fra administrasjon, er nå den rette tid til å si det. Vi tror det er en god idé å \n" +"kontakte noen andre som kan være i stand til å hjelpe eller legge press på kommunen. For å \n" +"få råd om hvordan du gjør dette og annen nyttig informasjon kan du gå til <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" #: templates/web/default/questionnaire/completed.html:9 msgid "" @@ -309,6 +318,8 @@ msgstr "<strong>Ja</strong> Jeg har et passord" #: templates/web/default/static/about-en-gb.html:1 #: templates/web/default/static/about-en-gb.html:3 #: templates/web/emptyhomes/header.html:34 +#: templates/web/emptyhomes/static/about-cy.html:1 +#: templates/web/emptyhomes/static/about-cy.html:3 #: templates/web/emptyhomes/static/about-en-gb.html:1 #: templates/web/emptyhomes/static/about-en-gb.html:3 msgid "About us" @@ -316,18 +327,21 @@ msgstr "Om oss" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:29 msgid "Action Scheduled" -msgstr "" +msgstr "Handling planlagt" -#: templates/web/default/admin/bodies.html:47 +#: templates/web/default/admin/bodies.html:53 +#: templates/web/default/admin/bodies.html:57 #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" -msgstr "" +msgstr "Legg til administrasjon" #: templates/web/default/admin/body.html:69 #: templates/web/zurich/admin/body.html:30 @@ -336,7 +350,7 @@ msgstr "Legg til ny kategori" #: templates/web/default/admin/users.html:36 msgid "Add user" -msgstr "" +msgstr "Legg til bruker" #: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" @@ -424,12 +438,12 @@ msgid "An update marked this problem as fixed." msgstr "En oppdatering markerte dette problemet som fikset." #: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/problem_row.html:14 +#: templates/web/default/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonym:" @@ -445,49 +459,48 @@ msgstr "Er du en utvikler?" #: templates/web/fixmystreet/footer.html:20 #: templates/web/stevenage/footer.html:21 msgid "Are you from a council?" -msgstr "Der du fra den lokale administrasjonen?" +msgstr "Er du fra den lokale administrasjonen?" #: templates/web/default/admin/body-form.html:19 #: templates/web/zurich/admin/body-form.html:25 msgid "Area covered" -msgstr "" +msgstr "Dekket område" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:124 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" -msgstr "" +msgstr "Flytt til en annen kategori:" -#: templates/web/zurich/admin/report_edit.html:127 +#: templates/web/zurich/admin/report_edit.html:133 msgid "Assign to external body:" -msgstr "" +msgstr "Tildel til ekstern administrasjon:" -#: templates/web/zurich/admin/report_edit.html:107 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:113 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Assign to subdivision:" -msgstr "" +msgstr "Tildelt underavdeling:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:99 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 #: templates/web/zurich/report/updates.html:11 -#, fuzzy msgid "Assigned to %s" -msgstr "Logget inn som %s" +msgstr "Tildelt %s" -#: templates/web/default/open311/index.html:17 +#: templates/web/default/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "På det meste blir %d forespørsler returnert i hver spørring. De returnerte forespørslene blir sortert på requested_datetime, så en må gjøre flere søk med rullerende start_date og end_date for å få tak i alle forespørslene." -#: templates/web/default/open311/index.html:9 +#: templates/web/default/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "For øyeblikket er det kun søk etter og å se på rapporter som fungerer." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" -msgstr "" +msgstr "Avventer moderasjon" #: templates/web/default/js/translation_strings.html:26 msgid "Back" -msgstr "" +msgstr "Tilbake" #: templates/web/default/admin/report_blocks.html:11 msgid "Ban email address" @@ -497,22 +510,22 @@ msgstr "Bannlys epostadresse" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "Pass på å velge riktig kategori, da vi bruker denne for å avgjøre hvem vi skal sende rapporten til." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:208 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" -msgstr "" +msgstr "Administrasjoner" #: templates/web/default/admin/flagged.html:12 #: templates/web/default/admin/reports.html:14 #: templates/web/default/admin/users.html:14 msgid "Body" -msgstr "" +msgstr "Administrasjon" #: templates/web/default/admin/user-form.html:7 msgid "Body:" -msgstr "" +msgstr "Administrasjon:" #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 @@ -551,16 +564,16 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:61 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/report_edit.html:123 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "Category: %s" msgstr "Kategori: %s" @@ -570,22 +583,23 @@ msgstr "Kategori: %s" msgid "Change Password" msgstr "Bytt passord" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/default/js/translation_strings.html:41 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klikk i kartet for å rapportere et problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:76 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:90 -#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit.html:98 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -599,7 +613,7 @@ msgstr "(ikke rapportert til administrasjonen)" msgid "Closed reports" msgstr "Fiksede rapporter" -#: templates/web/default/admin/problem_row.html:32 +#: templates/web/default/admin/problem_row.html:38 msgid "Closed:" msgstr "Lukket:" @@ -608,9 +622,9 @@ msgstr "Lukket:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Co-ordinates:" msgstr "Koordinater:" @@ -618,23 +632,23 @@ msgstr "Koordinater:" msgid "Cobrand" msgstr "Merkevaresamarbeid" -#: templates/web/default/admin/report_edit.html:50 -#: templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:75 +#: templates/web/default/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Merkevaresamarbeidsdata:" -#: templates/web/default/admin/report_edit.html:49 -#: templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:74 +#: templates/web/default/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontakter vil bli generert automatisk senere" #: templates/web/default/admin/body_edit.html:47 msgid "Configure Endpoint" -msgstr "" +msgstr "Sett opp endepunkt" #: templates/web/default/admin/body.html:44 msgid "Confirm" @@ -675,8 +689,8 @@ msgstr "Bekreftet" msgid "Confirmed reports between %s and %s" msgstr "Bekreftede rapporter mellom %s og %s" -#: templates/web/default/admin/problem_row.html:30 -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/problem_row.html:36 +#: templates/web/default/admin/report_edit.html:70 msgid "Confirmed:" msgstr "Bekreftet:" @@ -701,18 +715,18 @@ msgstr "Kontakt oss" #: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 -#: templates/web/fixmystreet/contact/index.html:7 +#: templates/web/fixmystreet/contact/index.html:19 msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1265 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1293 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 msgid "Could not find user" msgstr "Kunne ikke finne bruker" #: templates/web/default/js/translation_strings.html:31 msgid "Could not look up location" -msgstr "" +msgstr "Klarte ikke finne posisjon" #: templates/web/default/admin/list_updates.html:13 msgid "Council" @@ -745,15 +759,15 @@ msgid "Create category" msgstr "Lag kategori" #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/problem_row.html:34 #: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Opprettet" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:45 +#: templates/web/default/admin/report_edit.html:69 +#: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 -#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Opprettet:" @@ -769,7 +783,7 @@ msgstr "Oversikt" #: templates/web/zurich/admin/stats.html:35 msgid "Dealt with by subdivision within 5 working days" -msgstr "" +msgstr "Behandlet av underavdeling innen 5 arbeidsdager" #: templates/web/default/admin/body.html:38 #: templates/web/default/admin/body.html:88 @@ -782,7 +796,7 @@ msgstr "Slettet" #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 msgid "Description" -msgstr "" +msgstr "Beskrivelse" #: templates/web/bromley/report/new/fill_in_details_form.html:54 #: templates/web/default/js/translation_strings.html:28 @@ -792,18 +806,18 @@ msgstr "" msgid "Details" msgstr "Detaljer" -#: templates/web/default/admin/report_edit.html:14 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:25 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:36 msgid "Details:" msgstr "Detaljer:" #: templates/web/default/admin/body.html:39 msgid "Devolved" -msgstr "" +msgstr "Delegert" #: templates/web/default/admin/edit-league.html:1 msgid "Diligency prize league table" @@ -811,7 +825,7 @@ msgstr "Arbeidshester" #: templates/web/fixmystreet/auth/general.html:30 msgid "Do you have a FixMyBarangay password?" -msgstr "" +msgstr "Har du et FixMyBarangay-passord?" #: templates/web/default/auth/general.html:32 #: templates/web/fixmystreet/auth/general.html:32 @@ -827,30 +841,32 @@ msgstr "Vet ikke" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:30 msgid "Duplicate" -msgstr "" +msgstr "Duplikat" -#: templates/web/default/admin/list_updates.html:36 -#: templates/web/default/admin/problem_row.html:35 +#: templates/web/default/admin/list_updates.html:42 +#: templates/web/default/admin/problem_row.html:41 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:36 +#: templates/web/zurich/admin/problem_row.html:44 msgid "Edit" msgstr "Rediger" #: templates/web/default/admin/body.html:112 #: templates/web/zurich/admin/body.html:64 msgid "Edit body details" -msgstr "" +msgstr "Rediger detaljer for administrasjon" #: templates/web/default/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:4 +#: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Rediger problem %d" @@ -884,11 +900,11 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1241 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" @@ -902,31 +918,30 @@ msgstr "Send meg oppdateringer" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:42 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:67 +#: templates/web/default/admin/update_edit.html:33 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit.html:58 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" -msgstr "E-post:" +msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty flat or maisonette" msgstr "Tom leilighet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -934,11 +949,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eiendom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sykehos, etc." @@ -956,12 +971,11 @@ msgstr "Sluttmåned:" #: templates/web/default/admin/body-form.html:40 msgid "Endpoint" -msgstr "" +msgstr "Endepunkt" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:29 -#, fuzzy +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 msgid "Enter a Zürich street name" -msgstr "Skriv inn et veinavn og sted" +msgstr "Skriv inn et veinavn i Zürich" #: perllib/FixMyStreet/Cobrand/UK.pm:18 msgid "Enter a nearby UK postcode, or street name and area" @@ -1014,11 +1028,11 @@ msgstr "Feil" msgid "Example postcode %s" msgstr "Eksempel-postnummer %s" -#: templates/web/default/open311/index.html:27 +#: templates/web/default/open311/index.html:96 msgid "Examples:" msgstr "Eksempler:" -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:76 msgid "Extra data:" msgstr "Ekstra data:" @@ -1027,15 +1041,14 @@ msgstr "Ekstra data:" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "Klarte ikke å sende melding. Vennligst prøv igjen senere eller <a href=\"mailto:%s\">send oss en e-post</a>." -#: templates/web/zurich/admin/index-dm.html:32 -#: templates/web/zurich/admin/index-sdm.html:29 -#, fuzzy +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" -msgstr "Fiksede rapporter" +msgstr "Filtrer rapportliste" #: templates/web/emptyhomes/front/stats.html:6 msgid "Find latest local and national news" -msgstr "" +msgstr "Finn nyeste lokale og nasjonale nyheter" #: templates/web/bromley/report/display.html:191 #: templates/web/bromley/report/new/fill_in_details_form.html:113 @@ -1084,8 +1097,9 @@ msgstr "FiksGataMi sender forskjellige kategorier problemer til forskjellige adm #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1096,13 +1110,13 @@ msgstr "FiksGataMi sender forskjellige kategorier problemer til forskjellige adm msgid "Fixed" msgstr "Løst" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "Løst - Administrasjon" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:42 msgid "Fixed - User" msgstr "Løst - Bruker" @@ -1110,7 +1124,7 @@ msgstr "Løst - Bruker" msgid "Fixed reports" msgstr "Fiksede rapporter" -#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/problem_row.html:37 msgid "Fixed:" msgstr "Løst:" @@ -1118,12 +1132,12 @@ msgstr "Løst:" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flagget:" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:78 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Flagget:" @@ -1133,7 +1147,7 @@ msgstr "Flagget:" msgid "Follow a ward link to view only reports within that ward." msgstr "Følg en bydelslenke for å kun se rapporter innenfor den bydelen." -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "For council(s):" msgstr "For administrasjon(ene):" @@ -1147,6 +1161,7 @@ msgstr "Glemt passordet ditt?" #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmindelo/faq/faq-pt-cv.html:1 #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 @@ -1154,11 +1169,12 @@ msgstr "Glemt passordet ditt?" msgid "Frequently Asked Questions" msgstr "Ofte spurte spørsmål" -#: templates/web/default/open311/index.html:69 +#: templates/web/default/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" #: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/around/_updates.html:3 #: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "Få oppdateringer" @@ -1187,7 +1203,7 @@ msgstr "Gi meg en RSS-strøm" msgid "Go" msgstr "Fortsett" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" @@ -1196,7 +1212,6 @@ msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" #: templates/web/default/reports/index.html:8 -#: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "Linjer med grå bakgrunn er administrasjoner som ikke lenger eksisterer." @@ -1243,13 +1258,14 @@ msgstr "Her er de forskjellige typene lokale problemvarsler for ‘%s’ msgid "Hi %s" msgstr "Hei, %s" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:91 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1269,7 +1285,7 @@ msgstr "Historie" #: templates/web/default/js/translation_strings.html:25 msgid "Home" -msgstr "" +msgstr "Hjem" #: templates/web/default/index-steps.html:1 msgid "How to report a problem" @@ -1277,9 +1293,9 @@ msgstr "Hvordan rapportere et problem" #: templates/web/default/js/translation_strings.html:27 msgid "How to send successful reports" -msgstr "" +msgstr "Hvordan sende inn rapporter som løses" -#: perllib/FixMyStreet/App/Controller/Admin.pm:700 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." @@ -1306,19 +1322,16 @@ msgid "ID" msgstr "ID" #: templates/web/default/email_sent.html:19 -#, fuzzy msgid "If you do not, your alert will not be activated." -msgstr "ditt varsel vil ikke bli aktivert" +msgstr "Hvis du ikke gjør dette vil ikke ditt varsel bli aktivert" #: templates/web/default/email_sent.html:15 -#, fuzzy msgid "If you do not, your problem will not be posted." -msgstr "vil ditt problem ikke bli publisert" +msgstr "Hvis du ikke gjør dette vil ikke din rapport bli publisert" #: templates/web/default/email_sent.html:17 -#, fuzzy msgid "If you do not, your update will not be posted." -msgstr "din oppdatering vil ikke bli publisert" +msgstr "Hvis du ikke gjør dette vil ikke din oppdatering bli publisert" #: templates/web/default/report/new/councils_text_none.html:8 #: templates/web/default/report/new/councils_text_none.html:9 @@ -1364,64 +1377,68 @@ msgstr "Ugyldig valg av feed" msgid "In Progress" msgstr "Under arbeid" -#: templates/web/default/open311/index.html:21 +#: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "I tillegg er følgende attributter som ikke er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (også returnert som del av description), interface_used, comment_count, requestor_name (kun tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:79 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:94 +#: templates/web/zurich/admin/report_edit.html:100 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Under arbeid" #: templates/web/seesomething/report/new/fill_in_details_form.html:38 -#, fuzzy msgid "Incident Category" -msgstr "Kategori" +msgstr "Hendelseskategori" -#: templates/web/zurich/admin/report_edit.html:137 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:143 msgid "Include reporter personal details" -msgstr "Legg inn opplysninger om problemet" +msgstr "Inkluder rapporørens personlige detaljer" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Inkluder ubekreftede problemer" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" -#: templates/web/zurich/admin/report_edit-sdm.html:56 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:82 msgid "Internal notes:" -msgstr "" +msgstr "Interne notater:" + +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:48 +#, fuzzy +msgid "Internal referral" +msgstr "Interne notater:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1052 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" -#: perllib/FixMyStreet/App/Controller/Open311.pm:424 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1434,7 +1451,7 @@ msgstr "Undersøkes" #: templates/web/emptyhomes/tokens/confirm_problem.html:12 #: templates/web/emptyhomes/tokens/confirm_problem.html:14 msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn’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." -msgstr "" +msgstr "Det er verdt å merke seg imidlertid at prosessen kan være treg, spesielt hvis eiendommen er i svært dårlig reparasjon eller eieren ikke er villig til å handle. I de fleste tilfeller kan det ta seks måneder eller mer før du kan forvente å se noe endring og noen ganger kan det være betydelige hindre før en eiendom blir brakt tilbake i bruk. Dette betyr ikke at kommunen ikke gjør noe. Vi oppfordrer kommunene til å oppdatere nettsiden slik at du kan se hva som skjer. Det kan være en lang prosess, men det at du rapportere dine bekymringer om denne eiendommen til rådet er en verdifull første skritt." #: templates/web/bromley/report/display.html:168 #: templates/web/bromley/report/new/fill_in_details_form.html:209 @@ -1460,11 +1477,11 @@ msgstr "Etternavn" msgid "Last editor" msgstr "Sist redigert av" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:72 msgid "Last update:" msgstr "Siste oppdatering:" -#: templates/web/default/admin/problem_row.html:33 +#: templates/web/default/admin/problem_row.html:39 msgid "Last update:" msgstr "Siste oppdatering:" @@ -1524,13 +1541,13 @@ msgstr "Lokaliser problemet på kartet over området" #: templates/web/default/js/translation_strings.html:37 msgid "MAP" -msgstr "" +msgstr "KART" #: perllib/FixMyStreet/Map/OSM.pm:44 msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "Kart © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> og bidragsytere, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" -#: templates/web/fixmystreet/contact/index.html:86 +#: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "Melding" @@ -1538,13 +1555,13 @@ msgstr "Melding" msgid "Message:" msgstr "Melding:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" #: templates/web/zurich/admin/stats.html:34 msgid "Moderated by division within one working day" -msgstr "" +msgstr "Moderert av avdeling innen en arbeidsdag" #: templates/web/default/admin/stats.html:11 msgid "Month" @@ -1562,7 +1579,7 @@ msgstr "Flere problemer i nærheten" #: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 -#: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:9 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmybarangay/reports/index.html:15 @@ -1577,23 +1594,21 @@ msgid "Name" msgstr "Navn" #: templates/web/seesomething/report/new/fill_in_details_form.html:74 -#, fuzzy msgid "Name (optional)" -msgstr "(valgfritt)" +msgstr "Navn (valgfritt)" -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:66 +#: templates/web/default/admin/update_edit.html:32 #: templates/web/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:57 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Navn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" -msgstr "Navn:" +msgstr "Navn: %s" #: templates/web/fiksgatami/footer.html:3 #: templates/web/fiksgatami/nn/footer.html:3 @@ -1609,12 +1624,12 @@ 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:415 -#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:458 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Nærmeste vei til nålen plassert på kartet (automatisk generert ved hjelp av Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1631,12 +1646,11 @@ msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." msgid "New <br>problems" msgstr "Nye <br>problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:249 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 msgid "New body added" -msgstr "Ny kategorikontakt lagt til" +msgstr "Ny administrasjon lagt til" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1648,7 +1662,7 @@ msgstr "Nye lokale problemer på FiksGataMi" msgid "New local reports on reportemptyhomes.com" msgstr "Nye lokale rapporter på reportemptyhomes.com" -#: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New problems" @@ -1675,9 +1689,8 @@ msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "Nye rapporter innenfor grensen til {{NAME}} på FiksGataMi" #: templates/web/zurich/admin/index-sdm.html:4 -#, fuzzy msgid "New reports" -msgstr "Åpne rapporter" +msgstr "Nye rapporter" #: db/alert_types_eha.pl:23 msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -1703,10 +1716,9 @@ msgstr "Nye rapporter innenfor grensen til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/zurich/admin/report_edit-sdm.html:59 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" -msgstr "Få oppdateringer" +msgstr "Ny oppdatering:" #: templates/web/fiksgatami/front/news.html:9 #: templates/web/fiksgatami/nn/front/news.html:9 @@ -1716,19 +1728,19 @@ msgstr "Ny!" #: templates/web/default/pagination.html:13 msgid "Next" -msgstr "" +msgstr "Neste" #: templates/web/default/admin/body.html:50 #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:25 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 #: templates/web/default/questionnaire/index.html:68 @@ -1739,7 +1751,7 @@ msgstr "Nei" #: templates/web/default/admin/user-form.html:8 msgid "No body" -msgstr "" +msgstr "Ingen administrasjon" #: templates/web/default/admin/stats.html:85 msgid "No council" @@ -1761,10 +1773,9 @@ msgstr "Ingen flaggede problemer ble funnet" msgid "No flagged users found" msgstr "Ingen flaggede brukere ble funnet" -#: templates/web/zurich/admin/report_edit-sdm.html:66 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" -msgstr "Dine oppdateringer" +msgstr "Ingen flere oppdateringer" #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 @@ -1778,7 +1789,7 @@ msgstr "Ingen problemer er rapportert" #: templates/web/default/js/translation_strings.html:32 msgid "No result returned" -msgstr "" +msgstr "Ingen resultater returnert" #: templates/web/default/report/_support.html:2 #: templates/web/default/report/_support.html:4 @@ -1789,24 +1800,26 @@ msgstr "Ingen støttespillere" msgid "Non Public" msgstr "Ikke-offentlig" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 msgid "None" msgstr "Ingen" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:31 msgid "Not Responsible" -msgstr "" +msgstr "Ikke ansvarlig" #: templates/web/zurich/admin/report_edit-sdm.html:21 msgid "Not for my subdivision" -msgstr "" +msgstr "Ikke for min underavdeling" #: templates/web/default/admin/questionnaire.html:6 msgid "Not reported before" @@ -1832,7 +1845,7 @@ msgstr "Merk at når vi tar med ubekreftede rapporter så brukes datoen rapporte msgid "Note:" msgstr "Merk:" -#: templates/web/default/open311/index.html:6 +#: templates/web/default/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "Note: <strong>%d</strong>" @@ -1854,7 +1867,7 @@ msgstr "På tide å registrere din oppdatering… har du et FiksGataMi-pass #: templates/web/default/js/translation_strings.html:36 msgid "OK" -msgstr "" +msgstr "OK" #: templates/web/default/report/display.html:24 #: templates/web/default/report/update.html:16 @@ -1890,23 +1903,25 @@ msgstr "Eldre <br>problemer" msgid "Older fixed" msgstr "Eldre løste" -#: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/emptyhomes/reports/index.html:11 #: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "Eldre problemer" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:83 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1916,15 +1931,15 @@ msgstr "Åpen" msgid "Open reports" msgstr "Åpne rapporter" -#: templates/web/default/open311/index.html:3 +#: templates/web/default/open311/index.html:72 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311-API for mySocietys FiksGataMi-tjener" -#: templates/web/default/open311/index.html:13 +#: templates/web/default/open311/index.html:82 msgid "Open311 initiative web page" msgstr "Open311-initiativets nettside" -#: templates/web/default/open311/index.html:14 +#: templates/web/default/open311/index.html:83 msgid "Open311 specification" msgstr "Open311-spesifikasjon" @@ -1938,15 +1953,15 @@ msgstr "Eller problemer meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnere på varsel basert på bydel eller administrasjon du hører inn under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1046 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:588 #: perllib/FixMyStreet/DB/Result/Problem.pm:598 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Other" msgstr "Annet" @@ -1966,10 +1981,10 @@ msgstr "Fant ikke siden" #: templates/web/default/admin/body-form.html:9 #: templates/web/zurich/admin/body-form.html:15 msgid "Parent" -msgstr "" +msgstr "Forelder" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 msgid "Partial" msgstr "Delvis" @@ -1987,6 +2002,10 @@ msgstr "Passord (valgfritt)" msgid "Password:" msgstr "Passord:" +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 @@ -1996,12 +2015,12 @@ msgstr "Passord:" msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 -#: templates/web/default/admin/report_edit.html:43 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 +#: templates/web/default/admin/report_edit.html:68 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2011,6 +2030,8 @@ msgstr "Telefon:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" @@ -2030,17 +2051,17 @@ msgstr "Bilder av nye problemer i nærheten" #: templates/web/default/js/translation_strings.html:24 msgid "Place pin on map" -msgstr "" +msgstr "Plasser tegnestiften på kartet" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 msgid "Planned" msgstr "Planlagt" @@ -2074,10 +2095,10 @@ msgstr "Vennligst sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:852 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:871 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:914 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:917 #: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" @@ -2088,14 +2109,12 @@ msgid "Please choose a property type" msgstr "Velg en type egenskap" #: templates/web/seesomething/js/translation_strings.html:6 -#, fuzzy msgid "Please choose a transport category" -msgstr "Velg en kategori" +msgstr "Vennligst velg en transportkategori" #: templates/web/seesomething/js/translation_strings.html:7 -#, fuzzy msgid "Please choose an incident category" -msgstr "Velg en kategori" +msgstr "Vennligst velg en hendelseskategori" #: templates/web/bromley/report/new/fill_in_details_form.html:64 msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”" @@ -2114,13 +2133,12 @@ msgstr "" #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:7 #: templates/web/oxfordshire/report/new/notes.html:6 -#, fuzzy msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Ikke vær ufin — å kjefte på din administrasjon skader verdien av tjenesten for alle brukerne." #: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 msgid "Please do not give address or personal information in this section." -msgstr "" +msgstr "Vennligst ikke skriv inn adresser eller personlig informasjon her," #: perllib/FixMyStreet/DB/Result/Comment.pm:145 #: templates/web/default/js/translation_strings.html:2 @@ -2209,7 +2227,7 @@ msgstr "Vennligst legg inn din tittel" #: templates/web/default/auth/sign_out.html:5 #: templates/web/zurich/auth/sign_out.html:5 msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." -msgstr "" +msgstr "Du kan også <a href=\"%s\">logge inn igjen</a> eller gå tilbake til <a href=\"/\">framsiden</a>." #: templates/web/emptyhomes/report/new/fill_in_details_text.html:1 msgid "" @@ -2220,6 +2238,12 @@ msgid "" "and to the point; writing your message entirely in block capitals makes it hard\n" "to read, as does a lack of punctuation." msgstr "" +"Vennligst fyll ut detaljer om den tomme eiendomen under, si hva slags\n" +"eiendom er det eksempel et tomt hjem, boligblokk, kontor etc. Fortell oss\n" +"noe om dets tilstand og annen informasjon du føler er relevant.\n" +"Det er ikke nødvendig for å gi den nøyaktige adressen. Vær høflig, konsis\n" +"og rett på sak, skriver du meldingen i bare store bokstaver blir den vanskelig\n" +"å lese, det samme gjør manglende tegnsetting." #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:11 @@ -2237,6 +2261,8 @@ msgid "" "and if possible describe the exact location of\n" "the problem (e.g. if there is a streetlight number or road name)." msgstr "" +"Vennligst fyll inn detaljene om problemet under. Legg inn så mange detaljer som du kan, og om mulig beskriv eksakt plassering for problemet (f.eks. på en vegg), hva det er, hvor lenge det har\n" +"vært der, osv." #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:3 @@ -2327,11 +2353,11 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" msgid "Please take a look at the updates that have been left." msgstr "Vennligst se over oppdateringene som har blitt lagt inn." -#: perllib/FixMyStreet/App/Controller/Photo.pm:172 +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 msgid "Please upload a JPEG image only" msgstr "Vennligst last opp kun JPEG-bilder" -#: perllib/FixMyStreet/App/Controller/Photo.pm:179 +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 msgid "Please upload a JPEG image only\n" msgstr "Vennligst last opp kun JPEG eller JPG-bilder\n" @@ -2351,7 +2377,7 @@ msgstr "Vennligst skriv inn din oppdatering her" #: templates/web/default/report/update-form.html:109 #: templates/web/default/report/update-form.html:131 #: templates/web/default/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/contact/index.html:105 #: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/fixmystreet/report/update-form.html:71 #: templates/web/fixmystreet/report/update-form.html:95 @@ -2372,18 +2398,17 @@ msgstr "Sendt inn av %s %s" #: templates/web/default/pagination.html:7 msgid "Previous" -msgstr "" +msgstr "Forrige" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "Privat" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:108 -#, fuzzy msgid "Private information (not shown on site)" -msgstr "Mer informasjon om vårt arbeid med tomme hjem" +msgstr "Privat informasjon (vises ikke på websiden)" #: templates/web/default/maps/openlayers.html:85 msgid "Problem" @@ -2406,7 +2431,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:917 +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -2442,15 +2467,15 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problemer innenfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:615 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/Default.pm:626 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:228 msgid "Problems within %s" msgstr "Problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:241 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:242 msgid "Problems within %s ward" msgstr "Problemer innenfor %s bydel" @@ -2469,11 +2494,10 @@ msgstr "Problemer innenfor grensene av:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Eiendommer nylig rapportert som gått tilbake i bruk på reportemptyhomes.com" -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 -#, fuzzy msgid "Property address:" -msgstr "Type egenskap:" +msgstr "Eiendomsadresse:" #: templates/web/default/report/new/category.html:8 msgid "Property type:" @@ -2490,6 +2514,11 @@ msgstr "Oppgi en tittel" msgid "Provide an update" msgstr "Bidra med en oppdatering" +#: templates/web/fixmystreet/auth/general.html:53 +#, fuzzy +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 et passord, men om du gjør det vil det bli enklere for deg å rapportere problemer, legge inn oppdateringer og holde oversikt over dine rapporter" + #: templates/web/bromley/report/new/fill_in_details_form.html:180 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "Det er valgfritt å oppgi et passord, men om du gjør det vil det bli enklere for deg å rapportere problemer, legge inn oppdateringer og holde oversikt over dine rapporter." @@ -2509,21 +2538,21 @@ msgstr "Offentlig" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:44 msgid "Public information (shown on site)" -msgstr "" +msgstr "Offentlig informasjon (vises på websiden)" -#: templates/web/zurich/admin/report_edit.html:172 -#: templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:194 msgid "Public response:" -msgstr "" +msgstr "Offentlig respons:" -#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" -msgstr "" +msgstr "Publiser bilde" -#: templates/web/zurich/admin/report_edit.html:196 +#: templates/web/zurich/admin/report_edit.html:202 msgid "Publish the response" -msgstr "" +msgstr "Publiser svar" #: templates/web/default/questionnaire/completed.html:1 #: templates/web/default/questionnaire/completed.html:2 @@ -2561,11 +2590,11 @@ msgstr "Spørreskjema fylt inn av feilrapportøren" msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "RSS feed for %s" msgstr "RSS-strøm for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm for %s bydel, %s" @@ -2573,11 +2602,11 @@ msgstr "RSS-strøm for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 -#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm av %s, innenfor %s bydel" @@ -2590,15 +2619,15 @@ msgstr "RSS-strøm med problemer i nærheten" msgid "RSS feed of problems in this %s" msgstr "RSS-strøm for problemer i denne %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:616 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 -#: perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/UK.pm:235 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer innenfor %s bydel" @@ -2637,7 +2666,8 @@ msgstr "Nylig løste <br>problemer" msgid "Recently fixed" msgstr "Nylig løste problemer" -#: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 +#: templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Nylig meldte problemer" @@ -2648,19 +2678,19 @@ msgstr "Husk at FiksGataMi primert er laget for å rapportere fysiske problemer #: templates/web/fixmybarangay/report/new/notes.html:9 msgid "Remember that, for the pilot project, FixMyBarangay is only for reporting potholes and streetlights in bgy. Luz or Basak San Nicolas." -msgstr "" +msgstr "Husk at for testprosjektet er FixMyBarangay kun veihull og manglende lys i distriktene Luz eller Basak San Nicolas." #: templates/web/default/admin/report_blocks.html:16 msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:64 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:89 +#: templates/web/default/admin/update_edit.html:57 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilde (kan ikke gjøres om!)" -#: templates/web/default/index.html:9 templates/web/emptyhomes/header.html:12 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "Rapporter tomme hjem" @@ -2686,15 +2716,14 @@ msgstr "Rapporter misbruk" #: templates/web/default/report_created.html:3 #: templates/web/seesomething/report_created.html:0 #: templates/web/seesomething/report_created.html:8 -#, fuzzy msgid "Report created" -msgstr "Rapporter misbruk" +msgstr "Rapport opprettet" #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Rapport på %s" -#: templates/web/default/index.html:18 +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/stevenage/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 @@ -2711,7 +2740,7 @@ msgstr "Rapportert %s, til %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 -#: templates/web/fixmystreet/contact/index.html:46 +#: templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -2727,7 +2756,7 @@ msgstr "Publisert av %s anonymt %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 -#: templates/web/fixmystreet/contact/index.html:48 +#: templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -2744,9 +2773,8 @@ msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" #: templates/web/zurich/report/_main.html:2 -#, fuzzy msgid "Reported in the %s category" -msgstr "Rapportert i kategorien %s av %s %s" +msgstr "Rapportert i kategorien %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" @@ -2772,39 +2800,36 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:198 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:201 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 -#, fuzzy msgid "Reports" -msgstr "Alle rapporter" +msgstr "Rapporter" #: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "Reports are limited to 2000 characters in length. Please shorten your report" -msgstr "" +msgstr "Rapporter er begrenset til 2000 tegn i lengde. Vennligst skriv en kortere tekst" #: templates/web/zurich/admin/index-sdm.html:7 -#, fuzzy msgid "Reports awaiting approval" -msgstr "Legger til et problem" +msgstr "Rapporter som venter på godkjenning" #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Problemer i og rundt kartet" #: templates/web/zurich/admin/index-sdm.html:10 -#, fuzzy msgid "Reports published" -msgstr "Rapporter misbruk" +msgstr "Publiserte rapporter" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Resend report" msgstr "Send rapport på nytt" #: templates/web/default/js/translation_strings.html:22 msgid "Right place?" -msgstr "" +msgstr "Riktig sted?" #: perllib/FixMyStreet/Geocode/OSM.pm:173 msgid "Road operator for this named road (derived from road reference number and type): %s" @@ -2814,18 +2839,18 @@ 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:1332 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1343 -#: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: templates/web/default/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Left" -msgstr "" +msgstr "Roter til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: templates/web/default/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:75 msgid "Rotate Right" -msgstr "" +msgstr "Roter til høyre" #: templates/web/default/admin/body_edit.html:76 msgid "Save changes" @@ -2842,7 +2867,6 @@ msgid "Search Users" msgstr "Søk i brukere" #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Search reports" msgstr "Søk i rapporter" @@ -2855,12 +2879,12 @@ msgstr "Søk:" #: templates/web/default/admin/body-form.html:11 #: templates/web/zurich/admin/body-form.html:17 msgid "Select a body" -msgstr "" +msgstr "Velg en administrasjon" #: templates/web/default/admin/body-form.html:21 #: templates/web/zurich/admin/body-form.html:27 msgid "Select an area" -msgstr "" +msgstr "Velg et område" #: templates/web/default/alert/_list.html:8 #: templates/web/fixmystreet/alert/_list.html:10 @@ -2871,11 +2895,11 @@ msgstr "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kild msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Sent:" msgstr "Sendt:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:73 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Tjeneste:" @@ -2976,7 +3000,7 @@ msgstr "Beklager det ser ut til å være et \"Crown dependency\"-postnummer, som msgid "Sorry, there has been an error confirming your problem." msgstr "Beklager, men det oppsto et problem når vi forsøkte å bekrefte problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 #: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 #: perllib/FixMyStreet/Geocode/Google.pm:74 #: perllib/FixMyStreet/Geocode/OSM.pm:66 @@ -3014,17 +3038,17 @@ msgstr "Startmåned:" msgid "State" msgstr "Tilstand" -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/update_edit.html:21 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:54 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1138 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:213 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:216 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -3033,34 +3057,32 @@ msgstr "Statistikk" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Status" -msgstr "Statistikk" +msgstr "Status" #: templates/web/default/report/updates.html:10 msgid "Still open, via questionnaire, %s" msgstr "Fortsatt åpen via spørreskjema, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 msgid "Subcategory: %s" -msgstr "Kategori: %s" +msgstr "Underkategori: %s" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" -msgstr "" +msgstr "Underavdeling/administrasjon" #: templates/web/bromley/report/new/fill_in_details_form.html:48 -#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/contact/index.html:91 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "Emne" -#: templates/web/default/admin/report_edit.html:13 +#: templates/web/default/admin/report_edit.html:19 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:34 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Subject:" msgstr "Emne:" @@ -3080,11 +3102,11 @@ msgstr "Emne:" msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:67 -#: templates/web/default/admin/update_edit.html:54 +#: templates/web/default/admin/report_edit.html:92 +#: templates/web/default/admin/update_edit.html:60 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:65 -#: templates/web/zurich/admin/report_edit.html:198 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:204 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringer" @@ -3094,19 +3116,18 @@ msgstr "Send inn endringer" msgid "Submit questionnaire" msgstr "Send inn spørreskjema" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:88 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 -#, fuzzy msgid "Submitted" -msgstr "Send inn" +msgstr "Sendt inn" #: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 @@ -3124,10 +3145,10 @@ msgstr "Jeg ønsker å abonnere på e-postvarsel" #: templates/web/fixmybarangay/alert/_list.html:6 msgid "Subscribe to an alert based upon what baranagay you’re in:" -msgstr "" +msgstr "Abonner på varsel basert på hvilket distrikt du hører inn under:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:200 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3146,10 +3167,9 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 msgid "Survey" -msgstr "Resultater fra spørreundersøkelsen" +msgstr "Spørreundersøkelse" #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" @@ -3164,7 +3184,7 @@ msgstr "Tekst" msgid "Text only version" msgstr "Tekst-versjon" -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/update_edit.html:20 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "Tekst:" @@ -3177,7 +3197,7 @@ msgstr "Tusen takk — du kan <a href=\"%s\">se på ditt oppdaterte problem< #: templates/web/emptyhomes/tokens/confirm_problem.html:6 #: templates/web/emptyhomes/tokens/confirm_problem.html:8 msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible." -msgstr "" +msgstr "Takk for rapporten om en tomt eiendom på ReportEmptyHomes.com. Vi har sendt en e-post til den avnsvarlige for tomme eiendommer i administrasjonen med detaljene, og bedt dem om å gjøre hva de kan for å få den tomme eiendommen i bruk igjen så snart som mulig." #: templates/web/emptyhomes/tokens/confirm_problem.html:30 #: templates/web/emptyhomes/tokens/confirm_problem.html:31 @@ -3187,6 +3207,9 @@ msgid "" "are working with councils to link them into the system so that as many areas\n" "as possible will be covered." msgstr "" +"Takk for rapporten om en tomt eiendom på ReportEmptyHomes.com. \n" +"Per nå kan vi desverre ikke sende rapporten til den ansvarlige administrasjonen. \n" +"Vi jobber med å koble så mange administrasjoner som mulig til systemet. " #: templates/web/default/tokens/error.html:7 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." @@ -3209,7 +3232,7 @@ msgstr "Takk for ditt innspill. Vi gir deg en tilbakemelding så raskt vi kan" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre deg om du har rapportert et problem til en administrasjon tidligere?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:186 +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bildet ser ikke ut til å blitt lastet opp riktig (%s), prøv på nytt." @@ -3226,20 +3249,19 @@ 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:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:683 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." #: perllib/FixMyStreet/App/Controller/Report.pm:117 -#, fuzzy msgid "That report cannot be viewed on %s." -msgstr "Den rapporten kan ikke ses på FiksGataMi." +msgstr "Dene rapporten kan ikke vises på %s." #: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." -#: templates/web/default/open311/index.html:23 +#: templates/web/default/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Open311 v2-atributten agency_responsible brukes for å liste opp administrasjonene som mottok problemrapporten, noe som ikke helt stemmer med hvordan atributten er definert i Open311 v2-spesifikasjonen." @@ -3250,7 +3272,6 @@ msgstr "Bekreftelsese-posten <strong>kan</strong> bruke noen minutter før den k #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 -#, fuzzy msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" "Administrasjonen vil ikke være i stand til å hjelpe med mindre du legger inn så mange\n" @@ -3267,11 +3288,11 @@ msgid "The details of your problem are available on the right hand side of this msgstr "Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:67 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "Feilen var: %s" -#: templates/web/default/open311/index.html:19 +#: templates/web/default/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "De følgende Open311 v2-atributtene blir returnert for hver forespørsel: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." @@ -3350,11 +3371,11 @@ msgstr "" "Tittelen og detaljene for problemet vil bli offentlig, pluss navnet ditt\n" "hvis du gir oss tillatelse til det." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt stedet de skrev inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Det var problemer med å vise 'Alle rapporter'-siden. Vennligst prøv igjen senere." @@ -3363,7 +3384,7 @@ msgstr "Det var problemer med å vise 'Alle rapporter'-siden. Vennligst prøv i msgid "There was a problem showing this page. Please try again later." msgstr "Det var problemer med å vise denne siden. Vennligst prøv igjen senere." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3388,20 +3409,20 @@ msgstr "Det var problemer med din rapport. Vennligst se under." msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." -#: templates/web/default/open311/index.html:10 +#: templates/web/default/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementasjonen er under arbeid og ennå ikke stabil. Den vil endre seg uten advarsel i fremtiden." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Denne e-posten har blitt sendt til begge administrasjonene som dekker stedet for problemet, da brukeren ikke kategoriserte det. Vær så snill å ignorere den hvis dere ikke er korrekt administrasjon for å håndtere denne saken, eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan legge det til i vårt system." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 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:891 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Denne informasjonen er påkrevd" @@ -3411,12 +3432,15 @@ msgid "This is a developer site; things might break at any time, and the databas msgstr "Dette er et utviklernettsted. Ting kan knekke når som helst og databasen vil bli periodisk slettet." #: templates/web/fixmybarangay/reports/index.html:7 -#, fuzzy msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." +msgstr "Dette er en opplisting av alle problemene i denne tjenesten; velg et bestemt distrikt for å se problemer som er sendt dit." + +#: templates/web/emptyhomes/reports/index.html:4 +#, fuzzy +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." msgstr "Dette er en opplisting av alle problemene i denne tjenesten; velg en bestemt administrasjon for å se problemer som er sendt dit." #: templates/web/default/reports/index.html:7 -#: templates/web/emptyhomes/reports/index.html:4 #: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." @@ -3424,7 +3448,7 @@ msgstr "Dette er en opplisting av alle problemene i denne tjenesten; velg en bes #: templates/web/default/auth/token.html:9 msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" +msgstr "Dette kan være fordi lenken er for gammel eller allerede brukt, eller at lenken ikke ble kopiert riktig." #: templates/web/default/report/banner.html:15 msgid "This problem has been closed" @@ -3452,12 +3476,11 @@ msgstr "Dette problemet er under arbeid" msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammel og med ukjent status." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/report/_main.html:14 -#, fuzzy msgid "This report is awaiting moderation." -msgstr "Denne rapporten er for tiden markert som åpen." +msgstr "Denne rapporten avventer moderasjon" #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." @@ -3471,16 +3494,15 @@ msgstr "Denne rapporten er for tiden markert som fikset." msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" -msgstr "%s, rapportert anonymt %s" +msgstr "Denne rapporten ble rapportert anonymt" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3498,7 +3520,7 @@ msgstr "For å <strong>rapportere et problem</strong>, klikk på riktig sted på msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 msgid "To view a map of the precise location of this issue" msgstr "For å se en kart med en mer presis plassering for dette problemet." @@ -3511,28 +3533,29 @@ msgid "Total" msgstr "Totalt" #: templates/web/seesomething/report/new/fill_in_details_form.html:24 -#, fuzzy msgid "Transport Category" -msgstr "Lag kategori" +msgstr "Transportkategori" #: templates/web/default/js/translation_strings.html:23 msgid "Try again" -msgstr "" +msgstr "Prøv igjen" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:31 msgid "Unable to fix" -msgstr "" +msgstr "Kan ikke fikses" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:59 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Ubekreftet" @@ -3546,9 +3569,8 @@ msgid "Unknown alert type" msgstr "Ukjent varsel-type" #: templates/web/default/js/translation_strings.html:33 -#, fuzzy msgid "Unknown error" -msgstr "Ukjent" +msgstr "Ukjent feil" #: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" @@ -3564,20 +3586,19 @@ msgid "Update %s created for problem %d; by %s" msgstr "Oppdatering %s opprettet for problem %d, av %s" #: templates/web/default/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:22 +#: templates/web/fixmystreet/contact/index.html:34 msgid "Update below added anonymously at %s" msgstr "Oppdateringen under lagt inn anonymt %s" #: templates/web/default/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:24 +#: templates/web/fixmystreet/contact/index.html:36 msgid "Update below added by %s at %s" msgstr "Oppdateringen under lagt til av %s %s" #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 -#, fuzzy msgid "Update body" -msgstr "Oppdatert!" +msgstr "Oppdater administrasjon" #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" @@ -3587,16 +3608,16 @@ msgstr "Tilstandsfordeling for oppdateringer" msgid "Update by {{name}}" msgstr "Oppdatert av {{name}}" -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "En oppdatering endret problemets status til %s" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/default/admin/update_edit.html:44 msgid "Update marked problem as fixed" msgstr "En oppdatering markerte dette problemet som fikset." -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/update_edit.html:46 msgid "Update reopened problem" msgstr "En oppdatering gjennåpnet problemet" @@ -3611,16 +3632,15 @@ msgstr "Oppdatering:" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Updated" -msgstr "Oppdatert!" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:763 -#: perllib/FixMyStreet/App/Controller/Admin.pm:907 -#: perllib/FixMyStreet/App/Controller/Admin.pm:960 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:485 +msgstr "Oppdatert" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:972 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:488 msgid "Updated!" msgstr "Oppdatert!" @@ -3634,7 +3654,7 @@ msgstr "Oppdateringer" #: perllib/FixMyStreet/DB/Result/Comment.pm:150 msgid "Updates are limited to 2000 characters in length. Please shorten your update" -msgstr "" +msgstr "Oppdateringer er begrenset til 2000 tegn i lengde. Vennligst skriv en kortere tekst." #: db/alert_types.pl:5 db/alert_types.pl:6 msgid "Updates on {{title}}" @@ -3649,30 +3669,30 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 msgid "User flagged" msgstr "Bruker flagget" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:215 #: templates/web/default/admin/flagged.html:24 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brukere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "Values updated" msgstr "Verdier oppdatert" -#: templates/web/default/admin/report_edit.html:12 -#: templates/web/default/admin/update_edit.html:12 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:23 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Se rapport på nettstedet" @@ -3710,9 +3730,8 @@ msgid "We found more than one match for that location. We show up to ten matches msgstr "Vi fant mer en ett treff for den plassen. Vi viser opp til ti treff, så forsøk et annet søk hvis din plass ikke er her." #: templates/web/default/auth/token.html:8 -#, fuzzy msgid "We have not been able to confirm your account - sorry." -msgstr "Vi har sendt deg en epost som inneholder link for å bekrefte din konto." +msgstr "Vi har ikke klart å bekrefte din konto - beklager." #: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." @@ -3736,7 +3755,7 @@ msgstr "Vi viser aldri din e-postadresse" msgid "We never show your email address or phone number." msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Vi innser at %s kan være ansvarlig for dette problemet, men vi mangler for tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, ta kontakt med oss." @@ -3769,15 +3788,15 @@ msgstr "Vi ønsker å få din tilbakemelding om hva du mener om denne tjenesten. msgid "When edited" msgstr "Når redigert" -#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/problem_row.html:35 msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Whole block of empty flats" msgstr "Hel blokk med tomme leiligheter" -#: templates/web/default/open311/index.html:25 +#: templates/web/default/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "Når du søker etter forespørsler, så er det også mulig å søke etter agency_responsible for å begrense det til forespørsler som er sendt til en enkelt adminstrasjon. Søktetermen er administrasjons-IDen som oppgitt av <a href=\"%s\">MaPit</a>." @@ -3811,13 +3830,13 @@ msgstr "År" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:63 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:109 @@ -3835,12 +3854,12 @@ msgid "Yes I have a password" msgstr "<strong>Ja</strong>, jeg har et passord" #: templates/web/default/contact/index.html:37 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/fixmystreet/contact/index.html:50 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgende problem er støtende, inneholder personlig informasjon eller lignende:" #: templates/web/default/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:16 +#: templates/web/fixmystreet/contact/index.html:28 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgende oppdatering er støtende, inneholder personlig informasjon, eller lignende:" @@ -3848,9 +3867,8 @@ msgstr "Du rapporterer at følgende oppdatering er støtende, inneholder personl #: templates/web/default/tokens/confirm_problem.html:21 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 -#, fuzzy msgid "You can <a href=\"%s%s\">view the problem on this site</a>." -msgstr ". Du kan <a href=\"%s%s\">lese om problemet på denne siden</a>." +msgstr "Du kan <a href=\"%s%s\">lese om problemet på denne siden</a>." #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:13 @@ -3861,7 +3879,7 @@ msgstr "Du kan hjelpe oss ved å finne en kontakt-e-post for lokale problemer i #: templates/web/default/js/translation_strings.html:30 msgid "You declined; please fill in the box above" -msgstr "" +msgstr "Du avviste; vennligst fyll inn boksen ovenfor" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" @@ -3904,9 +3922,8 @@ msgstr "Du har nå lykkes med å bekrefte ditt varsel." #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 -#, fuzzy msgid "You have successfully confirmed your email address." -msgstr "Du har nå lykkes med å bekrefte ditt varsel." +msgstr "Du har nå lykkes med å bekrefte din e-postadresse." #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 @@ -3926,17 +3943,16 @@ msgstr "Du har lykkes med å opprette ditt varsel." msgid "You have successfully deleted your alert." msgstr "Sletting av ditt varsel var vellykket." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har lykkes med å logge inn. Vennligst sjekk og bekreft at dine detaljer er korrekte:" #: templates/web/default/email_sent.html:13 -#, fuzzy msgid "You must now click the link in the email we've just sent you." -msgstr "Du må nå åpne lenken i e-posten vi akkurat sendte deg — dersom du ikke gjør det, %s" +msgstr "Du må nå åpne lenken i e-posten vi akkurat sendte deg." -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "Ønsker du virkelig å sende på nytt?" @@ -3953,7 +3969,7 @@ msgstr "Dine rapporter" #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/contact/index.html:84 #: templates/web/fixmystreet/report/display.html:65 #: templates/web/fixmystreet/report/display.html:67 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 @@ -3963,9 +3979,8 @@ msgid "Your email" msgstr "Din e-post" #: templates/web/seesomething/report/new/fill_in_details_form.html:81 -#, fuzzy msgid "Your email (optional)" -msgstr "Passord (valgfritt)" +msgstr "Din e-postadresse (valgfritt)" #: templates/web/bromley/report/display.html:132 #: templates/web/fixmystreet/auth/general.html:26 @@ -4005,7 +4020,7 @@ msgid "Your last name" msgstr "Ditt etternavn" #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/contact/index.html:77 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 @@ -4052,7 +4067,7 @@ msgstr "Dine rapporter" #: templates/web/default/report_created.html:6 msgid "Your report has been created and will shortly be sent." -msgstr "" +msgstr "Din rapport har blitt opprettet og vil bli sendt innen kort tid." #: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19 #: templates/web/bromley/header.html:75 templates/web/default/footer.html:9 @@ -4084,19 +4099,14 @@ msgstr "administrasjon" #: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "council ref: %s" -msgstr "" +msgstr "administrasjonsreferanse: %s" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "didn't use map" msgstr "brukte ikke kart" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 -#, fuzzy -msgid "duplicate report" -msgstr "Lag en rapport" - #: templates/web/default/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 #: templates/web/seesomething/around/postcode_form.html:9 @@ -4110,36 +4120,69 @@ msgstr "fra %d forskjellige brukere" #: templates/web/fixmystreet/report/_item.html:12 #: templates/web/zurich/report/_item.html:16 -#, fuzzy msgid "last updated %s" -msgstr "Siste oppdatering:" +msgstr "sist oppdatert %s" #: perllib/Utils.pm:263 msgid "less than a minute" msgstr "mindre enn et minutt" -#: templates/web/default/report/updates.html:38 -msgid "marked as %s" +#: templates/web/default/report/updates.html:57 +#, fuzzy +msgid "marked as a duplicate report" +msgstr "duplisert rapport" + +#: templates/web/default/report/updates.html:47 +#, fuzzy +msgid "marked as action scheduled" +msgstr "Handling planlagt" + +#: templates/web/default/report/updates.html:59 +#, fuzzy +msgid "marked as an internal referral" +msgstr "Interne notater:" + +#: templates/web/default/report/updates.html:49 +#, fuzzy +msgid "marked as closed" msgstr "markert som %s" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:28 +#: templates/web/default/report/updates.html:51 msgid "marked as fixed" msgstr "markert som fikset" +#: templates/web/default/report/updates.html:45 +#, fuzzy +msgid "marked as in progress" +msgstr "Dette problemet er under arbeid" + +#: templates/web/default/report/updates.html:41 +#, fuzzy +msgid "marked as investigating" +msgstr "Undersøkes" + +#: templates/web/default/report/updates.html:55 +#, fuzzy +msgid "marked as not the council's responsibility" +msgstr "ikke administrasjonens ansvar" + +#: templates/web/default/report/updates.html:43 +#, fuzzy +msgid "marked as planned" +msgstr "markert som fikset" + +#: templates/web/default/report/updates.html:53 +#, fuzzy +msgid "marked as unable to fix" +msgstr "markert som fikset" + #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "n/a" -#: templates/web/default/report/updates.html:32 -msgid "no further action" -msgstr "" - -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 -msgid "not the council's responsibility" -msgstr "" - #: templates/web/default/alert/_list.html:87 #: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 @@ -4148,30 +4191,29 @@ msgstr "eller" #: templates/web/default/js/translation_strings.html:21 msgid "or locate me automatically" -msgstr "" +msgstr "eller finn min posisjon automatisk" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:27 -#: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:38 -#: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:50 -#: templates/web/zurich/admin/report_edit.html:52 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:53 msgid "originally entered: “%s”" -msgstr "søkte etter" +msgstr "opprinnelig lagt inn: “%s”" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "other areas:" msgstr "andre områder:" -#: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:36 +#: templates/web/default/report/updates.html:29 +#: templates/web/default/report/updates.html:39 msgid "reopened" msgstr "åpnet på nytt" @@ -4201,11 +4243,7 @@ msgstr "den lokale administrasjonen" msgid "there is no pin shown as the user did not use the map" msgstr "Det vises ingen nål på grunn av at brukeren ikke brukte kartet" -#: templates/web/default/report/updates.html:33 -msgid "third party responsibility" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 msgid "this type of local problem" msgstr "denne type lokalt problem" @@ -4213,17 +4251,17 @@ msgstr "denne type lokalt problem" msgid "today" msgstr "idag" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "used map" msgstr "brukte kart" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:35 msgid "user is from same council as problem - %d" msgstr "bruker er fra samme administrasjon som problemet - %d" -#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/update_edit.html:38 msgid "user is problem owner" msgstr "bruker er eier av problemet" @@ -4247,10 +4285,10 @@ msgstr[0] "%d time" msgstr[1] "%d timer" #: templates/web/default/report/_support.html:6 -#, fuzzy, perl-format +#, perl-format msgid "%d supporter" msgid_plural "%d supporters" -msgstr[0] "%d støttespillere" +msgstr[0] "%d støttespiller" msgstr[1] "%d støttespillere" #: perllib/Utils.pm:284 @@ -4309,86 +4347,8 @@ msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dager" -#~ msgid "(Don't worry — %s)" -#~ msgstr "(Ingen grunn til bekymring — %s)" - -#~ msgid "*unknown*" -#~ msgstr "*ukjent*" - -#~ msgid "1 supporter" -#~ msgstr "1 støttespiller" - -#~ msgid "All confirmed" -#~ msgstr "Alle bekreftet" - -#~ msgid "All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your name if you give us permission." -#~ msgstr "" -#~ "All informasjonen du legger inn her vil bli sendt til <strong>%s</strong>.\n" -#~ "På dette nettestedet vil vi vise emne og detaljer om problemet, inkludert ditt navn\n" -#~ "dersom du gir oss lov." - -#~ msgid "Configuration updated" -#~ msgstr "Oppsett oppdatert" - -#~ msgid "Configure Open311" -#~ msgstr "Sett opp Open311" - -#~ msgid "Configure Open311 integration" -#~ msgstr "Sett opp Open311-integrasjon" - -#~ msgid "Council contacts" -#~ msgstr "Administrasjonskontakter" - -#~ msgid "Councils" -#~ msgstr "Administrasjoner" - -#~ msgid "Currently has 1+ deleted" -#~ msgstr "For tiden har 1+ slettet" - -#~ msgid "Enter a nearby GB postcode, or street name and area" -#~ msgstr "Skriv inn GB-postnummer i nærheten, eller veinavn og sted" - -#~ msgid "FixMyStreet administration" -#~ msgstr "Fiksgatami-administrasjon" - -#~ msgid "List Flagged" -#~ msgstr "List flagget" - -#~ msgid "No info at all" -#~ msgstr "Helt uten informasjon" - -#~ msgid "Report empty properties" -#~ msgstr "Rapporter tomme hjem" - -#~ msgid "Search Abuse" -#~ msgstr "Søk etter misbruk" - -#~ msgid "Search Abuse Table" -#~ msgstr "Søk i misbrukstabell" - -#~ msgid "Shelter Cymru" -#~ msgstr "Shelter Cymru" - -#~ msgid "Some unconfirmeds" -#~ msgstr "Noen ubekreftede" - -#~ msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :" -#~ msgstr "Takk for at du lastet opp ditt bilde. Nå trenger vi å plassere ditt problem,så vær så snill å skriv inn navn på vei i nærheten, eller postnummer i boksen under :" - -#~ msgid "This is a summary of all reports for one %s." -#~ msgstr "Dette er en oppsummering av alle rapporter for en %s." - -#~ msgid "This is a summary of all reports for this %s." -#~ msgstr "Dette er en oppsummering for alle rapporter for denne %s." - -#~ msgid "To <strong>report a problem</strong>, simply click on the map at the correct location." -#~ msgstr "For å <strong>rapportere et problem</strong>, klikk på kartet på riktig sted." - -#~ msgid "Unable to look up areas in MaPit. Please try again later." -#~ msgstr "Klarte ikke slå opp områder i MaPit. Vennligst forsøk igjen senere." - -#~ msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>." -#~ msgstr "Du kan <a href=\"%s\">se alle rapporter for administrasjonen</a> eller <a href=\"/reports\">se alle administrasjonene</a>." +#~ msgid "no further action" +#~ msgstr "Ingen flere handlinger" -#~ msgid "You can <a href=\"/reports\">show all councils</a>." -#~ msgstr "Du kan <a href=\"/reports/\">se alle administrasjoner</a>." +#~ msgid "third party responsibility" +#~ msgstr "tredjeparts ansvar" diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po index 36141f9dc..9fb959eb1 100644 --- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-04-24 08:59+0100\n" -"PO-Revision-Date: 2012-11-26 21:40+0000\n" -"Last-Translator: Edwin Bosveld <edwin@inwy.nl>\n" +"POT-Creation-Date: 2013-09-05 17:39+0100\n" +"PO-Revision-Date: 2013-05-02 21:06+0000\n" +"Last-Translator: mysociety <transifex@mysociety.org>\n" "Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/fixmystreet/language/nl_NL/)\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid " and " msgstr "en" @@ -41,7 +41,7 @@ msgstr "en <strong>we zullen het nu naar de gemeente sturen</strong>" msgid " or " msgstr "of" -#: templates/web/default/admin/bodies.html:32 +#: templates/web/default/admin/bodies.html:36 msgid "%d addresses" msgstr "%d adressen" @@ -79,16 +79,15 @@ msgstr "%s - Overzichtsverslagen" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "%s ward, %s" msgstr "%s district, %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:572 -#, fuzzy msgid "%s, reported at %s" -msgstr "%s, gemeld door %s bij %s" +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "%s, within %s ward" msgstr "%s, in %s district" @@ -133,7 +132,7 @@ msgstr "(gesloten)" msgid "(fixed)" msgstr "(opgelost)" -#: templates/web/default/index.html:11 templates/web/default/index.html:15 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(zoals graffiti, zwerfafval, losliggende tegels of straatverlichting) " @@ -162,13 +161,13 @@ msgstr "(we zullen je telefoonnummer of e-mailadres niet tonen)" msgid "(we never show your email)" msgstr "(we zullen je e-mailadres niet tonen)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Kies een categorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 #: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Kies een woning type --" @@ -289,6 +288,8 @@ msgstr "<strong>Ja</strong, ik heb een wachtwoord" #: templates/web/default/static/about-en-gb.html:1 #: templates/web/default/static/about-en-gb.html:3 #: templates/web/emptyhomes/header.html:34 +#: templates/web/emptyhomes/static/about-cy.html:1 +#: templates/web/emptyhomes/static/about-cy.html:3 #: templates/web/emptyhomes/static/about-en-gb.html:1 #: templates/web/emptyhomes/static/about-en-gb.html:3 msgid "About us" @@ -296,6 +297,8 @@ msgstr "Over ons" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -303,7 +306,8 @@ msgstr "Over ons" msgid "Action Scheduled" msgstr "" -#: templates/web/default/admin/bodies.html:47 +#: templates/web/default/admin/bodies.html:53 +#: templates/web/default/admin/bodies.html:57 #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" @@ -404,12 +408,12 @@ msgid "An update marked this problem as fixed." msgstr "Een update heeft dit probleem als opgelost gemarkeerd." #: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/problem_row.html:14 +#: templates/web/default/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anoniem" -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anoniem:" @@ -432,31 +436,30 @@ msgstr "Ben je van een gemeente?" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:124 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:127 +#: templates/web/zurich/admin/report_edit.html:133 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:113 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:99 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 #: templates/web/zurich/report/updates.html:11 -#, fuzzy msgid "Assigned to %s" -msgstr "Ingelogd als %s" +msgstr "" -#: templates/web/default/open311/index.html:17 +#: templates/web/default/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Ten hoogste %d aanvragen worden per query teruggegeven. The teruggegeven aanvragen zijn gesorteerd op requested_datetime, dus om alle aanvragen binnen te krijgen moet je meerdere zoekopdrachten uitvoeren met verschuivende start_date en end_date." -#: templates/web/default/open311/index.html:9 +#: templates/web/default/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "Op dit moment kan je alleen zoeken naar meldingen en deze bekijken." @@ -477,8 +480,8 @@ msgstr "Verban e-mailadres" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "Kies je categorie nauwkeurig, op basis hiervan bepalen we waarheen je melding wordt verzonden." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:208 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -531,16 +534,16 @@ msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:61 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/report_edit.html:123 msgid "Category:" msgstr "Categorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "Category: %s" msgstr "Categorie: %s" @@ -550,22 +553,23 @@ msgstr "Categorie: %s" msgid "Change Password" msgstr "Verander Wachtwoord" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/default/js/translation_strings.html:41 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klik op de kaart om een probleem te melden" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:76 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:90 -#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit.html:98 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -579,7 +583,7 @@ msgstr "Gesloten door gemeente" msgid "Closed reports" msgstr "Gesloten meldingen" -#: templates/web/default/admin/problem_row.html:32 +#: templates/web/default/admin/problem_row.html:38 msgid "Closed:" msgstr "Gesloten:" @@ -588,9 +592,9 @@ msgstr "Gesloten:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dichtstbijzijnde problemen <small>(binnen %skm)</small>" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Co-ordinates:" msgstr "Coördinaten:" @@ -598,17 +602,17 @@ msgstr "Coördinaten:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/default/admin/report_edit.html:50 -#: templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:75 +#: templates/web/default/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Cobrand data:" -#: templates/web/default/admin/report_edit.html:49 -#: templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:74 +#: templates/web/default/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Configuratie bijgewerkt - contactpersonen worden later gegenereerd" @@ -655,8 +659,8 @@ msgstr "Bevestigd" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/default/admin/problem_row.html:30 -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/problem_row.html:36 +#: templates/web/default/admin/report_edit.html:70 msgid "Confirmed:" msgstr "Bevestigd:" @@ -681,12 +685,12 @@ msgstr "Contacteer ons" #: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 -#: templates/web/fixmystreet/contact/index.html:7 +#: templates/web/fixmystreet/contact/index.html:19 msgid "Contact the team" msgstr "Neem contact op met het team" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1265 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1293 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 msgid "Could not find user" msgstr "Kan de gebruiker niet vinden" @@ -725,15 +729,15 @@ msgid "Create category" msgstr "Maak een categorie" #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/problem_row.html:34 #: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Aangemaakt" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:45 +#: templates/web/default/admin/report_edit.html:69 +#: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 -#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Aangemaakt:" @@ -772,12 +776,12 @@ msgstr "" msgid "Details" msgstr "Details" -#: templates/web/default/admin/report_edit.html:14 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:25 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:36 msgid "Details:" msgstr "Details:" @@ -807,6 +811,8 @@ msgstr "Geen idee" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -814,10 +820,10 @@ msgstr "Geen idee" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 -#: templates/web/default/admin/problem_row.html:35 +#: templates/web/default/admin/list_updates.html:42 +#: templates/web/default/admin/problem_row.html:41 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:36 +#: templates/web/zurich/admin/problem_row.html:44 msgid "Edit" msgstr "Bewerk" @@ -830,7 +836,7 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:4 +#: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Bewerk melding %d" @@ -864,11 +870,11 @@ msgstr "Redacteur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1241 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 msgid "Email added to abuse list" msgstr "Email toegevoegd aan zwarte lijst" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 msgid "Email already in abuse list" msgstr "Email staat al op zwarte lijst" @@ -882,31 +888,30 @@ msgstr "Email me updates" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:42 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:67 +#: templates/web/default/admin/update_edit.html:33 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit.html:58 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" -msgstr "Email:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty flat or maisonette" msgstr "Lege flat of maisonette" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty house or bungalow" msgstr "Leeg huis of bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 msgid "Empty office or other commercial" msgstr "Leeg kantoor of ander commercieel" @@ -914,11 +919,11 @@ msgstr "Leeg kantoor of ander commercieel" msgid "Empty property details form" msgstr "Leegstaand pand details formulier" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Empty pub or bar" msgstr "Lege kroeg of bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 msgid "Empty public building - school, hospital, etc." msgstr "Leeg publiek gebouw - school, ziekenhuis etc." @@ -935,14 +940,12 @@ msgid "End month:" msgstr "Eindmaand:" #: templates/web/default/admin/body-form.html:40 -#, fuzzy msgid "Endpoint" -msgstr "Configureer eindpunt" +msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:29 -#, fuzzy +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 msgid "Enter a Zürich street name" -msgstr "Geef dichtstbijzijnde straatnaam en plaats" +msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:18 msgid "Enter a nearby UK postcode, or street name and area" @@ -995,11 +998,11 @@ msgstr "Foutmelding" msgid "Example postcode %s" msgstr "Voorbeeld van postcode %s" -#: templates/web/default/open311/index.html:27 +#: templates/web/default/open311/index.html:96 msgid "Examples:" msgstr "Voorbeelden:" -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:76 msgid "Extra data:" msgstr "Extra info:" @@ -1008,11 +1011,10 @@ msgstr "Extra info:" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "Fout opgetreden bij het versturen van het bericht. Probeer het later nog eens of <a href=\"mailto:%s\">mail ons</a>." -#: templates/web/zurich/admin/index-dm.html:32 -#: templates/web/zurich/admin/index-sdm.html:29 -#, fuzzy +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" -msgstr "Opgeloste meldingen" +msgstr "" #: templates/web/emptyhomes/front/stats.html:6 msgid "Find latest local and national news" @@ -1063,8 +1065,9 @@ msgstr "FixMyStreet heeft diverse categorieën per gemeente voor problemen daaro #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1075,13 +1078,13 @@ msgstr "FixMyStreet heeft diverse categorieën per gemeente voor problemen daaro msgid "Fixed" msgstr "Opgelost" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "Opgelost - Gemeente" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:42 msgid "Fixed - User" msgstr "Opgelost - Gebruiker" @@ -1089,7 +1092,7 @@ msgstr "Opgelost - Gebruiker" msgid "Fixed reports" msgstr "Opgeloste meldingen" -#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/problem_row.html:37 msgid "Fixed:" msgstr "Opgelost:" @@ -1097,12 +1100,12 @@ msgstr "Opgelost:" msgid "Flag user" msgstr "Gemarkeerde gebruikr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Gemarkeerd" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:78 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Gemarkeerd:" @@ -1112,7 +1115,7 @@ msgstr "Gemarkeerd:" msgid "Follow a ward link to view only reports within that ward." msgstr "Klik op de link voor een wijk om alleen problemen in die wijk te bekijken." -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "For council(s):" msgstr "For gemeente(s):" @@ -1126,6 +1129,7 @@ msgstr "Wachtwoord vergeten?" #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmindelo/faq/faq-pt-cv.html:1 #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 @@ -1133,11 +1137,12 @@ msgstr "Wachtwoord vergeten?" msgid "Frequently Asked Questions" msgstr "Veelgestelde Vragen" -#: templates/web/default/open311/index.html:69 +#: templates/web/default/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "GeoRSS op Google Maps" #: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/around/_updates.html:3 #: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "Updates ontvangen" @@ -1166,7 +1171,7 @@ msgstr "Geef me een RSS feed" msgid "Go" msgstr "Gaan" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "Vragenlijst versturen?" @@ -1175,7 +1180,6 @@ msgid "Graph of problem creation by status over time" msgstr "Grafiek van problemen aangemaakt per status na verloop van tijd" #: templates/web/default/reports/index.html:8 -#: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "Grijze lijnen zijn gemeentes die niet meer bestaan." @@ -1222,13 +1226,14 @@ msgstr "Hier zijn de soorten meldingen van lokale problemen voor '%s'." msgid "Hi %s" msgstr "Hoi %s" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:91 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1258,7 +1263,7 @@ msgstr "Hoe een melding maken" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:700 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Ik ben bang dat je geen ongeverifieerde meldingen kunt bevestigen." @@ -1337,64 +1342,67 @@ msgstr "Illegale RSS feed selectie" msgid "In Progress" msgstr "In Behandeling" -#: templates/web/default/open311/index.html:21 +#: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Daarnaast worden de volgende attributen, die niet onderdeel zijn van de Open311 v2 specificatie meegestuurd: agency_sent_datetime, title (ook meegestuurd als onderdeel van de description), interface_used, comment_count, requestor_name (alleen aanwezig als deze getoond mag worden op de site)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:79 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:94 +#: templates/web/zurich/admin/report_edit.html:100 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In Behandeling" #: templates/web/seesomething/report/new/fill_in_details_form.html:38 -#, fuzzy msgid "Incident Category" -msgstr "Categorie" +msgstr "" -#: templates/web/zurich/admin/report_edit.html:137 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:143 msgid "Include reporter personal details" -msgstr "Geef details" +msgstr "" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Ongeverifiëerde meldingen meesturen" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "Ongeldige has_photo waarde \"%s\"" -#: templates/web/zurich/admin/report_edit-sdm.html:56 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:82 msgid "Internal notes:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:48 +msgid "Internal referral" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "Ongeldige agency_responsible waarde %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1052 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 msgid "Invalid end date" msgstr "Ongeldige einddatum" -#: perllib/FixMyStreet/App/Controller/Open311.pm:424 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "Ongeldig formaat %s gespecifieerd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 msgid "Invalid start date" msgstr "Ongeldige startdatum" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1433,11 +1441,11 @@ msgstr "Achternaam" msgid "Last editor" msgstr "Laatste bewerker" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:72 msgid "Last update:" msgstr "Laatste update:" -#: templates/web/default/admin/problem_row.html:33 +#: templates/web/default/admin/problem_row.html:39 msgid "Last update:" msgstr "Laatste update:" @@ -1503,7 +1511,7 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "Kaart © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> en bijdragers, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" -#: templates/web/fixmystreet/contact/index.html:86 +#: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "Bericht" @@ -1511,7 +1519,7 @@ msgstr "Bericht" msgid "Message:" msgstr "Bericht:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "Vermiste jurisdiction_id" @@ -1535,7 +1543,7 @@ msgstr "Meer problemen dichtbij" #: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 -#: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:9 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmybarangay/reports/index.html:15 @@ -1550,23 +1558,21 @@ msgid "Name" msgstr "Naam" #: templates/web/seesomething/report/new/fill_in_details_form.html:74 -#, fuzzy msgid "Name (optional)" -msgstr "(optioneel)" +msgstr "" -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:66 +#: templates/web/default/admin/update_edit.html:32 #: templates/web/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:57 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Naam:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" -msgstr "Naam:" +msgstr "" #: templates/web/fiksgatami/footer.html:3 #: templates/web/fiksgatami/nn/footer.html:3 @@ -1582,12 +1588,12 @@ 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:415 -#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:458 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Dichtstbijzijnde straat voor lokatie op de kaart (automatisch gegenereerd via Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1604,12 +1610,11 @@ msgstr "Bijna klaar! Kijk nu in je e-mail..." msgid "New <br>problems" msgstr "Nieuw <br>problemen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:249 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 msgid "New body added" -msgstr "Nieuw contactpersonen voor categorie toegevoegd" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 msgid "New category contact added" msgstr "Nieuw contactpersonen voor categorie toegevoegd" @@ -1621,7 +1626,7 @@ msgstr "Nieuwe lokale problemen op FixMyStreet" msgid "New local reports on reportemptyhomes.com" msgstr "Nieuwe lokale meldingen op reportemptyhomes.com" -#: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New problems" @@ -1648,9 +1653,8 @@ msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "Nieuwe problemen binnen de grenzen van {{NAME}} op FixMyStreet" #: templates/web/zurich/admin/index-sdm.html:4 -#, fuzzy msgid "New reports" -msgstr "Open meldingen" +msgstr "" #: db/alert_types_eha.pl:23 msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -1676,10 +1680,9 @@ msgstr "Nieuwe melding binnen de grenzen van {{NAME}} op reportemptyhomes.com" msgid "New state" msgstr "Nieuwe status" -#: templates/web/zurich/admin/report_edit-sdm.html:59 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" -msgstr "Updates ontvangen" +msgstr "" #: templates/web/fiksgatami/front/news.html:9 #: templates/web/fiksgatami/nn/front/news.html:9 @@ -1695,13 +1698,13 @@ msgstr "" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:25 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 #: templates/web/default/questionnaire/index.html:68 @@ -1734,10 +1737,9 @@ msgstr "Geen gemarkeerde problemen gevonden" msgid "No flagged users found" msgstr "Geen gemarkeerde gebruikers gevonden" -#: templates/web/zurich/admin/report_edit-sdm.html:66 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" -msgstr "Jouw updates" +msgstr "" #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 @@ -1762,14 +1764,16 @@ msgstr "Geen medestanders" msgid "Non Public" msgstr "Niet publiekelijk" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 msgid "None" msgstr "Geen" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1805,7 +1809,7 @@ msgstr "Let op dat als je onbevestigde meldingen meeneemt we de datum gebruiken msgid "Note:" msgstr "Opmerking:" -#: templates/web/default/open311/index.html:6 +#: templates/web/default/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "Opmerking: <strong>%s</strong>" @@ -1863,23 +1867,25 @@ msgstr "Oudere<br>problemen" msgid "Older fixed" msgstr "Ouder opgelost" -#: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/emptyhomes/reports/index.html:11 #: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "Oudere problemen" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:83 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1889,15 +1895,15 @@ msgstr "Open" msgid "Open reports" msgstr "Open meldingen" -#: templates/web/default/open311/index.html:3 +#: templates/web/default/open311/index.html:72 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API voor de mySociety FixMyStreet server" -#: templates/web/default/open311/index.html:13 +#: templates/web/default/open311/index.html:82 msgid "Open311 initiative web page" msgstr "Open311 initiatief website" -#: templates/web/default/open311/index.html:14 +#: templates/web/default/open311/index.html:83 msgid "Open311 specification" msgstr "Open311 specificatie" @@ -1911,15 +1917,15 @@ msgstr "Of problemen gemeld aan:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Of je kan je abonneren op een melding gebaseerd op welke gemeente je woont:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1046 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:588 #: perllib/FixMyStreet/DB/Result/Problem.pm:598 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Other" msgstr "Anders" @@ -1941,8 +1947,8 @@ msgstr "Pagina Niet Gevonden" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 msgid "Partial" msgstr "Gedeeltelijk" @@ -1960,6 +1966,10 @@ msgstr "Wachtwoord (optioneel)" msgid "Password:" msgstr "Wachtwoord:" +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 @@ -1969,12 +1979,12 @@ msgstr "Wachtwoord:" msgid "Phone number (optional)" msgstr "Telefoonnummer (optioneel)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 -#: templates/web/default/admin/report_edit.html:43 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 +#: templates/web/default/admin/report_edit.html:68 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefoonnummer:" @@ -1984,6 +1994,8 @@ msgstr "Telefoonnummer:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" @@ -2005,15 +2017,15 @@ msgstr "Foto's van recente meldingen dichtbij" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 msgid "Planned" msgstr "Gepland" @@ -2047,10 +2059,10 @@ msgstr "Controleer je e-mail" msgid "Please check your email address is correct" msgstr "Controleer of je e-mailadres klopt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:852 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:871 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:914 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:917 #: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" @@ -2061,14 +2073,12 @@ msgid "Please choose a property type" msgstr "Kies een pand type" #: templates/web/seesomething/js/translation_strings.html:6 -#, fuzzy msgid "Please choose a transport category" -msgstr "Kies een categorie" +msgstr "" #: templates/web/seesomething/js/translation_strings.html:7 -#, fuzzy msgid "Please choose an incident category" -msgstr "Kies een categorie" +msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:64 msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”" @@ -2084,9 +2094,8 @@ msgstr "Maak alsjeblieft <strong>geen</strong> meldingen van problemen via dit f #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:7 #: templates/web/oxfordshire/report/new/notes.html:6 -#, fuzzy msgid "Please do not be abusive — abusing your council devalues the service for all users." -msgstr "Wees alsjeblieft niet beledigend — belediging van je gemeente zorgt voor een waarde daling van deze service voor alle gebruikers." +msgstr "" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 msgid "Please do not give address or personal information in this section." @@ -2291,11 +2300,11 @@ msgstr "Geef aan of het probleem is verholpen" msgid "Please take a look at the updates that have been left." msgstr "Kijk eens naar de updates die zijn achter gelaten." -#: perllib/FixMyStreet/App/Controller/Photo.pm:172 +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 msgid "Please upload a JPEG image only" msgstr "Je kan alleen een JPEG foto insturen" -#: perllib/FixMyStreet/App/Controller/Photo.pm:179 +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 msgid "Please upload a JPEG image only\n" msgstr "Upload alleen JPEG foto's\n" @@ -2315,7 +2324,7 @@ msgstr "Schrijf je update hier" #: templates/web/default/report/update-form.html:109 #: templates/web/default/report/update-form.html:131 #: templates/web/default/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/contact/index.html:105 #: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/fixmystreet/report/update-form.html:71 #: templates/web/fixmystreet/report/update-form.html:95 @@ -2340,14 +2349,13 @@ msgstr "" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "Privé" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:108 -#, fuzzy msgid "Private information (not shown on site)" -msgstr "Meer informatie over ons werk met lege panden." +msgstr "" #: templates/web/default/maps/openlayers.html:85 msgid "Problem" @@ -2370,7 +2378,7 @@ msgstr "Probleem %s verzonden naar gemeente %s" msgid "Problem breakdown by state" msgstr "Probleem verdeeld per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:917 +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 msgid "Problem marked as open." msgstr "Probleem gemarkeerd als open" @@ -2406,15 +2414,15 @@ msgstr "Recent gemelde problemen op FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemen binnen een straal van %.1fkm van deze lokatie" -#: perllib/FixMyStreet/Cobrand/Default.pm:615 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/Default.pm:626 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:228 msgid "Problems within %s" msgstr "Problemen binnen %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:241 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:242 msgid "Problems within %s ward" msgstr "Problemen binnen wijk %s" @@ -2433,11 +2441,10 @@ msgstr "Problemen binnen de grenzen van:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Recent gemelde hergebruikte panden op reportemptyhomes.com" -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 -#, fuzzy msgid "Property address:" -msgstr "Pand soort:" +msgstr "" #: templates/web/default/report/new/category.html:8 msgid "Property type:" @@ -2454,6 +2461,11 @@ msgstr "Geef een titel op" msgid "Provide an update" msgstr "Geef een update" +#: templates/web/fixmystreet/auth/general.html:53 +#, fuzzy +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 "Het is optioneel om een wachtwoord op de geven, maar hiermee is het makkelijker om in de toekomst problemen te melden, updates te plaatsen en je meldingen te beheren." + #: templates/web/bromley/report/new/fill_in_details_form.html:180 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "Het is optioneel om een wachtwoord op de geven, maar hiermee is het makkelijker om in de toekomst problemen te melden, updates te plaatsen en je meldingen te beheren." @@ -2475,17 +2487,17 @@ msgstr "Publiek" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:172 -#: templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:194 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:196 +#: templates/web/zurich/admin/report_edit.html:202 msgid "Publish the response" msgstr "" @@ -2525,11 +2537,11 @@ msgstr "Vragenlijst ingevuld door melder" msgid "RSS feed" msgstr "RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "RSS feed for %s" msgstr "RSS feed voor %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed for %s ward, %s" msgstr "RSS feed voor wijk %s, %s" @@ -2537,11 +2549,11 @@ msgstr "RSS feed voor wijk %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 -#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "RSS feed of %s" msgstr "RSS feed van %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed van %s, binnen wijk %s" @@ -2554,15 +2566,15 @@ msgstr "RSS feed van nabije problemen" msgid "RSS feed of problems in this %s" msgstr "RSS feed van problemen in dit %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:616 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 -#: perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/UK.pm:235 msgid "RSS feed of problems within %s" msgstr "RSS feed van problemen binnen %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "RSS feed of problems within %s ward" msgstr "RSS feed van problemen in wijk %s" @@ -2601,7 +2613,8 @@ msgstr "Recent <br>opgelost" msgid "Recently fixed" msgstr "Recent opgelost" -#: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 +#: templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Recent gemelde problemen" @@ -2618,13 +2631,13 @@ msgstr "Onthoud dat, tijdens dit proefproject, FixMyBarangary alleen te gebruike msgid "Remove flag" msgstr "Verwijder markering" -#: templates/web/default/admin/report_edit.html:64 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:89 +#: templates/web/default/admin/update_edit.html:57 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Verwijder foto (kan niet ongedaan worden!)" -#: templates/web/default/index.html:9 templates/web/emptyhomes/header.html:12 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "Meld Leegstaand Pand" @@ -2650,15 +2663,14 @@ msgstr "Meld misbruik" #: templates/web/default/report_created.html:3 #: templates/web/seesomething/report_created.html:0 #: templates/web/seesomething/report_created.html:8 -#, fuzzy msgid "Report created" -msgstr "Meld misbruik" +msgstr "" #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Meld op %s" -#: templates/web/default/index.html:18 +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/stevenage/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 @@ -2675,7 +2687,7 @@ msgstr "Gemeld %s aan %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 -#: templates/web/fixmystreet/contact/index.html:46 +#: templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Anoniem gemeld bij %s" @@ -2691,7 +2703,7 @@ msgstr "Anoniem door %s gemeld bij %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 -#: templates/web/fixmystreet/contact/index.html:48 +#: templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Gemeld door %s bij %s" @@ -2708,9 +2720,8 @@ msgid "Reported by %s in the %s category by %s at %s" msgstr "Gemeld door %s in de categorie %s door %s bij %s" #: templates/web/zurich/report/_main.html:2 -#, fuzzy msgid "Reported in the %s category" -msgstr "Gemeld in de categorie %s door %s bij %s" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" @@ -2736,33 +2747,30 @@ msgstr "Gemeld in de categorie %s door %s bij %s" msgid "Reporting a problem" msgstr "Meld een probleem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:198 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:201 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 -#, fuzzy msgid "Reports" -msgstr "Alle meldingen" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" #: templates/web/zurich/admin/index-sdm.html:7 -#, fuzzy msgid "Reports awaiting approval" -msgstr "Meld een probleem" +msgstr "" #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Melding op en nabij de kaart" #: templates/web/zurich/admin/index-sdm.html:10 -#, fuzzy msgid "Reports published" -msgstr "Meld misbruik" +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Resend report" msgstr "Herstuur melding" @@ -2778,16 +2786,16 @@ msgstr "Wegbeheerder voor deze straat (afgeleid van wegnummer en type): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Wegbeheerder voor deze straat (uit OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1343 -#: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: templates/web/default/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: templates/web/default/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:75 msgid "Rotate Right" msgstr "" @@ -2806,9 +2814,8 @@ msgid "Search Users" msgstr "Zoek Gebruikers" #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Search reports" -msgstr "Zoek Meldingen" +msgstr "" #: templates/web/default/admin/reports.html:5 #: templates/web/default/admin/users.html:5 @@ -2835,11 +2842,11 @@ msgstr "Selecteer op welke melding je wilt hebben en klik op de knop om een RSS msgid "Sent to %s %s later" msgstr "Verzonden aan %s %s later" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Sent:" msgstr "Verzonden:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:73 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Service:" @@ -2940,7 +2947,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 #: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 #: perllib/FixMyStreet/Geocode/Google.pm:74 #: perllib/FixMyStreet/Geocode/OSM.pm:66 @@ -2978,17 +2985,17 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/update_edit.html:21 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:54 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1138 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:213 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:216 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -3004,26 +3011,25 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 msgid "Subcategory: %s" -msgstr "Categorie: %s" +msgstr "" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:48 -#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/contact/index.html:91 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "" -#: templates/web/default/admin/report_edit.html:13 +#: templates/web/default/admin/report_edit.html:19 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:34 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Subject:" msgstr "" @@ -3043,11 +3049,11 @@ msgstr "" msgid "Submit" msgstr "" -#: templates/web/default/admin/report_edit.html:67 -#: templates/web/default/admin/update_edit.html:54 +#: templates/web/default/admin/report_edit.html:92 +#: templates/web/default/admin/update_edit.html:60 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:65 -#: templates/web/zurich/admin/report_edit.html:198 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:204 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -3057,14 +3063,14 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:88 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 msgid "Submitted" @@ -3088,8 +3094,8 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:200 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3108,7 +3114,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 msgid "Survey" msgstr "" @@ -3125,7 +3131,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/update_edit.html:20 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "" @@ -3170,7 +3176,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/Controller/Photo.pm:186 +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -3187,7 +3193,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:683 msgid "That problem will now be resent." msgstr "" @@ -3199,7 +3205,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/default/open311/index.html:23 +#: templates/web/default/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" @@ -3210,9 +3216,8 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 -#, fuzzy msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." -msgstr "Vul zoveel mogelijk details van het probleem beneden in. De gemeente kan niet helpen als ze niet genoeg informatie hebben. Vermeld daarom indien mogelijk de exacte locatie (bijvoorbeeld: op muur), wat het is, hoelang het zich al voordoet en een beschrijving (of foto als je die hebt) etc." +msgstr "" #: templates/web/fixmystreet/questionnaire/index.html:43 msgid "The details of your problem are available from the other tab above." @@ -3223,11 +3228,11 @@ msgid "The details of your problem are available on the right hand side of this msgstr "De details van je probleem zijn beschikbaar aan de rechter kant van de pagina." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:67 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "De foutmelding was: %s" -#: templates/web/default/open311/index.html:19 +#: templates/web/default/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "De volgende Open311 v2 attributen worden teruggegeven voor elke aanvraag: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code en service_name." @@ -3304,11 +3309,11 @@ msgstr "De simpelste melding is onze geografische:" msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "Het onderwerp en de details van het probleem zijn publiek, als je toestemming geeft wordt je naam ook getoond." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "The gebruiker kon het probleem niet vinden op de kaart, maar het gebied rond de lokatie wordt op de kaart getoond" -#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Er was een probleem bij het tonen van de Alle Meldingen pagina. Probeer het later nog eens." @@ -3317,7 +3322,7 @@ msgstr "Er was een probleem bij het tonen van de Alle Meldingen pagina. Probeer msgid "There was a problem showing this page. Please try again later." msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog eens." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3342,20 +3347,20 @@ msgstr "Er was een probleem met je melding. Zie beneden." msgid "There were problems with your update. Please see below." msgstr "Er was een probleem met je update. Zie beneden." -#: templates/web/default/open311/index.html:10 +#: templates/web/default/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Deze API implementatie is een werk in uitvoering en nog niet stabiel. Het kan zonder waarschuwing wijzigen in de toekomst." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïnteresseerd zijn in deze lokatie omdat de gebruiker geen categorie heeft aangegeven. Negeer deze melding als je niet de juiste contactpersoon bent, of laat ons weten in welke categorie dit probleem valt zodat we dit kunnen toevoegen aan ons systeem." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 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:891 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Deze informatie is verplicht" @@ -3365,12 +3370,15 @@ msgid "This is a developer site; things might break at any time, and the databas msgstr "Dit is een ontwikkelingssite; er kunnen mogelijk problemen optreden, en de database wordt regelmatig opgeschoond." #: templates/web/fixmybarangay/reports/index.html:7 -#, fuzzy msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." +msgstr "" + +#: templates/web/emptyhomes/reports/index.html:4 +#, fuzzy +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." msgstr "Dit is een samenvatting van alle meldingen op deze site; selecteer een gemeente om te zien welke rapporten hierheen zijn gestuurd." #: templates/web/default/reports/index.html:7 -#: templates/web/emptyhomes/reports/index.html:4 #: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." @@ -3406,12 +3414,11 @@ msgstr "Aan dit probleem wordt gewerkt" msgid "This problem is old and of unknown status." msgstr "Dit probleem is oud, en de status is onbekend." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/report/_main.html:14 -#, fuzzy msgid "This report is awaiting moderation." -msgstr "Deze melding is momenteel gemarkeerd als openstaand." +msgstr "" #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." @@ -3425,16 +3432,15 @@ msgstr "Deze melding is momenteel gemarkeerd als opgelost." msgid "This report is currently marked as open." msgstr "Deze melding is momenteel gemarkeerd als openstaand." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" -msgstr "%s, anoniem gemeld bij %s" +msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Deze pagina bevat een door de gebruiker aangeleverde foto van het probleem." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tijdslijn" @@ -3452,7 +3458,7 @@ msgstr "Klik op de kaart op de juiste lokatie om <strong>een probleem te melden< msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Vul je postcode of straatnaam en plaats in om te kijken welke lokale meldingen we voor je hebben." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3465,9 +3471,8 @@ msgid "Total" msgstr "" #: templates/web/seesomething/report/new/fill_in_details_form.html:24 -#, fuzzy msgid "Transport Category" -msgstr "Maak een categorie" +msgstr "" #: templates/web/default/js/translation_strings.html:23 msgid "Try again" @@ -3475,6 +3480,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3482,11 +3489,11 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:59 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -3517,12 +3524,12 @@ msgid "Update %s created for problem %d; by %s" msgstr "" #: templates/web/default/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:22 +#: templates/web/fixmystreet/contact/index.html:34 msgid "Update below added anonymously at %s" msgstr "" #: templates/web/default/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:24 +#: templates/web/fixmystreet/contact/index.html:36 msgid "Update below added by %s at %s" msgstr "" @@ -3539,16 +3546,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/default/admin/update_edit.html:44 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/update_edit.html:46 msgid "Update reopened problem" msgstr "" @@ -3566,12 +3573,12 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:763 -#: perllib/FixMyStreet/App/Controller/Admin.pm:907 -#: perllib/FixMyStreet/App/Controller/Admin.pm:960 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:485 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:972 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:488 msgid "Updated!" msgstr "" @@ -3600,30 +3607,30 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:215 #: templates/web/default/admin/flagged.html:24 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "Values updated" msgstr "" -#: templates/web/default/admin/report_edit.html:12 -#: templates/web/default/admin/update_edit.html:12 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:23 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "" @@ -3686,7 +3693,7 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 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 "" @@ -3719,15 +3726,15 @@ msgstr "" msgid "When edited" msgstr "" -#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/problem_row.html:35 msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Whole block of empty flats" msgstr "" -#: templates/web/default/open311/index.html:25 +#: templates/web/default/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -3761,13 +3768,13 @@ msgstr "Jaar" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:63 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:109 @@ -3785,12 +3792,12 @@ msgid "Yes I have a password" msgstr "Ja, ik heb een wachtwoord" #: templates/web/default/contact/index.html:37 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/fixmystreet/contact/index.html:50 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Je meld het volgende probleem als beledigend, persoonlijke informatie bevattend of gelijkend aan:" #: templates/web/default/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:16 +#: templates/web/fixmystreet/contact/index.html:28 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Je meld het volgende update als beledigend, persoonlijke informatie bevattend of gelijkend aan:" @@ -3798,9 +3805,8 @@ msgstr "Je meld het volgende update als beledigend, persoonlijke informatie beva #: templates/web/default/tokens/confirm_problem.html:21 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 -#, fuzzy msgid "You can <a href=\"%s%s\">view the problem on this site</a>." -msgstr ". Je kan <a href=\"%s%s\">het probleem bekijken op de site</a>." +msgstr "" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:13 @@ -3854,9 +3860,8 @@ msgstr "Je hebt je melding succesvol bevestigd." #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 -#, fuzzy msgid "You have successfully confirmed your email address." -msgstr "Je hebt je melding succesvol bevestigd." +msgstr "" #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 @@ -3876,17 +3881,16 @@ msgstr "Je hebt je melding gemaakt." msgid "You have successfully deleted your alert." msgstr "Je hebt je melding verwijdert." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Je bent ingelogd; controleer of je gegevens nog kloppen:" #: templates/web/default/email_sent.html:13 -#, fuzzy msgid "You must now click the link in the email we've just sent you." -msgstr "Je moet op de link in de e-mail die we je hebben gestuurd klikken — als je niet %s" +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "Weet je zeker dat je dit opnieuw wilt versturen?" @@ -3903,7 +3907,7 @@ msgstr "Jouw meldingen" #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/contact/index.html:84 #: templates/web/fixmystreet/report/display.html:65 #: templates/web/fixmystreet/report/display.html:67 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 @@ -3913,9 +3917,8 @@ msgid "Your email" msgstr "Jouw e-mail" #: templates/web/seesomething/report/new/fill_in_details_form.html:81 -#, fuzzy msgid "Your email (optional)" -msgstr "Wachtwoord (optioneel)" +msgstr "" #: templates/web/bromley/report/display.html:132 #: templates/web/fixmystreet/auth/general.html:26 @@ -3955,7 +3958,7 @@ msgid "Your last name" msgstr "Jouw achternaam" #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/contact/index.html:77 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 @@ -4036,17 +4039,12 @@ msgstr "gemeente" msgid "council ref: %s" msgstr "gemeente ref.: %s" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "didn't use map" msgstr "kaart niet gebruikt" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 -#, fuzzy -msgid "duplicate report" -msgstr "Maak een melding" - #: templates/web/default/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 #: templates/web/seesomething/around/postcode_form.html:9 @@ -4060,36 +4058,66 @@ msgstr "door %d verschillende gebruikers" #: templates/web/fixmystreet/report/_item.html:12 #: templates/web/zurich/report/_item.html:16 -#, fuzzy msgid "last updated %s" -msgstr "Laatste update:" +msgstr "" #: perllib/Utils.pm:263 msgid "less than a minute" msgstr "minder dan een minuut" -#: templates/web/default/report/updates.html:38 -msgid "marked as %s" +#: templates/web/default/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "" + +#: templates/web/default/report/updates.html:47 +#, fuzzy +msgid "marked as action scheduled" +msgstr "gemarkeerd als opgelost" + +#: templates/web/default/report/updates.html:59 +msgid "marked as an internal referral" +msgstr "" + +#: templates/web/default/report/updates.html:49 +#, fuzzy +msgid "marked as closed" msgstr "gemarkeerd als %s" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:28 +#: templates/web/default/report/updates.html:51 msgid "marked as fixed" msgstr "gemarkeerd als opgelost" +#: templates/web/default/report/updates.html:45 +#, fuzzy +msgid "marked as in progress" +msgstr "Aan dit probleem wordt gewerkt" + +#: templates/web/default/report/updates.html:41 +#, fuzzy +msgid "marked as investigating" +msgstr "Onderzoeken" + +#: templates/web/default/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "" + +#: templates/web/default/report/updates.html:43 +#, fuzzy +msgid "marked as planned" +msgstr "gemarkeerd als opgelost" + +#: templates/web/default/report/updates.html:53 +#, fuzzy +msgid "marked as unable to fix" +msgstr "gemarkeerd als opgelost" + #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "n/b" -#: templates/web/default/report/updates.html:32 -msgid "no further action" -msgstr "" - -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 -msgid "not the council's responsibility" -msgstr "" - #: templates/web/default/alert/_list.html:87 #: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 @@ -4100,27 +4128,27 @@ msgstr "of" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:27 -#: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:38 -#: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:50 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:53 msgid "originally entered: “%s”" msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:36 +#: templates/web/default/report/updates.html:29 +#: templates/web/default/report/updates.html:39 msgid "reopened" msgstr "" @@ -4150,11 +4178,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: templates/web/default/report/updates.html:33 -msgid "third party responsibility" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 msgid "this type of local problem" msgstr "" @@ -4162,17 +4186,17 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "used map" msgstr "" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:35 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/update_edit.html:38 msgid "user is problem owner" msgstr "" @@ -4196,11 +4220,11 @@ msgstr[0] "" msgstr[1] "" #: templates/web/default/report/_support.html:6 -#, fuzzy, perl-format +#, perl-format msgid "%d supporter" msgid_plural "%d supporters" -msgstr[0] "%d voorstanders" -msgstr[1] "%d voorstanders" +msgstr[0] "" +msgstr[1] "" #: perllib/Utils.pm:284 #, perl-format @@ -4257,96 +4281,3 @@ msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" - -#~ msgid "(Don't worry — %s)" -#~ msgstr "(Geen zorgen — %s)" - -#~ msgid "*unknown*" -#~ msgstr "*onbekend*" - -#~ msgid "1 supporter" -#~ msgstr "1 medestander" - -#~ msgid "All confirmed" -#~ msgstr "Alle bevestigingen" - -#~ msgid "All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your name if you give us permission." -#~ msgstr "Alle informatie die je hier opgeeft zal worden verzonden naar <strong>%s</strong>. Op de website tonen wij het onderwerp en de details van het probleem. We tonen ook je naam als je ons hier toestemming voor geeft." - -#~ msgid "Configuration updated" -#~ msgstr "Configuratie bijgewerkt" - -#~ msgid "Configure Open311" -#~ msgstr "Configureer Open311" - -#~ msgid "Configure Open311 integration" -#~ msgstr "Configureer Open311 integratie" - -#~ msgid "Council contacts" -#~ msgstr "Gemeente contactpersonen" - -#~ msgid "Councils" -#~ msgstr "Gemeentes" - -#~ msgid "Currently has 1+ deleted" -#~ msgstr "Heeft op dit moment 1+ verwijderd" - -#~ msgid "Enter a nearby GB postcode, or street name and area" -#~ msgstr "Vul een dichtstbijzijnde GB postcode, of straatnaam en plaats in" - -#~ msgid "FixMyStreet administration" -#~ msgstr "FixMyStreet administratie" - -#~ msgid "List Flagged" -#~ msgstr "Toon Gemarkeerd" - -#~ msgid "No info at all" -#~ msgstr "Helemaal geen info" - -#~ msgid "Report empty properties" -#~ msgstr "Meld leegstaand pand" - -#~ msgid "Search Abuse" -#~ msgstr "Zoek misbruik" - -#~ msgid "Search Abuse Table" -#~ msgstr "Zoek Misbruik Tabel" - -#~ msgid "Shelter Cymru" -#~ msgstr "Shelter Cymru" - -#~ msgid "" -#~ "Shelter Cymru is Wales’ people and homes charity and wants\n" -#~ " everyone in Wales to have a decent home. We believe a home is a fundamental\n" -#~ " right and essential to the health and well-being of people and communities.\n" -#~ " We work for people in housing need. We have offices all over Wales and\n" -#~ " prevent people from losing their homes by offering free, confidential and\n" -#~ " independent advice. When necessary we constructively challenge on behalf of\n" -#~ " people to ensure they are properly assisted and to improve practice and\n" -#~ " learning. We believe that bringing empty homes back into use can make a\n" -#~ " significant contribution to the supply of affordable homes in Wales." -#~ msgstr "" -#~ "Shelter Cymru is Wales’ people and homes charity and wants\n" -#~ " everyone in Wales to have a decent home. We believe a home is a fundamental\n" -#~ " right and essential to the health and well-being of people and communities.\n" -#~ " We work for people in housing need. We have offices all over Wales and\n" -#~ " prevent people from losing their homes by offering free, confidential and\n" -#~ " independent advice. When necessary we constructively challenge on behalf of\n" -#~ " people to ensure they are properly assisted and to improve practice and\n" -#~ " learning. We believe that bringing empty homes back into use can make a\n" -#~ " significant contribution to the supply of affordable homes in Wales." - -#~ msgid "This is a summary of all reports for one %s." -#~ msgstr "Dit is een samenvatting van alle meldingen voor ene %s." - -#~ msgid "This is a summary of all reports for this %s." -#~ msgstr "Dit is een samenvatting van alle meldingen voor deze %s." - -#~ msgid "To <strong>report a problem</strong>, simply click on the map at the correct location." -#~ msgstr "Klik op de kaart op de juiste lokatie om <strong>een probleem te melden</strong>." - -#~ msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>." -#~ msgstr "Je kan <a href=\"%s\">alle meldingen voor de gemeente bekijken</a> of <a href=\"/reports\">alle gemeentes tonen</a>." - -#~ msgid "You can <a href=\"/reports\">show all councils</a>." -#~ msgstr "Je kan <a href=\"/reports\">alle gemeentes tonen</a>." diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 737e7f0ed..bd7283be6 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.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: 2013-04-24 08:59+0100\n" -"PO-Revision-Date: 2013-02-16 12:15+0000\n" -"Last-Translator: Guttorm Flatabø <post@guttormflatabo.com>\n" +"POT-Creation-Date: 2013-09-05 17:39+0100\n" +"PO-Revision-Date: 2013-05-02 21:06+0000\n" +"Last-Translator: mysociety <transifex@mysociety.org>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/fixmystreet/language/nn_NO/)\n" "Language: nn_NO\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid " and " msgstr " og " @@ -43,7 +43,7 @@ msgstr " og <strong>vi sender det no til administrasjonen</strong>" msgid " or " msgstr " eller " -#: templates/web/default/admin/bodies.html:32 +#: templates/web/default/admin/bodies.html:36 msgid "%d addresses" msgstr "%d adresser" @@ -81,33 +81,29 @@ msgstr "%s – oppsummeringsrapportar" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "%s ward, %s" msgstr "%s bydel, %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:572 -#, fuzzy msgid "%s, reported at %s" -msgstr "%s, rapportert av %s %s" +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" #: templates/web/default/email_sent.html:29 -#, fuzzy msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -msgstr "vi tek vare på varselet ditt medan du sjekkar e-posten din." +msgstr "" #: templates/web/default/email_sent.html:25 -#, fuzzy msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -msgstr "vi tek vare på rapporten din medan du sjekkar e-posten din." +msgstr "" #: templates/web/default/email_sent.html:27 -#, fuzzy msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -msgstr "vi tek vare på oppdateringa di medan du sjekkar e-posten din." +msgstr "" #: templates/web/default/admin/report_blocks.html:11 #: templates/web/default/admin/users.html:26 @@ -138,7 +134,7 @@ msgstr "(lukka)" msgid "(fixed)" msgstr "(løyst)" -#: templates/web/default/index.html:11 templates/web/default/index.html:15 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" @@ -167,21 +163,20 @@ msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" msgid "(we never show your email)" msgstr "(vi viser aldri e-postadressa di)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 #: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" #: templates/web/emptyhomes/front/stats.html:5 -#, fuzzy msgid "<big>%s</big> reports" -msgstr "<big>%s</big> rapportoppdatering" +msgstr "" #: templates/web/default/questionnaire/completed.html:20 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" @@ -298,6 +293,8 @@ msgstr "<strong>Ja</strong>, eg har eit passord" #: templates/web/default/static/about-en-gb.html:1 #: templates/web/default/static/about-en-gb.html:3 #: templates/web/emptyhomes/header.html:34 +#: templates/web/emptyhomes/static/about-cy.html:1 +#: templates/web/emptyhomes/static/about-cy.html:3 #: templates/web/emptyhomes/static/about-en-gb.html:1 #: templates/web/emptyhomes/static/about-en-gb.html:3 msgid "About us" @@ -305,6 +302,8 @@ msgstr "Om oss" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -312,7 +311,8 @@ msgstr "Om oss" msgid "Action Scheduled" msgstr "" -#: templates/web/default/admin/bodies.html:47 +#: templates/web/default/admin/bodies.html:53 +#: templates/web/default/admin/bodies.html:57 #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" @@ -413,12 +413,12 @@ msgid "An update marked this problem as fixed." msgstr "Ei oppdatering markerte dette problemet som løyst." #: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/problem_row.html:14 +#: templates/web/default/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonym:" @@ -441,31 +441,30 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:124 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:127 +#: templates/web/zurich/admin/report_edit.html:133 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:113 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:99 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 #: templates/web/zurich/report/updates.html:11 -#, fuzzy msgid "Assigned to %s" -msgstr "Logga inn som %s" +msgstr "" -#: templates/web/default/open311/index.html:17 +#: templates/web/default/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "På det meste vert %d førespurnader returnert i kvar spørring. Dei returnerte førespurnadene vert sorterte på requested_datetime, så ein må gjera fleire søk med rullerande start_date og end_date for å få tak i alle førespurnadene." -#: templates/web/default/open311/index.html:9 +#: templates/web/default/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "For augneblunken går det berre an å søkja etter og å sjå på rapportar." @@ -486,8 +485,8 @@ msgstr "Bannlys e-postadresse" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:208 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -540,16 +539,16 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:61 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/report_edit.html:123 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "Category: %s" msgstr "Kategori: %s" @@ -559,22 +558,23 @@ msgstr "Kategori: %s" msgid "Change Password" msgstr "Byt passord" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/default/js/translation_strings.html:41 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:76 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:90 -#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit.html:98 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -588,7 +588,7 @@ msgstr "(ikkje rapportert til administrasjonen)" msgid "Closed reports" msgstr "Lukka rapportar" -#: templates/web/default/admin/problem_row.html:32 +#: templates/web/default/admin/problem_row.html:38 msgid "Closed:" msgstr "Lukka:" @@ -597,9 +597,9 @@ msgstr "Lukka:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dei næraste problema <small>(innanfor %skm)</small>" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Co-ordinates:" msgstr "Koordinatar:" @@ -607,17 +607,17 @@ msgstr "Koordinatar:" msgid "Cobrand" msgstr "Merkevaresamarbeid" -#: templates/web/default/admin/report_edit.html:50 -#: templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:75 +#: templates/web/default/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Data om merkevaresamarbeid:" -#: templates/web/default/admin/report_edit.html:49 -#: templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:74 +#: templates/web/default/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontaktar vil genererast automatisk seinare" @@ -664,8 +664,8 @@ msgstr "Stadfesta" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/default/admin/problem_row.html:30 -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/problem_row.html:36 +#: templates/web/default/admin/report_edit.html:70 msgid "Confirmed:" msgstr "Stadfesta:" @@ -690,12 +690,12 @@ msgstr "Kontakt oss" #: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 -#: templates/web/fixmystreet/contact/index.html:7 +#: templates/web/fixmystreet/contact/index.html:19 msgid "Contact the team" msgstr "Kontakt prosjektgruppa" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1265 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1293 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -734,15 +734,15 @@ msgid "Create category" msgstr "Lag kategori" #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/problem_row.html:34 #: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Oppretta" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:45 +#: templates/web/default/admin/report_edit.html:69 +#: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 -#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Oppretta:" @@ -781,12 +781,12 @@ msgstr "" msgid "Details" msgstr "" -#: templates/web/default/admin/report_edit.html:14 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:25 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:36 msgid "Details:" msgstr "Detaljar:" @@ -816,6 +816,8 @@ msgstr "Veit ikkje" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -823,10 +825,10 @@ msgstr "Veit ikkje" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 -#: templates/web/default/admin/problem_row.html:35 +#: templates/web/default/admin/list_updates.html:42 +#: templates/web/default/admin/problem_row.html:41 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:36 +#: templates/web/zurich/admin/problem_row.html:44 msgid "Edit" msgstr "Rediger" @@ -839,7 +841,7 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:4 +#: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Rediger problem %d" @@ -873,11 +875,11 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1241 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" @@ -891,31 +893,30 @@ msgstr "Send meg oppdateringar" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:42 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:67 +#: templates/web/default/admin/update_edit.html:33 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit.html:58 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" -msgstr "E-post:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty flat or maisonette" msgstr "Tom leilegheit" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -923,11 +924,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eigedom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentleg bygning – skule, sjukehus, osb." @@ -947,7 +948,7 @@ msgstr "Sluttmånad:" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:29 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 msgid "Enter a Zürich street name" msgstr "" @@ -1002,11 +1003,11 @@ msgstr "Feil" msgid "Example postcode %s" msgstr "Postnummerdøme %s" -#: templates/web/default/open311/index.html:27 +#: templates/web/default/open311/index.html:96 msgid "Examples:" msgstr "Døme:" -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:76 msgid "Extra data:" msgstr "" @@ -1015,11 +1016,10 @@ msgstr "" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "Klarte ikkje å senda meldinga. Ver venleg og prøv igjen seinare eller <a href=\"mailto:%s\">send oss ein e-post</a>." -#: templates/web/zurich/admin/index-dm.html:32 -#: templates/web/zurich/admin/index-sdm.html:29 -#, fuzzy +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" -msgstr "Løyste rapportar" +msgstr "" #: templates/web/emptyhomes/front/stats.html:6 msgid "Find latest local and national news" @@ -1072,8 +1072,9 @@ msgstr "FiksGataMi sender ulike kategoriar problem til ulike administrasjonar, p #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1084,13 +1085,13 @@ msgstr "FiksGataMi sender ulike kategoriar problem til ulike administrasjonar, p msgid "Fixed" msgstr "Løyst" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "Løyst – Administrasjon" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:42 msgid "Fixed - User" msgstr "Løyst – Brukar" @@ -1098,7 +1099,7 @@ msgstr "Løyst – Brukar" msgid "Fixed reports" msgstr "Løyste rapportar" -#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/problem_row.html:37 msgid "Fixed:" msgstr "Løyst:" @@ -1106,12 +1107,12 @@ msgstr "Løyst:" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flagga:" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:78 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Flagga:" @@ -1121,7 +1122,7 @@ msgstr "Flagga:" msgid "Follow a ward link to view only reports within that ward." msgstr "Følg ei bydellenkje for å berre sjå rapportar innanfor den bydelen." -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "For council(s):" msgstr "For administrasjon(ane):" @@ -1135,6 +1136,7 @@ msgstr "" #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmindelo/faq/faq-pt-cv.html:1 #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 @@ -1142,11 +1144,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Ofte spurde spurnader" -#: templates/web/default/open311/index.html:69 +#: templates/web/default/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" #: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/around/_updates.html:3 #: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "" @@ -1175,7 +1178,7 @@ msgstr "Gje meg ein RSS-straum" msgid "Go" msgstr "Hald fram" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" @@ -1184,7 +1187,6 @@ msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" #: templates/web/default/reports/index.html:8 -#: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "Linjer med grå bakgrunn er administrasjonar som ikkje lenger eksisterer." @@ -1231,13 +1233,14 @@ msgstr "Her er dei ulike typane lokale problemvarsel for «%s»." msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:91 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1267,7 +1270,7 @@ msgstr "Korleis rapportera eit problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:700 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." @@ -1294,19 +1297,16 @@ msgid "ID" msgstr "ID" #: templates/web/default/email_sent.html:19 -#, fuzzy msgid "If you do not, your alert will not be activated." -msgstr "varselet ditt vil ikkje aktiverast" +msgstr "" #: templates/web/default/email_sent.html:15 -#, fuzzy msgid "If you do not, your problem will not be posted." -msgstr "vil problemet ditt ikkje publiserast" +msgstr "" #: templates/web/default/email_sent.html:17 -#, fuzzy msgid "If you do not, your update will not be posted." -msgstr "oppdateringa di vil ikkje publiserast" +msgstr "" #: templates/web/default/report/new/councils_text_none.html:8 #: templates/web/default/report/new/councils_text_none.html:9 @@ -1352,64 +1352,67 @@ msgstr "Ugyldig val av straum" msgid "In Progress" msgstr "Under arbeid" -#: templates/web/default/open311/index.html:21 +#: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (òg returnert som del av description), interface_used, comment_count, requestor_name (berre tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:79 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:94 +#: templates/web/zurich/admin/report_edit.html:100 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" #: templates/web/seesomething/report/new/fill_in_details_form.html:38 -#, fuzzy msgid "Incident Category" -msgstr "Kategori" +msgstr "" -#: templates/web/zurich/admin/report_edit.html:137 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:143 msgid "Include reporter personal details" -msgstr "Ver venleg og legg inn opplysningar om problemet" +msgstr "" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Inkluder ikkje-stadfesta problem" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi «%s»" -#: templates/web/zurich/admin/report_edit-sdm.html:56 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:82 msgid "Internal notes:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:48 +msgid "Internal referral" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1052 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" -#: perllib/FixMyStreet/App/Controller/Open311.pm:424 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1448,11 +1451,11 @@ msgstr "" msgid "Last editor" msgstr "Sist redigert av" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:72 msgid "Last update:" msgstr "Siste oppdatering:" -#: templates/web/default/admin/problem_row.html:33 +#: templates/web/default/admin/problem_row.html:39 msgid "Last update:" msgstr "Siste oppdatering:" @@ -1518,7 +1521,7 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "Kart © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> og bidragsytarar, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" -#: templates/web/fixmystreet/contact/index.html:86 +#: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "" @@ -1526,7 +1529,7 @@ msgstr "" msgid "Message:" msgstr "Melding:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" @@ -1550,7 +1553,7 @@ msgstr "Fleire problem i nærleiken" #: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 -#: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:9 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmybarangay/reports/index.html:15 @@ -1565,23 +1568,21 @@ msgid "Name" msgstr "Namn" #: templates/web/seesomething/report/new/fill_in_details_form.html:74 -#, fuzzy msgid "Name (optional)" -msgstr "(valfritt)" +msgstr "" -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:66 +#: templates/web/default/admin/update_edit.html:32 #: templates/web/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:57 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Namn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" -msgstr "Namn:" +msgstr "" #: templates/web/fiksgatami/footer.html:3 #: templates/web/fiksgatami/nn/footer.html:3 @@ -1597,12 +1598,12 @@ 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:415 -#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:458 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1617,12 +1618,11 @@ msgstr "Nesten ferdig! No må du sjekka e-posten din …" msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:249 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 msgid "New body added" -msgstr "Ny kategorikontakt lagt til" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1634,7 +1634,7 @@ msgstr "Nye lokale problem på FiksGataMi" msgid "New local reports on reportemptyhomes.com" msgstr "Nye lokale rapportar på reportemptyhomes.com" -#: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New problems" @@ -1661,9 +1661,8 @@ msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "Nye rapportar innanfor grensa til {{NAME}} på FiksGataMi" #: templates/web/zurich/admin/index-sdm.html:4 -#, fuzzy msgid "New reports" -msgstr "Opne rapportar" +msgstr "" #: db/alert_types_eha.pl:23 msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -1689,10 +1688,9 @@ msgstr "Nye rapportar innanfor grensa til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/zurich/admin/report_edit-sdm.html:59 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" -msgstr "Ny tilstand" +msgstr "" #: templates/web/fiksgatami/front/news.html:9 #: templates/web/fiksgatami/nn/front/news.html:9 @@ -1708,13 +1706,13 @@ msgstr "" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:25 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 #: templates/web/default/questionnaire/index.html:68 @@ -1747,10 +1745,9 @@ msgstr "Fann ingen flagga problem" msgid "No flagged users found" msgstr "Fann ingen flagga brukarar" -#: templates/web/zurich/admin/report_edit-sdm.html:66 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" -msgstr "Oppdateringane dine" +msgstr "" #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 @@ -1775,14 +1772,16 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 msgid "None" msgstr "Ingen" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1818,7 +1817,7 @@ msgstr "Merk at når vi tek med ustadfesta rapportar, så brukar vi datoen rappo msgid "Note:" msgstr "Merk:" -#: templates/web/default/open311/index.html:6 +#: templates/web/default/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "Merk: <strong>%s</strong>" @@ -1876,23 +1875,25 @@ msgstr "" msgid "Older fixed" msgstr "Eldre løyste" -#: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/emptyhomes/reports/index.html:11 #: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "Eldre problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:83 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1902,15 +1903,15 @@ msgstr "Opne" msgid "Open reports" msgstr "Opne rapportar" -#: templates/web/default/open311/index.html:3 +#: templates/web/default/open311/index.html:72 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311-API for mySocietys FiksGataMi-tenar" -#: templates/web/default/open311/index.html:13 +#: templates/web/default/open311/index.html:82 msgid "Open311 initiative web page" msgstr "Nettsida til Open311-initiativet" -#: templates/web/default/open311/index.html:14 +#: templates/web/default/open311/index.html:83 msgid "Open311 specification" msgstr "Open311-spesifikasjon" @@ -1924,15 +1925,15 @@ msgstr "Eller problem meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnera på varsel basert på bydel eller administrasjon du høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1046 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:588 #: perllib/FixMyStreet/DB/Result/Problem.pm:598 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Other" msgstr "Anna" @@ -1954,8 +1955,8 @@ msgstr "Fann ikkje sida" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 msgid "Partial" msgstr "Delvis" @@ -1973,6 +1974,10 @@ msgstr "" msgid "Password:" msgstr "Passord:" +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 @@ -1982,12 +1987,12 @@ msgstr "Passord:" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 -#: templates/web/default/admin/report_edit.html:43 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 +#: templates/web/default/admin/report_edit.html:68 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" @@ -1997,6 +2002,8 @@ msgstr "Telefon:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" @@ -2018,15 +2025,15 @@ msgstr "Bilete av nye problem i nærleiken" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 msgid "Planned" msgstr "Planlagt" @@ -2060,10 +2067,10 @@ msgstr "Ver venleg og sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:852 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:871 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:914 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:917 #: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" @@ -2074,14 +2081,12 @@ msgid "Please choose a property type" msgstr "Vel ein type eigenskap" #: templates/web/seesomething/js/translation_strings.html:6 -#, fuzzy msgid "Please choose a transport category" -msgstr "Vel ein kategori" +msgstr "" #: templates/web/seesomething/js/translation_strings.html:7 -#, fuzzy msgid "Please choose an incident category" -msgstr "Vel ein kategori" +msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:64 msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”" @@ -2097,9 +2102,8 @@ msgstr "Ver venleg og <strong>ikkje</strong> rapporter feil gjennom denne sida; #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:7 #: templates/web/oxfordshire/report/new/notes.html:6 -#, fuzzy msgid "Please do not be abusive — abusing your council devalues the service for all users." -msgstr "Ikkje ver ufin — å kjefta på administrasjonen din skader verdet av tenesta for alle brukarane." +msgstr "" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 msgid "Please do not give address or personal information in this section." @@ -2314,11 +2318,11 @@ msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" msgid "Please take a look at the updates that have been left." msgstr "Ver venleg og sjå over oppdateringane som er lagt inn." -#: perllib/FixMyStreet/App/Controller/Photo.pm:172 +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 msgid "Please upload a JPEG image only" msgstr "Ver venleg og berre last opp JPEG-bilete" -#: perllib/FixMyStreet/App/Controller/Photo.pm:179 +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 msgid "Please upload a JPEG image only\n" msgstr "" @@ -2338,7 +2342,7 @@ msgstr "" #: templates/web/default/report/update-form.html:109 #: templates/web/default/report/update-form.html:131 #: templates/web/default/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/contact/index.html:105 #: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/fixmystreet/report/update-form.html:71 #: templates/web/fixmystreet/report/update-form.html:95 @@ -2363,14 +2367,13 @@ msgstr "" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:108 -#, fuzzy msgid "Private information (not shown on site)" -msgstr "Meir informasjon om arbeidet vårt med tomme heimar." +msgstr "" #: templates/web/default/maps/openlayers.html:85 msgid "Problem" @@ -2393,7 +2396,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:917 +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2429,15 +2432,15 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:615 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/Default.pm:626 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:228 msgid "Problems within %s" msgstr "Problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:241 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:242 msgid "Problems within %s ward" msgstr "Problem innanfor %s bydel" @@ -2456,11 +2459,10 @@ msgstr "Problem innanfor grensene av:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Eigedomar nyleg rapportert som tilbake i bruk på reportemptyhomes.com" -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 -#, fuzzy msgid "Property address:" -msgstr "Type eigenskap:" +msgstr "" #: templates/web/default/report/new/category.html:8 msgid "Property type:" @@ -2477,6 +2479,11 @@ msgstr "" msgid "Provide an update" msgstr "Bidra med ei oppdatering" +#: templates/web/fixmystreet/auth/general.html:53 +#, fuzzy +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 valfritt å oppgje eit passord, men om du gjer det vil det verta enklare for deg å rapportera problem, leggja inn oppdateringar og halda oversyn over rapportane dine" + #: templates/web/bromley/report/new/fill_in_details_form.html:180 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" @@ -2498,17 +2505,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:172 -#: templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:194 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:196 +#: templates/web/zurich/admin/report_edit.html:202 msgid "Publish the response" msgstr "" @@ -2548,11 +2555,11 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren" msgid "RSS feed" msgstr "RSS-straum" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "RSS feed for %s" msgstr "RSS-straum for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed for %s ward, %s" msgstr "RSS-straum for %s bydel, %s" @@ -2560,11 +2567,11 @@ msgstr "RSS-straum for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 -#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "RSS feed of %s" msgstr "RSS-straum frå %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "RSS feed of %s, within %s ward" msgstr "RSS-straum av %s, innanfor %s bydel" @@ -2577,15 +2584,15 @@ msgstr "RSS-straum med problem i nærleiken" msgid "RSS feed of problems in this %s" msgstr "RSS-straum for problem i denne %s-en" -#: perllib/FixMyStreet/Cobrand/Default.pm:616 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 -#: perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/UK.pm:235 msgid "RSS feed of problems within %s" msgstr "RSS-straum for problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "RSS feed of problems within %s ward" msgstr "RSS-straum for problem innanfor %s bydel" @@ -2624,7 +2631,8 @@ msgstr "" msgid "Recently fixed" msgstr "Nyleg løyste problem" -#: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 +#: templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Nyleg melde problem" @@ -2641,13 +2649,13 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:64 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:89 +#: templates/web/default/admin/update_edit.html:57 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilete (kan ikkje gjerast om!)" -#: templates/web/default/index.html:9 templates/web/emptyhomes/header.html:12 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "Rapporter tomme heimar" @@ -2673,15 +2681,14 @@ msgstr "" #: templates/web/default/report_created.html:3 #: templates/web/seesomething/report_created.html:0 #: templates/web/seesomething/report_created.html:8 -#, fuzzy msgid "Report created" -msgstr "Rapportert %s" +msgstr "" #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Rapport på %s" -#: templates/web/default/index.html:18 +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/stevenage/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 @@ -2698,7 +2705,7 @@ msgstr "Rapportert %s, til %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 -#: templates/web/fixmystreet/contact/index.html:46 +#: templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -2714,7 +2721,7 @@ msgstr "Publisert av %s anonymt %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 -#: templates/web/fixmystreet/contact/index.html:48 +#: templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -2731,9 +2738,8 @@ msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" #: templates/web/zurich/report/_main.html:2 -#, fuzzy msgid "Reported in the %s category" -msgstr "Rapportert i kategorien %s av %s %s" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" @@ -2759,33 +2765,30 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:198 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:201 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 -#, fuzzy msgid "Reports" -msgstr "Rapportert %s" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" #: templates/web/zurich/admin/index-sdm.html:7 -#, fuzzy msgid "Reports awaiting approval" -msgstr "Legger til eit problem" +msgstr "" #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Problem i og rundt kartet" #: templates/web/zurich/admin/index-sdm.html:10 -#, fuzzy msgid "Reports published" -msgstr "Rapporter eit problem" +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Resend report" msgstr "Send rapport på nytt" @@ -2801,16 +2804,16 @@ msgstr "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1343 -#: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: templates/web/default/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: templates/web/default/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:75 msgid "Rotate Right" msgstr "" @@ -2829,9 +2832,8 @@ msgid "Search Users" msgstr "Søk i brukarar" #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Search reports" -msgstr "Søk i rapportar" +msgstr "" #: templates/web/default/admin/reports.html:5 #: templates/web/default/admin/users.html:5 @@ -2858,11 +2860,11 @@ msgstr "Vel kva for ein type varsel du ynskjer og klikk på knappen for ei RSS-k msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Sent:" msgstr "Sendt:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:73 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Teneste:" @@ -2963,7 +2965,7 @@ msgstr "Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som v msgid "Sorry, there has been an error confirming your problem." msgstr "Orsak, men det oppstod eit problem når vi freista å stadfesta problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 #: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 #: perllib/FixMyStreet/Geocode/Google.pm:74 #: perllib/FixMyStreet/Geocode/OSM.pm:66 @@ -3001,17 +3003,17 @@ msgstr "Startmånad:" msgid "State" msgstr "Tilstand" -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/update_edit.html:21 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:54 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1138 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:213 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:216 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -3020,34 +3022,32 @@ msgstr "Statistikk" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Status" -msgstr "Statistikk" +msgstr "" #: templates/web/default/report/updates.html:10 msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 msgid "Subcategory: %s" -msgstr "Kategori: %s" +msgstr "" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:48 -#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/contact/index.html:91 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "" -#: templates/web/default/admin/report_edit.html:13 +#: templates/web/default/admin/report_edit.html:19 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:34 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Subject:" msgstr "Emne:" @@ -3067,11 +3067,11 @@ msgstr "Emne:" msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:67 -#: templates/web/default/admin/update_edit.html:54 +#: templates/web/default/admin/report_edit.html:92 +#: templates/web/default/admin/update_edit.html:60 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:65 -#: templates/web/zurich/admin/report_edit.html:198 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:204 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringar" @@ -3081,19 +3081,18 @@ msgstr "Send inn endringar" msgid "Submit questionnaire" msgstr "Send inn spørjeskjema" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:88 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 -#, fuzzy msgid "Submitted" -msgstr "Send inn" +msgstr "" #: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 @@ -3113,8 +3112,8 @@ msgstr "Eg ynskjer å abonnera på e-postvarsel" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:200 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3133,10 +3132,9 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 msgid "Survey" -msgstr "Resultat frå spørjeundersøkinga" +msgstr "" #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" @@ -3151,7 +3149,7 @@ msgstr "Tekst" msgid "Text only version" msgstr "Tekst-utgåve" -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/update_edit.html:20 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "Tekst:" @@ -3201,7 +3199,7 @@ msgstr "Takk for innspillet ditt. Vi gjev deg ei tilbakemelding så snart vi kan msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Takk, glad for å høyra at problemet er løyst! Vi vil gjerne spørja deg om du har rapportert eit problem til ein administrasjon tidlegare?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:186 +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 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." @@ -3218,7 +3216,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:683 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." @@ -3230,7 +3228,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." -#: templates/web/default/open311/index.html:23 +#: templates/web/default/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Open311 v2-attributten agency_responsible vert brukt for å lista opp administrasjonane som mottok problemrapporten, noko som ikkje heilt passar med korleis attributten er definert i Open311 v2-spesifikasjonen." @@ -3241,14 +3239,8 @@ msgstr "Stadfestingse-posten <strong>kan</strong> bruka nokre minutt før han kj #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 -#, fuzzy msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -"Ver venlg og fyll inn detaljane om problemet under. Administrasjonen\n" -"vil ikkje vera i stand til å hjelpa med mindre du legg inn så mange\n" -"detaljar som du kan. Forklar den eksakte plasseringa for problemet\n" -"(t.d. på ein vegg), kva det er, kor lenge det har vore der, ei\n" -"skildring (og eit bilete av problemet viss du har eit), osb." #: templates/web/fixmystreet/questionnaire/index.html:43 msgid "The details of your problem are available from the other tab above." @@ -3259,11 +3251,11 @@ msgid "The details of your problem are available on the right hand side of this msgstr "Detaljane om problemet ditt er tilgjengelege på høgre kant av denne sida." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:67 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "Feilen var: %s" -#: templates/web/default/open311/index.html:19 +#: templates/web/default/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Dei følgjande Open311 v2-attributtene vert returnerte for kvar førespurnad: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name." @@ -3342,11 +3334,11 @@ msgstr "" "Tittelen og detaljane for problemet vil verta offentlege, pluss namnet ditt\n" "viss du gjev oss lov til det." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt staden dei skreiv inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv igjen seinare." @@ -3355,7 +3347,7 @@ msgstr "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3380,20 +3372,20 @@ msgstr "Det var problem med rapporten din. Ver venleg og sjå under." msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." -#: templates/web/default/open311/index.html:10 +#: templates/web/default/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil endra seg utan åtvaring i framtida." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden for problemet, sidan brukaren ikkje kategoriserte det. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka, eller gjev oss melding om kva for ein kategori av problem dette er så vi kan leggja det til i systemet vårt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 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:891 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -3403,12 +3395,15 @@ msgid "This is a developer site; things might break at any time, and the databas msgstr "Dette er ein utviklarnettstad. Ting kan knekka når som helst og databasen vil verta periodisk sletta." #: templates/web/fixmybarangay/reports/index.html:7 -#, fuzzy msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." +msgstr "" + +#: templates/web/emptyhomes/reports/index.html:4 +#, fuzzy +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." msgstr "Dette er ei opplisting av alle problema i denne tenesta; vel ein viss administrasjon for å sjå problem som er sende dit." #: templates/web/default/reports/index.html:7 -#: templates/web/emptyhomes/reports/index.html:4 #: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." @@ -3444,12 +3439,11 @@ msgstr "Dette problemet er under arbeid" msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammalt og med ukjend status." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/report/_main.html:14 -#, fuzzy msgid "This report is awaiting moderation." -msgstr "Denne rapporten er for tida markert som open." +msgstr "" #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." @@ -3463,16 +3457,15 @@ msgstr "Denne rapporten er for tida markert som fiksa." msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" -msgstr "%s, rapportert anonymt %s" +msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3490,7 +3483,7 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 msgid "To view a map of the precise location of this issue" msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" @@ -3503,9 +3496,8 @@ msgid "Total" msgstr "Totalt" #: templates/web/seesomething/report/new/fill_in_details_form.html:24 -#, fuzzy msgid "Transport Category" -msgstr "Lag kategori" +msgstr "" #: templates/web/default/js/translation_strings.html:23 msgid "Try again" @@ -3513,6 +3505,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3520,11 +3514,11 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:59 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Ikkje stadfesta" @@ -3538,9 +3532,8 @@ msgid "Unknown alert type" msgstr "Ukjend varsel-type" #: templates/web/default/js/translation_strings.html:33 -#, fuzzy msgid "Unknown error" -msgstr "Ukjend varsel-type" +msgstr "" #: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" @@ -3556,20 +3549,19 @@ msgid "Update %s created for problem %d; by %s" msgstr "Oppdatering %s oppretta for problem %d, av %s" #: templates/web/default/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:22 +#: templates/web/fixmystreet/contact/index.html:34 msgid "Update below added anonymously at %s" msgstr "Oppdateringa under vart lagt inn anonymt %s" #: templates/web/default/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:24 +#: templates/web/fixmystreet/contact/index.html:36 msgid "Update below added by %s at %s" msgstr "Oppdateringa under vart lagt til av %s %s" #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 -#, fuzzy msgid "Update body" -msgstr "Oppdatert!" +msgstr "" #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" @@ -3579,16 +3571,16 @@ msgstr "Tilstandsfordeling for oppdateringar" msgid "Update by {{name}}" msgstr "Oppdatert av {{name}}" -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Ei oppdatering endra problemstatusen til %s" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/default/admin/update_edit.html:44 msgid "Update marked problem as fixed" msgstr "Ei oppdatering markerte dette problemet som fiksa." -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/update_edit.html:46 msgid "Update reopened problem" msgstr "Ei oppdatering gjenopna problemet" @@ -3603,16 +3595,15 @@ msgstr "Oppdatering:" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Updated" -msgstr "Oppdatert!" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:763 -#: perllib/FixMyStreet/App/Controller/Admin.pm:907 -#: perllib/FixMyStreet/App/Controller/Admin.pm:960 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:485 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:972 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:488 msgid "Updated!" msgstr "Oppdatert!" @@ -3641,30 +3632,30 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringar til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 msgid "User flagged" msgstr "Brukar flagga" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:215 #: templates/web/default/admin/flagged.html:24 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brukarar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "Values updated" msgstr "Verdi oppdatert" -#: templates/web/default/admin/report_edit.html:12 -#: templates/web/default/admin/update_edit.html:12 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:23 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Sjå rapport på nettstaden" @@ -3702,9 +3693,8 @@ msgid "We found more than one match for that location. We show up to ten matches msgstr "Vi fann meir ein eitt treff for den staden. Vi viser opp til ti treff, så prøv eit anna søk viss staden din ikkje er her." #: templates/web/default/auth/token.html:8 -#, fuzzy msgid "We have not been able to confirm your account - sorry." -msgstr "Vi har sendt deg ein epost som inneheld ei lenkje for å stadfesta kontoen din." +msgstr "" #: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." @@ -3728,7 +3718,7 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 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." @@ -3761,15 +3751,15 @@ msgstr "Vi ynskjer å få tilbakemelding frå deg om kva du meiner om denne tene msgid "When edited" msgstr "Når redigert" -#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/problem_row.html:35 msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Whole block of empty flats" msgstr "Heil blokk med tomme leilegheiter" -#: templates/web/default/open311/index.html:25 +#: templates/web/default/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "Når du søkjer etter førespurnader, så er det òg mogleg å søkja etter agency_responsible for å avgrensa det til førespurnader som er sendt til ein einskild adminstrasjon. Søkjetermen er administrasjonssida som du får frå <a href=\"%s\">MaPit</a>." @@ -3803,13 +3793,13 @@ msgstr "År" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:63 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:109 @@ -3827,12 +3817,12 @@ msgid "Yes I have a password" msgstr "" #: templates/web/default/contact/index.html:37 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/fixmystreet/contact/index.html:50 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgjande problem er støytande, inneheld personleg informasjon eller liknande:" #: templates/web/default/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:16 +#: templates/web/fixmystreet/contact/index.html:28 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgjande oppdatering er støytande, inneheld personleg informasjon, eller liknande:" @@ -3840,9 +3830,8 @@ msgstr "Du rapporterer at følgjande oppdatering er støytande, inneheld personl #: templates/web/default/tokens/confirm_problem.html:21 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 -#, fuzzy msgid "You can <a href=\"%s%s\">view the problem on this site</a>." -msgstr ". Du kan lesa om problemet på <a href=\"%s%s\">denne sida</a>." +msgstr "" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:13 @@ -3896,9 +3885,8 @@ msgstr "Du har no stadfesta varselet ditt." #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 -#, fuzzy msgid "You have successfully confirmed your email address." -msgstr "Du har no stadfesta varselet ditt." +msgstr "" #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 @@ -3918,17 +3906,16 @@ msgstr "Du har oppretta varselet ditt." msgid "You have successfully deleted your alert." msgstr "Sletting av varselet ditt var vellukka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har no logga inn. Ver venleg og sjekk og stadfest at detaljane dine er korrekte:" #: templates/web/default/email_sent.html:13 -#, fuzzy msgid "You must now click the link in the email we've just sent you." -msgstr "Du må no opna lenkja i e-posten vi akkurat sende deg — dersom du ikkje gjer det, %s" +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "Ynskjer du verkeleg å senda på nytt?" @@ -3945,7 +3932,7 @@ msgstr "Rapportane dine" #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/contact/index.html:84 #: templates/web/fixmystreet/report/display.html:65 #: templates/web/fixmystreet/report/display.html:67 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 @@ -3955,9 +3942,8 @@ msgid "Your email" msgstr "" #: templates/web/seesomething/report/new/fill_in_details_form.html:81 -#, fuzzy msgid "Your email (optional)" -msgstr "(valfritt)" +msgstr "" #: templates/web/bromley/report/display.html:132 #: templates/web/fixmystreet/auth/general.html:26 @@ -3997,7 +3983,7 @@ msgid "Your last name" msgstr "" #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/contact/index.html:77 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 @@ -4078,17 +4064,12 @@ msgstr "administrasjon" msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "didn't use map" msgstr "brukte ikkje kart" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 -#, fuzzy -msgid "duplicate report" -msgstr "Lag ein rapport" - #: templates/web/default/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 #: templates/web/seesomething/around/postcode_form.html:9 @@ -4102,36 +4083,66 @@ msgstr "frå %d ulike brukarar" #: templates/web/fixmystreet/report/_item.html:12 #: templates/web/zurich/report/_item.html:16 -#, fuzzy msgid "last updated %s" -msgstr "Siste oppdatering:" +msgstr "" #: perllib/Utils.pm:263 msgid "less than a minute" msgstr "mindre enn eitt minutt" -#: templates/web/default/report/updates.html:38 -msgid "marked as %s" +#: templates/web/default/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "" + +#: templates/web/default/report/updates.html:47 +#, fuzzy +msgid "marked as action scheduled" +msgstr "markert som løyst" + +#: templates/web/default/report/updates.html:59 +msgid "marked as an internal referral" +msgstr "" + +#: templates/web/default/report/updates.html:49 +#, fuzzy +msgid "marked as closed" msgstr "markert som %s" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:28 +#: templates/web/default/report/updates.html:51 msgid "marked as fixed" msgstr "markert som løyst" +#: templates/web/default/report/updates.html:45 +#, fuzzy +msgid "marked as in progress" +msgstr "Dette problemet er under arbeid" + +#: templates/web/default/report/updates.html:41 +#, fuzzy +msgid "marked as investigating" +msgstr "Undersøkjer" + +#: templates/web/default/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "" + +#: templates/web/default/report/updates.html:43 +#, fuzzy +msgid "marked as planned" +msgstr "markert som løyst" + +#: templates/web/default/report/updates.html:53 +#, fuzzy +msgid "marked as unable to fix" +msgstr "markert som løyst" + #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "i/t" -#: templates/web/default/report/updates.html:32 -msgid "no further action" -msgstr "" - -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 -msgid "not the council's responsibility" -msgstr "" - #: templates/web/default/alert/_list.html:87 #: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 @@ -4142,28 +4153,27 @@ msgstr "eller" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:27 -#: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:38 -#: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:50 -#: templates/web/zurich/admin/report_edit.html:52 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:53 msgid "originally entered: “%s”" -msgstr "søkte etter" +msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "other areas:" msgstr "andre område:" -#: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:36 +#: templates/web/default/report/updates.html:29 +#: templates/web/default/report/updates.html:39 msgid "reopened" msgstr "opna på nytt" @@ -4193,11 +4203,7 @@ msgstr "den lokale administrasjonen" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: templates/web/default/report/updates.html:33 -msgid "third party responsibility" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 msgid "this type of local problem" msgstr "denne typen lokalt problem" @@ -4205,17 +4211,17 @@ msgstr "denne typen lokalt problem" msgid "today" msgstr "i dag" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "used map" msgstr "brukte kart" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:35 msgid "user is from same council as problem - %d" msgstr "brukaren er frå same administrasjon som problemet – %d" -#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/update_edit.html:38 msgid "user is problem owner" msgstr "brukaren er eigaren av problemet" @@ -4239,11 +4245,11 @@ msgstr[0] "" msgstr[1] "" #: templates/web/default/report/_support.html:6 -#, fuzzy, perl-format +#, perl-format msgid "%d supporter" msgid_plural "%d supporters" -msgstr[0] "%d støttespelarar" -msgstr[1] "%d støttespelarar" +msgstr[0] "" +msgstr[1] "" #: perllib/Utils.pm:284 #, perl-format @@ -4300,84 +4306,3 @@ msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" - -#~ msgid "(Don't worry — %s)" -#~ msgstr "(Ingen grunn til å uroa seg — %s)" - -#~ msgid "*unknown*" -#~ msgstr "*ukjent*" - -#~ msgid "All confirmed" -#~ msgstr "Alle stadfesta" - -#~ msgid "All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your name if you give us permission." -#~ msgstr "" -#~ "All informasjonen du legg inn her vil sendast til <strong>%s</strong>.\n" -#~ "På dette nettestedet vil vi visa emne og detaljar om problemet,\n" -#~ "inkludert namnet ditt dersom du gjev oss lov." - -#~ msgid "Configuration updated" -#~ msgstr "Oppsett oppdatert" - -#~ msgid "Configure Open311" -#~ msgstr "Sett opp Open311" - -#~ msgid "Configure Open311 integration" -#~ msgstr "Sett opp Open311-integrasjon" - -#~ msgid "Council contacts" -#~ msgstr "Administrasjonskontaktar" - -#~ msgid "Councils" -#~ msgstr "Administrasjonar" - -#~ msgid "Currently has 1+ deleted" -#~ msgstr "For tida har 1+ sletta" - -#~ msgid "Enter a nearby GB postcode, or street name and area" -#~ msgstr "Skriv inn GB-postnummer i nærleiken, eller vegnamn og stad" - -#~ msgid "FixMyStreet administration" -#~ msgstr "Fiksgatami-administrasjon" - -#~ msgid "List Flagged" -#~ msgstr "Vis flagga" - -#~ msgid "No info at all" -#~ msgstr "Heilt utan informasjon" - -#~ msgid "Search Abuse" -#~ msgstr "Søk etter misbruk" - -#~ msgid "Search Abuse Table" -#~ msgstr "Søk i misbruktabell" - -#~ msgid "Shelter Cymru" -#~ msgstr "Shelter Cymru" - -#~ msgid "Some unconfirmeds" -#~ msgstr "Nokre ustadfesta" - -#~ msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :" -#~ msgstr "" -#~ "Takk for at du lasta opp biletet ditt. No treng vi å plassera\n" -#~ "problemet ditt, så ver venleg og skriv inn namn på ein veg i\n" -#~ "nærleiken, eller eit postnummer, i boksen under :" - -#~ msgid "This is a summary of all reports for one %s." -#~ msgstr "Dette er ei oppsummering av alle rapportar for ein %s." - -#~ msgid "This is a summary of all reports for this %s." -#~ msgstr "Dette er ei oppsummering for alle rapportar for denne %s-en." - -#~ msgid "To <strong>report a problem</strong>, simply click on the map at the correct location." -#~ msgstr "For å <strong>rapportera eit problem</strong>, klikk på kartet på riktig stad." - -#~ msgid "Unable to look up areas in MaPit. Please try again later." -#~ msgstr "Klarte ikkje slå opp område i MaPit. Ver venleg og prøv igjen seinare." - -#~ msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>." -#~ msgstr "Du kan <a href=\"%s\">sjå alle rapportar for administrasjonen</a> eller <a href=\"/reports\">sjå alle administrasjonane</a>." - -#~ msgid "You can <a href=\"/reports\">show all councils</a>." -#~ msgstr "Du kan <a href=\"/reports/\">sjå alle administrasjonar</a>." diff --git a/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po new file mode 100644 index 000000000..e7ea118aa --- /dev/null +++ b/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -0,0 +1,4382 @@ +# FixMyStreet original .po file, autogenerated by gettext-extract. +# Copyright (C) 2011 UK Citizens Online Democracy +# This file is distributed under the same license as the main FixMyStreet code. +# Matthew Somerville <matthew@mysociety.org>, 2011-06-03. +# +# Translators: +# fixmindelo <francisco.martins@recortes.cv>, 2013 +msgid "" +msgstr "" +"Project-Id-Version: fixmystreet\n" +"Report-Msgid-Bugs-To: matthew@mysociety.org\n" +"POT-Creation-Date: 2013-09-05 17:39+0100\n" +"PO-Revision-Date: 2013-09-03 10:26+0000\n" +"Last-Translator: mysociety <transifex@mysociety.org>\n" +"Language-Team: Portuguese (http://www.transifex.com/projects/p/fixmystreet/language/pt/)\n" +"Language: pt_CV\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 +msgid " and " +msgstr "e" + +#: templates/web/default/tokens/confirm_problem.html:14 +#: templates/web/default/tokens/confirm_problem.html:17 +msgid " and <strong>we will now send it to the council</strong>" +msgstr " e <strong>agora vamos enviá-lo ao Conselho</strong>" + +#: templates/web/default/report/new/councils_text_all.html:11 +#: templates/web/default/report/new/councils_text_all.html:18 +#: templates/web/default/report/new/councils_text_all.html:4 +#: templates/web/default/report/new/councils_text_none.html:11 +#: templates/web/default/report/new/councils_text_none.html:14 +#: templates/web/default/report/new/councils_text_some.html:20 +#: templates/web/default/report/new/councils_text_some.html:23 +#: templates/web/default/report/new/councils_text_some.html:5 +#: templates/web/emptyhomes/report/new/councils_text_all.html:2 +msgid " or " +msgstr "ou" + +#: templates/web/default/admin/bodies.html:36 +msgid "%d addresses" +msgstr "%d endereços" + +#: templates/web/default/admin/index.html:17 +msgid "%d confirmed alerts, %d unconfirmed" +msgstr "%d alertas confirmados,%d não confirmados" + +#: templates/web/default/admin/index.html:19 +#: templates/web/zurich/admin/index.html:6 +msgid "%d council contacts – %d confirmed, %d unconfirmed" +msgstr "%d contatos do Conselho; %d confirmada,%d não confirmados" + +#: templates/web/default/admin/edit-league.html:5 +msgid "%d edits by %s" +msgstr "%d edições por%s" + +#: templates/web/default/admin/index.html:16 +msgid "%d live updates" +msgstr "%d atualizações directas" + +#: templates/web/default/admin/index.html:18 +msgid "%d questionnaires sent – %d answered (%s%%)" +msgstr "%d questionários enviados - %d respondeu (%s%%)" + +#: templates/web/default/pagination.html:10 +msgid "%d to %d of %d" +msgstr "%d de %d de %d" + +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:22 +msgid "%s - Summary reports" +msgstr "%s - relatrios resumidos" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 +msgid "%s ref: %s" +msgstr "%s ref: %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +msgid "%s ward, %s" +msgstr "%s ala, %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +msgid "%s, reported at %s" +msgstr "%s, reportou em %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 +msgid "%s, within %s ward" +msgstr "%s, %s dentro da ala" + +#: templates/web/default/email_sent.html:29 +msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" +msgstr "" +"(Não se preocupe - nós vamos ficar com o alerta, enquanto você está verificando o seu\"\n" +"\"E-mail.)" + +#: templates/web/default/email_sent.html:25 +msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" +msgstr "(Não se preocupe - nós vamos fixa o seu relatório de problema, enquanto você está verificando seu email)" + +#: templates/web/default/email_sent.html:27 +msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" +msgstr "" +"(Não se preocupe - nós vamos ficar com a sua atualização enquanto você está verificando o seu\"\n" +"\"E-mail.) " + +#: templates/web/default/admin/report_blocks.html:11 +#: templates/web/default/admin/users.html:26 +msgid "(Email in abuse table)" +msgstr "(E-mail na tabela de abuso)" + +#: templates/web/default/alert/_list.html:20 +#: templates/web/fixmystreet/alert/_list.html:24 +msgid "(a default distance which covers roughly 200,000 people)" +msgstr "(A distância padrão, que abrange cerca de 50 mil pessoas)" + +#: templates/web/default/alert/_list.html:25 +#: templates/web/fixmystreet/alert/_list.html:28 +msgid "(alternatively the RSS feed can be customised, within" +msgstr "(Alternativamente o feed RSS pode ser personalizado, dentro de" + +#: templates/web/default/around/around_map_list_items.html:12 +#: templates/web/default/around/on_map_list_items.html:9 +#: templates/web/fixmystreet/report/_item.html:22 +#: templates/web/zurich/report/_item.html:21 +msgid "(closed)" +msgstr "(fechado)" + +#: templates/web/default/around/around_map_list_items.html:10 +#: templates/web/default/around/on_map_list_items.html:7 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 +msgid "(fixed)" +msgstr "(Fixo)" + +#: templates/web/default/index.html:12 templates/web/default/index.html:8 +#: templates/web/fixmystreet/around/intro.html:2 +msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" +msgstr "(Como ruas esburacadas, grafits, arvores derrubada, lajes partidas, entulhos, lixo, pardeiros, vandalismo, postes quebrados,ou iluminação pública)" + +#: templates/web/default/reports/_list-entry.html:4 +#: templates/web/fixmystreet/report/_item.html:16 +msgid "(not sent to council)" +msgstr "(Não reportar ao conselho)" + +#: templates/web/default/report/new/fill_in_details_form.html:217 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:140 +#: templates/web/zurich/report/new/fill_in_details_form.html:100 +msgid "(optional)" +msgstr "(opcional)" + +#: templates/web/default/reports/_list-entry.html:2 +#: templates/web/fixmystreet/report/_item.html:15 +msgid "(sent to both)" +msgstr "(remeter para ambos)" + +#: templates/web/default/report/new/fill_in_details_form.html:211 +msgid "(we never show your email address or phone number)" +msgstr "(é confidencial seu email e seu numero de telefone)" + +#: templates/web/default/report/update-form.html:158 +msgid "(we never show your email)" +msgstr "(seu email não será divulgado)" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 +msgid "-- Pick a category --" +msgstr "-- Escolha uma categoria --" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/DB/Result/Problem.pm:424 +msgid "-- Pick a property type --" +msgstr "-- Escolha um tipo de categoria --" + +#: templates/web/emptyhomes/front/stats.html:5 +msgid "<big>%s</big> reports" +msgstr "<big>%s</big> Relatórios" + +#: templates/web/default/questionnaire/completed.html:20 +msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" +msgstr "" +"<p style=\\\"font-size:150%\\\"> Muito obrigado pelo preenchimento de nosso \"\n" +"\"Questionário;. Gratos por saber que foi corrigido </p>\"" + +#: templates/web/fiksgatami/questionnaire/completed-open.html:1 +msgid "" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try <a href=\"http://www.norge.no/styresmakter/\">writing\n" +"direct to your councillor(s)</a> or, if it’s a problem that could be\n" +"fixed by local people working together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +"</p>" +msgstr "" +"<p Style=\\\"font-size:150%\\\"> Lamentamos ouvir isso. Temos dois \\ n\"\n" +"\"Sugestão: por que não tentar <a href=\\\"http://www.norge.no/styresmakter/\\\"> escrita \\ n\"\n" +"\"Direto para o seu conselheiro (s) </a> ou, se É um problema que pode ser \\ n\"\n" +"\"Fixado por pessoas locais que trabalham juntos, por que não \\ n\"\n" +"\"<a Href=\\\"http://www.pledgebank.com/new\\\"> fazer e divulgar um compromisso </a> \\ N\"\n" +"\"</P>\"" + +#: templates/web/fixmystreet/questionnaire/completed-open.html:6 +msgid "" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n" +"to your councillor(s)</a> or, if it’s a problem that could be fixed by\n" +"local people working together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +"</p>" +msgstr "" +"<p style=\"font-size:150%\"> Lamentamos ouvir isso. Temos duas ⏎\n" +"sugestões: por que não tentar <a href=\"http://www.writetothem.com/\"> escrita direta ⏎\n" +"para o seu conselheiro (s) </a>, ou, se o problema pode ser solucionado e corrigido pela ⏎\n" +"população local, a trabalhar em conjunto, porque não ⏎\n" +"<a href=\"http://www.pledgebank.com/new\"> fazer e divulgar um compromisso </a> ⏎\n" +"</P>" + +#: templates/web/default/questionnaire/completed-open.html:6 +msgid "" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try writing to your local representative or, if it’s\n" +"a problem that could be fixed by local people working together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +"</p>" +msgstr "" +"<p style=\"font-size:150%\"> Lamentamos ouvir isso. Temos duas ⏎\n" +"sugestão: por que não tentar escrever para seu representante local ou, se for ⏎\n" +"um problema que pode ser corrigido por pessoas locais que trabalham juntos, por que não ⏎\n" +"<a href=\"http://www.pledgebank.com/new\"> fazer e divulgar um compromisso </a> ⏎\n" +"</P>" + +#: templates/web/default/questionnaire/index.html:35 +msgid "" +"<p>Getting empty homes back into use can be difficult, but by now a good council\n" +"will have made a lot of progress and reported what they have done on the\n" +"website. Even so properties can remain empty for many months if the owner is\n" +"unwilling or the property is in very poor repair. If nothing has happened or\n" +"you are not satisfied with the progress the council is making, now is the right\n" +"time to say so. We think it’s a good idea to contact some other people who\n" +"may be able to help or put pressure on the council For advice on how to do\n" +"this and other useful information please go to <a\n" +"href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" +msgstr "" +"<p> Obtendo casas vazias novamente em uso pode ser difícil, mas agora por um bom conselho ⏎\n" +"terá feito um grande progresso e relatou o que eles fizeram no ⏎\n" +"website. Mesmo assim propriedades podem permanecer vazia por muitos meses, se o proprietário é ⏎\n" +"querem ou o imóvel está em muito mau estado de conservação. Se nada tivesse acontecido ou ⏎\n" +"você não está satisfeito com o progresso que o conselho está fazendo, agora é seu o direito ⏎\n" +"de relatar isso. Achamos que é uma boa ideia em contato com outras pessoas que ⏎\n" +"podem ser capazes de ajudar ou colocar pressão sobre o Conselho para conselhos sobre como fazer ⏎\n" +"esta e outras informações úteis acesse <a ⏎\n" + +#: templates/web/default/questionnaire/index.html:26 +msgid "" +"<p>Getting empty homes back into use can be difficult. You shouldn’t expect\n" +"the property to be back into use yet. But a good council will have started work\n" +"and should have reported what they have done on the website. If you are not\n" +"satisfied with progress or information from the council, now is the right time\n" +"to say. You may also want to try contacting some other people who may be able\n" +"to help. For advice on how to do this and other useful information please\n" +"go to <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" +msgstr "" +"<p> Obtendo casas vazias novamente em uso pode ser difícil. Você não deve esperar\n" +"\n" +"a propriedade de estar de volta em uso ainda. Mas um bom conselho terá começado o trabalho\n" +"\n" +"e deveria ter relatado o que eles fizeram no site. Se você não estiver\n" +"\n" +"satisfeito com o progresso ou informações do conselho, agora é o momento certo\n" +"\n" +"a dizer. Você também pode tentar entrar em contato com outras pessoas que podem ser capazes\n" +"\n" +"para ajudar. Para obter conselhos sobre como fazer isso e outras informações úteis, por favor\n" +"\n" +"ir para <a\n" +"href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" +"\n" + +#: templates/web/default/questionnaire/completed.html:9 +msgid "" +"<p>Thank you very much for filling in our questionnaire; if you\n" +"get some more information about the status of your problem, please come back to the\n" +"site and leave an update.</p>" +msgstr "" +"<p> Muito obrigado para preencher o nosso questionário, se você ⏎\n" +"obter mais algumas informações sobre o status do seu problema, por favor, volte para o ⏎\n" +"local e deixar uma atualização. </p>" + +#: templates/web/default/around/_report_banner.html:3 +#: templates/web/default/around/_report_banner.html:5 +msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" +msgstr "<small> Se você não pode localizar no mapa, <a href='%s' rel='nofollow'> saltar esta etapa </a>. </small>" + +#: templates/web/default/admin/index.html:14 +#: templates/web/zurich/admin/index.html:4 +msgid "<strong>%d</strong> live problems" +msgstr "<strong>%d</strong> problemas ao vivo" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:183 +msgid "<strong>No</strong> Let me confirm my report by email" +msgstr "<strong> Não </strong> Deixe-me confirmar o meu relatório por e-mail" + +#: templates/web/fixmystreet/report/update-form.html:110 +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/fixmystreet/auth/general.html:50 +#: templates/web/zurich/auth/general.html:49 +msgid "<strong>No</strong> let me sign in by email" +msgstr "<strong> Não </strong>, deixe-me entrar por e-mail" + +#: templates/web/default/auth/general.html:55 +msgid "<strong>No</strong>, I do not, let me sign in by email:" +msgstr "<strong> Não </strong>, eu não, deixe-me entrar por e-mail:" + +#: templates/web/default/report/new/fill_in_details_form.html:162 +msgid "<strong>No</strong>, let me confirm my report by email:" +msgstr "<strong>No</strong>, let me confirm my report by email:" + +#: templates/web/default/report/update-form.html:117 +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/default/auth/general.html:37 +#: templates/web/default/report/new/fill_in_details_form.html:140 +#: templates/web/default/report/update-form.html:95 +#: templates/web/fixmystreet/auth/general.html:36 +#: templates/web/fixmystreet/auth/general.html:38 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 +#: templates/web/fixmystreet/report/update-form.html:87 +msgid "<strong>Yes</strong> I have a password" +msgstr "<strong> Sim </strong> Eu tenho password" + +#: templates/web/default/static/about-en-gb.html:1 +#: templates/web/default/static/about-en-gb.html:3 +#: templates/web/emptyhomes/header.html:34 +#: templates/web/emptyhomes/static/about-cy.html:1 +#: templates/web/emptyhomes/static/about-cy.html:3 +#: templates/web/emptyhomes/static/about-en-gb.html:1 +#: templates/web/emptyhomes/static/about-en-gb.html:3 +msgid "About us" +msgstr "Acerca de nós" + +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 +msgid "Action Scheduled" +msgstr "Ação Programada" + +#: templates/web/default/admin/bodies.html:53 +#: templates/web/default/admin/bodies.html:57 +#: templates/web/default/admin/body-form.html:82 +#: templates/web/zurich/admin/body-form.html:47 +msgid "Add body" +msgstr "Adicionar" + +#: templates/web/default/admin/body.html:69 +#: templates/web/zurich/admin/body.html:30 +msgid "Add new category" +msgstr "Adicionar nova categoria" + +#: templates/web/default/admin/users.html:36 +msgid "Add user" +msgstr "Adicionar user" + +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 +msgid "Added %s" +msgstr "Adicionado %s" + +#: templates/web/default/auth/change_password.html:29 +msgid "Again:" +msgstr "Novamente" + +#: templates/web/default/admin/timeline.html:35 +msgid "Alert %d created for %s, type %s, parameters %s / %s" +msgstr "Alerta %d criado por %s, tipo %s, os parâmetros %s / %s" + +#: templates/web/default/admin/timeline.html:37 +msgid "Alert %d disabled (created %s)" +msgstr "Alerta %d desativada (criado %s)" + +#: templates/web/bromley/report/display.html:209 +#: templates/web/default/report/update-form.html:163 +#: templates/web/fixmystreet/report/update-form.html:148 +msgid "Alert me to future updates" +msgstr "Avise-me de atualizações futuras" + +#: templates/web/default/reports/index.html:3 +#: templates/web/fixmybarangay/reports/index.html:3 +#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/reports/index.html:15 +msgid "All Reports" +msgstr "Todos os Relatórios" + +#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 +#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 +#: templates/web/emptyhomes/header.html:32 +#: templates/web/fiksgatami/footer.html:7 +#: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/fixmybarangay/footer.html:20 +#: templates/web/fixmystreet/footer.html:48 +#: templates/web/oxfordshire/footer.html:23 +#: templates/web/oxfordshire/header.html:67 +#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 +#: templates/web/zurich/admin/index-dm.html:12 +#: templates/web/zurich/admin/stats.html:13 +#: templates/web/zurich/footer.html:19 +#: templates/web/zurich/nav_over_content.html:6 +msgid "All reports" +msgstr "Todos os relatórios" + +#: templates/web/default/admin/stats.html:5 +#: templates/web/zurich/admin/stats.html:8 +msgid "All reports between %s and %s" +msgstr "Todos os relatórios entre %s e %s" + +#: templates/web/default/report/new/councils_text_some.html:2 +msgid "All the information you provide here will be sent to" +msgstr "Todas as informações que você fornecer aqui serão enviados para fixmindelo@gmail.com" + +#: templates/web/default/report/new/councils_text_all.html:11 +#: templates/web/default/report/new/councils_text_all.html:13 +msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>." +msgstr "Todas as informações que você fornecer aqui serão enviados para <strong>%s</strong> ou <strong> Entradas de Serviço </strong>." + +#: templates/web/default/report/new/councils_text_all.html:4 +#: templates/web/default/report/new/councils_text_all.html:6 +msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system." +msgstr "Todas as informações que você fornecer aqui serão enviados para <strong>%s</strong> ou um corpo local relevantes, tais como <strong> TfL </strong>, através do Relatório-It sistema Mindelo." + +#: templates/web/bromley/report/new/fill_in_details_form.html:4 +#: templates/web/bromley/report/new/fill_in_details_form.html:6 +#: templates/web/default/report/new/councils_text_all.html:18 +#: templates/web/default/report/new/councils_text_all.html:20 +#: templates/web/default/report/new/fill_in_details_form.html:11 +#: templates/web/default/report/new/fill_in_details_form.html:13 +#: templates/web/emptyhomes/report/new/councils_text_all.html:2 +#: templates/web/emptyhomes/report/new/councils_text_all.html:4 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 +msgid "All the information you provide here will be sent to <strong>%s</strong>." +msgstr "Todas as informações que você fornecer aqui serão enviados para <strong>%s</strong>" + +#: templates/web/default/questionnaire/index.html:60 +#: templates/web/fixmystreet/questionnaire/index.html:54 +msgid "An update marked this problem as fixed." +msgstr "Uma atualização marcada, problema esta resolvido" + +#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/problem_row.html:20 +msgid "Anonymous" +msgstr "Anonimo" + +#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/update_edit.html:23 +msgid "Anonymous:" +msgstr "Anonimo:" + +#: templates/web/default/footer.html:26 +msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" +msgstr "Você é um desenvolvedor <strong> </strong> Gostaria de contribuir para FixMyStreet?" + +#: templates/web/fixmystreet/footer.html:16 +#: templates/web/stevenage/footer.html:17 +msgid "Are you a developer?" +msgstr "Você é um desenvolvedor?" + +#: templates/web/fixmystreet/footer.html:20 +#: templates/web/stevenage/footer.html:21 +msgid "Are you from a council?" +msgstr "Você pertence á ao Conselho?" + +#: templates/web/default/admin/body-form.html:19 +#: templates/web/zurich/admin/body-form.html:25 +msgid "Area covered" +msgstr "Área coberta" + +#: templates/web/zurich/admin/report_edit.html:124 +#: templates/web/zurich/admin/stats.html:36 +msgid "Assign to different category:" +msgstr "Atribuir a categoria diferente:" + +#: templates/web/zurich/admin/report_edit.html:133 +msgid "Assign to external body:" +msgstr "Atribuir ao órgão externo:" + +#: templates/web/zurich/admin/report_edit.html:113 +#: templates/web/zurich/admin/report_edit.html:170 +msgid "Assign to subdivision:" +msgstr "Atribuir a subdivisão:" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 +#: templates/web/zurich/report/updates.html:11 +msgid "Assigned to %s" +msgstr "Designado para %s" + +#: templates/web/default/open311/index.html:86 +msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." +msgstr "No máximo %d pedidos são retornados em cada consulta. Os pedidos retornados são ordenados por requested_datetime, de modo a obter todos os pedidos, fazer várias pesquisas com start_date rolando e end_date." + +#: templates/web/default/open311/index.html:78 +msgid "At the moment only searching for and looking at reports work." +msgstr "Neste momento, apenas procurando e olhando para os relatórios de trabalho." + +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: templates/web/zurich/report/_item.html:11 +msgid "Awaiting moderation" +msgstr "Aguardando moderação" + +#: templates/web/default/js/translation_strings.html:26 +msgid "Back" +msgstr "Voltar" + +#: templates/web/default/admin/report_blocks.html:11 +msgid "Ban email address" +msgstr "Ban endereço de e-mail" + +#: templates/web/fixmybarangay/report/new/notes.html:7 +msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." +msgstr "Tenha certeza de escolher a categoria correta, porque temos de nusar isso para determinar a quem o relatório é enviado." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:208 +#: templates/web/default/admin/bodies.html:1 +#: templates/web/zurich/header.html:64 +msgid "Bodies" +msgstr "Corpos" + +#: templates/web/default/admin/flagged.html:12 +#: templates/web/default/admin/reports.html:14 +#: templates/web/default/admin/users.html:14 +msgid "Body" +msgstr "Corpo" + +#: templates/web/default/admin/user-form.html:7 +msgid "Body:" +msgstr "Corpo:" + +#: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/nn/footer.html:16 +msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>" +msgstr "Construído por <a href=\"http://www.mysociety.org/\"> mySociety </a> e mantido por <a href=\"http://www.nuug.no/\"> NUUG </a>" + +#: templates/web/default/admin/stats.html:80 +msgid "By Date" +msgstr "Por data" + +#: templates/web/fixmystreet/around/_report_banner.html:10 +#: templates/web/fixmystreet/around/_report_banner.html:8 +msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" +msgstr "Não pode ver a localizaçao no mapa <a href='%s' rel='nofollow'> Salte esta etapa </a>" + +#: templates/web/bromley/report/new/fill_in_details_form.html:68 +#: templates/web/default/admin/bodies.html:11 +#: templates/web/default/admin/body.html:35 +#: templates/web/default/admin/index.html:36 +#: templates/web/default/report/new/category.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 +#: templates/web/seesomething/report/new/category.html:6 +#: templates/web/southampton/report/new/category.html:3 +#: templates/web/zurich/admin/body.html:13 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/report/new/fill_in_details_form.html:50 +msgid "Category" +msgstr "Categoria" + +#: templates/web/default/admin/index.html:34 +msgid "Category fix rate for problems > 4 weeks old" +msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes" + +#: templates/web/default/admin/body.html:75 +#: templates/web/default/admin/body_edit.html:23 +#: templates/web/default/admin/report_edit.html:61 +#: templates/web/default/report/new/fill_in_details_form.html:67 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 +#: templates/web/zurich/admin/body.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:123 +msgid "Category:" +msgstr "Categoria:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 +msgid "Category: %s" +msgstr "Categoria: %s" + +#: templates/web/default/auth/change_password.html:1 +#: templates/web/default/auth/change_password.html:3 +#: templates/web/default/auth/change_password.html:33 +msgid "Change Password" +msgstr "Mudar password" + +#: templates/web/default/js/translation_strings.html:41 +#: templates/web/fixmystreet/around/_report_banner.html:2 +msgid "Click map to report a problem" +msgstr "Click no mapa para reportar um porblema " + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/dashboard/index.html:142 +#: templates/web/default/dashboard/index.html:144 +#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:10 +#: templates/web/zurich/admin/header.html:12 +#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit.html:98 +#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/report/banner.html:13 +msgid "Closed" +msgstr "Fechado" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 +msgid "Closed by council" +msgstr "Fechado pelo Conselho" + +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36 +msgid "Closed reports" +msgstr "Reports Fechados" + +#: templates/web/default/admin/problem_row.html:38 +msgid "Closed:" +msgstr "Fechado" + +#: templates/web/default/around/tabbed_lists.html:10 +#: templates/web/default/around/tabbed_lists.html:12 +msgid "Closest nearby problems <small>(within %skm)</small>" +msgstr "Problemas mais proximos <small> (within %skm) </small>" + +#: templates/web/default/admin/report_edit.html:23 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:47 +msgid "Co-ordinates:" +msgstr "Co-ordenadas:" + +#: templates/web/default/admin/list_updates.html:14 +msgid "Cobrand" +msgstr "Cobrand" + +#: templates/web/default/admin/report_edit.html:75 +#: templates/web/default/admin/update_edit.html:50 +msgid "Cobrand data:" +msgstr "Cobrand data:" + +#: templates/web/default/admin/report_edit.html:74 +#: templates/web/default/admin/update_edit.html:49 +msgid "Cobrand:" +msgstr "Cobrand:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 +msgid "Configuration updated - contacts will be generated automatically later" +msgstr "Configuração atualizada - contactos gerados automaticamente" + +#: templates/web/default/admin/body_edit.html:47 +msgid "Configure Endpoint" +msgstr "Configurar Endpoint" + +#: templates/web/default/admin/body.html:44 +msgid "Confirm" +msgstr "Confirmar" + +#: templates/web/default/auth/token.html:1 +msgid "Confirm account" +msgstr "Confirmar conta" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:177 +#: templates/web/fixmystreet/report/update-form.html:105 +msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +msgstr "Confirme por e-mail abaixo, proporcionando uma nova senha nesse ponto. Quando você confirmar, sua senha será atualizada." + +#: templates/web/default/questionnaire/creator_fixed.html:1 +#: templates/web/default/tokens/confirm_problem.html:1 +#: templates/web/default/tokens/confirm_problem.html:3 +#: templates/web/default/tokens/confirm_update.html:1 +#: templates/web/default/tokens/confirm_update.html:3 +#: templates/web/emptyhomes/tokens/confirm_problem.html:1 +#: templates/web/emptyhomes/tokens/confirm_problem.html:3 +#: templates/web/southampton/tokens/confirm_problem.html:1 +#: templates/web/southampton/tokens/confirm_problem.html:3 +#: templates/web/zurich/tokens/confirm_problem.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:3 +msgid "Confirmation" +msgstr "Confirmação" + +#: templates/web/default/admin/body.html:37 +#: templates/web/default/admin/body.html:85 +#: templates/web/default/admin/body_edit.html:32 +#: templates/web/default/admin/body_edit.html:84 +#: templates/web/zurich/admin/stats.html:40 +msgid "Confirmed" +msgstr "Confirmado" + +#: templates/web/default/admin/stats.html:5 +msgid "Confirmed reports between %s and %s" +msgstr "Relatos confirmados entre %s e %s" + +#: templates/web/default/admin/problem_row.html:36 +#: templates/web/default/admin/report_edit.html:70 +msgid "Confirmed:" +msgstr "Confirmado:" + +#: templates/web/fiksgatami/footer.html:10 +#: templates/web/fiksgatami/nn/footer.html:10 +msgid "Contact" +msgstr "Contacto" + +#: templates/web/default/footer.html:24 +msgid "Contact FixMyStreet" +msgstr "Contact FixMyStreetMindelo" + +#: templates/web/bromley/contact/submit.html:1 +#: templates/web/default/contact/index.html:1 +#: templates/web/default/contact/index.html:2 +#: templates/web/default/contact/submit.html:1 +#: templates/web/fixmystreet/contact/index.html:1 +#: templates/web/fixmystreet/contact/index.html:2 +msgid "Contact Us" +msgstr "Fale connosco" + +#: templates/web/bromley/contact/submit.html:3 +#: templates/web/default/contact/index.html:6 +#: templates/web/default/contact/submit.html:3 +#: templates/web/fixmystreet/contact/index.html:19 +msgid "Contact the team" +msgstr "Fale com a equipe" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 +msgid "Could not find user" +msgstr "Não foi possível encontrar usuário" + +#: templates/web/default/js/translation_strings.html:31 +msgid "Could not look up location" +msgstr "Não olhar para cima da localização" + +#: templates/web/default/admin/list_updates.html:13 +msgid "Council" +msgstr "Conselho" + +#: templates/web/default/admin/body.html:1 +#: templates/web/default/admin/body_edit.html:1 +#: templates/web/zurich/admin/body.html:1 +msgid "Council contacts for %s" +msgstr "Contatos do Conselho para %s" + +#: templates/web/default/admin/stats.html:84 +msgid "Council:" +msgstr "Conselho:" + +#: templates/web/default/admin/stats.html:12 +#: templates/web/default/admin/stats.html:32 +#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats.html:50 +msgid "Count" +msgstr "Conta" + +#: templates/web/default/email_sent.html:1 +msgid "Create a report" +msgstr "Criar um report" + +#: templates/web/default/admin/body.html:103 +#: templates/web/zurich/admin/body.html:53 +msgid "Create category" +msgstr "Criar uma categoria" + +#: templates/web/default/admin/list_updates.html:10 +#: templates/web/default/admin/problem_row.html:34 +#: templates/web/zurich/admin/list_updates.html:7 +msgid "Created" +msgstr "Criado" + +#: templates/web/default/admin/report_edit.html:69 +#: templates/web/default/admin/update_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:62 +#: templates/web/zurich/admin/update_edit.html:29 +msgid "Created:" +msgstr "Criado:" + +#: templates/web/default/admin/stats.html:31 +msgid "Current state" +msgstr "Estado actual" + +#: templates/web/default/dashboard/index.html:5 +#: templates/web/default/dashboard/index.html:7 +msgid "Dashboard" +msgstr "Painel de instrumentos" + +#: templates/web/zurich/admin/stats.html:35 +msgid "Dealt with by subdivision within 5 working days" +msgstr "Tratadas pelas subdivisões dentro de 5 dias úteis" + +#: templates/web/default/admin/body.html:38 +#: templates/web/default/admin/body.html:88 +#: templates/web/default/admin/body_edit.html:37 +#: templates/web/default/admin/body_edit.html:85 +msgid "Deleted" +msgstr "Excluidos" + +#: 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 "Descripçaoi" + +#: templates/web/bromley/report/new/fill_in_details_form.html:54 +#: templates/web/default/js/translation_strings.html:28 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +#: templates/web/seesomething/report/new/fill_in_details_form.html:16 +#: templates/web/zurich/report/new/fill_in_details_form.html:42 +msgid "Details" +msgstr "DEtalhes" + +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/new/fill_in_details_form.html:61 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:36 +msgid "Details:" +msgstr "Detalhes:" + +#: templates/web/default/admin/body.html:39 +msgid "Devolved" +msgstr "Delegada" + +#: templates/web/default/admin/edit-league.html:1 +msgid "Diligency prize league table" +msgstr "Diligency prêmio tabela classificativa" + +#: templates/web/fixmystreet/auth/general.html:30 +msgid "Do you have a FixMyBarangay password?" +msgstr "Você tem uma senha FixMyStreetMindelo?" + +#: templates/web/default/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:32 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:155 +#: templates/web/fixmystreet/report/update-form.html:84 +msgid "Do you have a FixMyStreet password?" +msgstr "Você tem uma senha FixMyStreetMindelo?" + +#: templates/web/default/questionnaire/index.html:70 +#: templates/web/fixmystreet/questionnaire/index.html:64 +msgid "Don’t know" +msgstr "Não sei" + +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 +msgid "Duplicate" +msgstr "Duplicar" + +#: templates/web/default/admin/list_updates.html:42 +#: templates/web/default/admin/problem_row.html:41 +#: templates/web/default/admin/users.html:28 +#: templates/web/zurich/admin/problem_row.html:44 +msgid "Edit" +msgstr "Editar" + +#: templates/web/default/admin/body.html:112 +#: templates/web/zurich/admin/body.html:64 +msgid "Edit body details" +msgstr "Editar os detalhes do corpo" + +#: templates/web/default/admin/report_edit.html:1 +#: templates/web/zurich/admin/report_edit-sdm.html:1 +#: templates/web/zurich/admin/report_edit-sdm.html:4 +#: templates/web/zurich/admin/report_edit.html:1 +#: templates/web/zurich/admin/report_edit.html:5 +msgid "Editing problem %d" +msgstr "Editando problema %d" + +#: templates/web/default/admin/update_edit.html:1 +#: templates/web/zurich/admin/update_edit.html:1 +msgid "Editing update %d" +msgstr "Editando uma actualizaçao %d" + +#: templates/web/default/admin/user_edit.html:1 +msgid "Editing user %d" +msgstr "Edição de usuário %d" + +#: templates/web/default/admin/body_edit.html:86 +msgid "Editor" +msgstr "Editar" + +#: templates/web/bromley/report/display.html:128 +#: templates/web/default/admin/bodies.html:9 +#: templates/web/default/admin/body.html:36 +#: templates/web/default/admin/body_edit.html:83 +#: templates/web/default/admin/flagged.html:29 +#: templates/web/default/admin/list_updates.html:9 +#: templates/web/default/admin/users.html:13 +#: templates/web/fixmystreet/auth/general.html:20 +#: templates/web/fixmystreet/report/update-form.html:76 +#: templates/web/seesomething/auth/general.html:20 +#: templates/web/zurich/admin/body-form.html:9 +#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/auth/general.html:24 +#: templates/web/zurich/auth/general.html:52 +msgid "Email" +msgstr "Email" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 +msgid "Email added to abuse list" +msgstr "Email adicionado a lista de abusos" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 +msgid "Email already in abuse list" +msgstr "E-mail já está na lista abusos" + +#: templates/web/default/around/_updates.html:5 +msgid "Email me new local problems" +msgstr "Enviar novos problemas locais" + +#: templates/web/default/report/display.html:34 +msgid "Email me updates" +msgstr "Envie-me atualizações" + +#: templates/web/default/admin/body.html:80 +#: templates/web/default/admin/body_edit.html:26 +#: templates/web/default/admin/report_edit.html:67 +#: templates/web/default/admin/update_edit.html:33 +#: templates/web/default/admin/user-form.html:6 +#: templates/web/default/alert/updates.html:13 +#: templates/web/default/report/display.html:38 +#: templates/web/zurich/admin/body.html:41 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:58 +msgid "Email:" +msgstr "Email:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +msgid "Email: %s" +msgstr "Email: %s" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +msgid "Empty flat or maisonette" +msgstr "Apartamento vazio ou duplex" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +msgid "Empty house or bungalow" +msgstr "Casa vazia ou bungalow" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +msgid "Empty office or other commercial" +msgstr "Escritório vazio ou outro comercial" + +#: templates/web/emptyhomes/report/new/form_heading.html:1 +msgid "Empty property details form" +msgstr "Propriedade sem detalhes " + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +msgid "Empty pub or bar" +msgstr "Pub ou bar vazio" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +msgid "Empty public building - school, hospital, etc." +msgstr "Edifício público vazio - escola, hospital, etc" + +#: templates/web/default/admin/stats.html:70 +msgid "End Year:" +msgstr "Fim do ano:" + +#: templates/web/default/admin/stats.html:72 +msgid "End day:" +msgstr "Fim do dia:" + +#: templates/web/default/admin/stats.html:71 +msgid "End month:" +msgstr "Fim do mês:" + +#: templates/web/default/admin/body-form.html:40 +msgid "Endpoint" +msgstr "Endpoint" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 +msgid "Enter a Zürich street name" +msgstr "Digite um nome de uma rua de Mindelo" + +#: perllib/FixMyStreet/Cobrand/UK.pm:18 +msgid "Enter a nearby UK postcode, or street name and area" +msgstr "Inserir um código postal de Mindelo nas proximidades da area, zona, rua ou local" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25 +msgid "Enter a nearby postcode, or street name and area" +msgstr "Inserir um código postal perto, ou nome da rua, zona ou local" + +#: templates/web/default/around/postcode_form.html:1 +#: templates/web/default/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 +#: templates/web/fixmystreet/around/postcode_form.html:11 +#: templates/web/seesomething/around/postcode_form.html:3 +#: templates/web/seesomething/around/postcode_form.html:4 +msgid "Enter a nearby street name and area" +msgstr "Digite um nome de rua nas proximidades e área" + +#: templates/web/default/auth/general.html:64 +#: templates/web/default/report/new/fill_in_details_form.html:169 +#: templates/web/default/report/update-form.html:124 +msgid "Enter a new password:" +msgstr "Digite uma nova senha:" + +#: templates/web/bromley/report/display.html:150 +#: templates/web/bromley/report/new/fill_in_details_form.html:189 +#: templates/web/fixmystreet/auth/general.html:61 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 +#: templates/web/fixmystreet/report/update-form.html:122 +#: templates/web/zurich/auth/general.html:63 +msgid "Enter a password" +msgstr "Digite uma nova password" + +#: templates/web/default/index-steps.html:26 +msgid "Enter details of the problem" +msgstr "Digite os detalhes do problema" + +#: templates/web/default/auth/token.html:5 +#: templates/web/default/errors/generic.html:1 +#: templates/web/default/errors/generic.html:3 +#: templates/web/default/tokens/abuse.html:1 +#: templates/web/default/tokens/abuse.html:3 +#: templates/web/default/tokens/error.html:1 +#: templates/web/default/tokens/error.html:3 +msgid "Error" +msgstr "Erro" + +#: templates/web/default/admin/body.html:11 +#: templates/web/default/admin/body_edit.html:18 +msgid "Example postcode %s" +msgstr "Exemplo PostCode %s" + +#: templates/web/default/open311/index.html:96 +msgid "Examples:" +msgstr "Exemplos:" + +#: templates/web/default/admin/report_edit.html:76 +msgid "Extra data:" +msgstr "Dados adicionais:" + +#: templates/web/bromley/contact/submit.html:14 +#: templates/web/default/contact/submit.html:15 +msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." +msgstr "Falha ao enviar a mensagem. Por favor, tente novamente, ou <a href=\"mailto:%s\"> email nós </a>." + +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 +msgid "Filter report list" +msgstr "Filtrar relatorio" + +#: templates/web/emptyhomes/front/stats.html:6 +msgid "Find latest local and national news" +msgstr "Encontre as últimas notícias locais e nacionais" + +#: templates/web/bromley/report/display.html:191 +#: templates/web/bromley/report/new/fill_in_details_form.html:113 +#: templates/web/bromley/report/new/fill_in_details_form.html:160 +msgid "First Name" +msgstr "Primeiro Nome" + +#: templates/web/default/questionnaire/index.html:79 +#: templates/web/fixmystreet/questionnaire/index.html:73 +msgid "First time" +msgstr "Primeiro Nome" + +#: templates/web/fiksgatami/header.html:16 +#: templates/web/fiksgatami/nn/header.html:16 +msgid "Fix<span id=\"my\">My</span>Street" +msgstr "Fix <span id=\"my\"> Minha </span> Rua" + +#: templates/web/default/header.html:24 +msgid "FixMyStreet" +msgstr "FixMyStreetMindelo" + +#: templates/web/default/admin/header.html:10 +msgid "FixMyStreet admin:" +msgstr "FixMyStreet admin:" + +#: templates/web/default/alert/index.html:11 +msgid "" +"FixMyStreet has a variety of RSS feeds and email alerts for local problems, including\n" +"alerts for all problems within a particular ward or council, or all problems\n" +"within a certain distance of a particular location." +msgstr "" +"FixMyStreetMindelo tem uma variedade de feeds RSS e alertas para problemas locais, incluindo ⏎\n" +"alertas para todos os problemas dentro de uma determinada zona especial ou conselho, ou todos os problemas ⏎\n" +"dentro de uma certa distância de um local em particular." + +#: templates/web/default/alert/_list.html:71 +#: templates/web/fixmystreet/alert/_list.html:73 +msgid "" +"FixMyStreet sends different categories of problem\n" +"to the appropriate council, so problems within the boundary of a particular council\n" +"might not match the problems sent to that council. For example, a graffiti report\n" +"will be sent to the district council, so will appear in both of the district\n" +"council’s alerts, but will only appear in the \"Within the boundary\" alert\n" +"for the county council." +msgstr "" +"FixMyStreetMindelo envia diferentes categorias de problema ⏎\n" +"para o conselho apropriado, assim que os problemas dentro do limite de um conselho especial ⏎\n" +"pode não coincidir com os problemas enviados para que o conselho. Por exemplo, um relatório de graffiti ⏎\n" +"será enviado ao conselho distrital, então vai aparecer em ambos do distrito ⏎\n" +"alertas do Conselho, mas só vai aparecer o \"No limite\" alerta ⏎\n" +"para o conselho do condado." + +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:84 +#: templates/web/default/admin/index.html:36 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/dashboard/index.html:142 +#: templates/web/default/dashboard/index.html:144 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:34 +#: templates/web/fixmystreet/report/banner.html:12 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:32 +msgid "Fixed" +msgstr "Corrigido" + +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:43 +msgid "Fixed - Council" +msgstr "Corrigido - Conselho" + +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:42 +msgid "Fixed - User" +msgstr "Corrigido - Usuario" + +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31 +msgid "Fixed reports" +msgstr "Reports Corrigidos" + +#: templates/web/default/admin/problem_row.html:37 +msgid "Fixed:" +msgstr "Corrigido:" + +#: templates/web/default/admin/report_blocks.html:16 +msgid "Flag user" +msgstr "Bandeira - Usuario" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 +#: templates/web/default/admin/users.html:16 +msgid "Flagged" +msgstr "Marcado" + +#: templates/web/default/admin/report_edit.html:78 +#: templates/web/default/admin/user-form.html:14 +msgid "Flagged:" +msgstr "Marcado:" + +#: templates/web/default/reports/_ward-list.html:3 +#: templates/web/fixmystreet/reports/_ward-list.html:4 +msgid "Follow a ward link to view only reports within that ward." +msgstr "Siga um link ala para ver apenas os relatórios dentro do ala." + +#: templates/web/default/admin/report_edit.html:30 +msgid "For council(s):" +msgstr "Por conselho (s):" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/update-form.html:104 +msgid "Forgotten your password?" +msgstr "Esqueceu sua senha?" + +#: templates/web/default/faq/faq-en-gb.html:1 +#: templates/web/emptyhomes/faq/faq-cy.html:1 +#: templates/web/emptyhomes/faq/faq-en-gb.html:1 +#: templates/web/fiksgatami/faq/faq-nb.html:1 +#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmindelo/faq/faq-pt-cv.html:1 +#: templates/web/fixmybarangay/faq/faq-en-gb.html:1 +#: templates/web/fixmystreet/faq/faq-en-gb.html:1 +#: templates/web/fixmystreet/static/privacy.html:1 +#: templates/web/oxfordshire/faq/faq-en-gb.html:1 +msgid "Frequently Asked Questions" +msgstr "Perguntas mais frequentes" + +#: templates/web/default/open311/index.html:138 +msgid "GeoRSS on Google Maps" +msgstr "GeoRSS no Google Maps" + +#: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/around/_updates.html:3 +#: templates/web/fixmystreet/report/display.html:38 +msgid "Get updates" +msgstr "Receba as atualizações" + +#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/fixmystreet/reports/_rss.html: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 +msgid "Get updates of problems in this %s" +msgstr "Receba as atualizações de problemas neste %s" + +#: templates/web/default/alert/_list.html:83 +#: templates/web/fixmybarangay/alert/_list.html:28 +#: templates/web/fixmystreet/alert/_list.html:82 +msgid "Give me an RSS feed" +msgstr "Dê-me um feed RSS" + +#: templates/web/default/alert/index.html:34 +#: templates/web/default/around/postcode_form.html:8 +#: templates/web/fixmystreet/around/postcode_form.html:21 +#: templates/web/seesomething/around/postcode_form.html:10 +#: templates/web/zurich/admin/stats.html:26 +msgid "Go" +msgstr " Ir" + +#: templates/web/default/admin/report_edit.html:77 +msgid "Going to send questionnaire?" +msgstr "Vai enviar questionário?" + +#: templates/web/default/admin/index.html:24 +msgid "Graph of problem creation by status over time" +msgstr "Status da tabela grafica ao longo do tempo" + +#: templates/web/default/reports/index.html:8 +msgid "Greyed-out lines are councils that no longer exist." +msgstr "Cor Cinzenta sao linhas dos conselhos que não existem mais" + +#: templates/web/default/questionnaire/index.html:61 +#: templates/web/fixmystreet/questionnaire/index.html:55 +msgid "Has this problem been fixed?" +msgstr "Este problema já foi fixado, relatado?" + +#: templates/web/default/questionnaire/index.html:74 +#: templates/web/fixmystreet/questionnaire/index.html:68 +msgid "Have you ever reported a problem to a council before, or is this your first time?" +msgstr "Alguma vez voce ja relatou algum problema ao Conselho, ou é a sua primeira vez?" + +#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 +#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15 +#: templates/web/emptyhomes/header.html:33 +#: templates/web/fiksgatami/footer.html:9 +#: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/fixmybarangay/footer.html:24 +#: templates/web/fixmystreet/footer.html:52 +#: templates/web/oxfordshire/footer.html:27 +#: templates/web/oxfordshire/header.html:75 +#: templates/web/reading/footer.html:10 +#: templates/web/seesomething/footer.html:13 +#: templates/web/stevenage/footer.html:47 +#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/footer.html:21 +#: templates/web/zurich/nav_over_content.html:8 +msgid "Help" +msgstr "Ajuda" + +#: templates/web/default/alert/_list.html:6 +#: templates/web/fixmystreet/alert/_list.html:8 +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/barnet/header.html:70 templates/web/bromley/header.html:64 +#: templates/web/bromley/header.html:99 +#: templates/web/fixmybarangay/header.html:66 +#: templates/web/fixmystreet/header.html:50 +#: templates/web/oxfordshire/header.html:111 +#: templates/web/oxfordshire/header.html:47 +#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11 +msgid "Hi %s" +msgstr "Oi %s" + +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:11 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:91 +#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/update_edit.html:18 +msgid "Hidden" +msgstr "Esconder" + +#: templates/web/default/around/display_location.html:67 +msgid "Hide old" +msgstr "Ocultar" + +#: templates/web/default/around/display_location.html:62 +msgid "Hide pins" +msgstr "Ocultar pins" + +#: templates/web/default/admin/body_edit.html:79 +msgid "History" +msgstr "History pins" + +#: templates/web/default/js/translation_strings.html:25 +msgid "Home" +msgstr "Home" + +#: templates/web/default/index-steps.html:1 +msgid "How to report a problem" +msgstr "Como reportar um problema" + +#: templates/web/default/js/translation_strings.html:27 +msgid "How to send successful reports" +msgstr "Como enviar relatorios com sucesso" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +msgid "I am afraid you cannot confirm unconfirmed reports." +msgstr "Tenho receio de nao puder confirmar os seus relatorios" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "Receio que não foi possível localizar o seu problema no banco de dados.\n" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:44 +msgid "I'm afraid we couldn't validate that token, as the report was made too long ago." +msgstr "Receio que não pôde validar esse token, como o relatório foi feito há muito tempo." + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:259 +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" + +#: templates/web/default/admin/flagged.html:9 +#: templates/web/default/admin/list_updates.html:6 +#: templates/web/default/admin/reports.html:11 +#: templates/web/zurich/admin/index-dm.html:21 +#: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/list_updates.html:6 +#: templates/web/zurich/admin/reports.html:11 +msgid "ID" +msgstr "ID" + +#: templates/web/default/email_sent.html:19 +msgid "If you do not, your alert will not be activated." +msgstr "Se não o fizer, o seu alerta não será ativado" + +#: templates/web/default/email_sent.html:15 +msgid "If you do not, your problem will not be posted." +msgstr "Se você não fizer isso, o problema não será publicado" + +#: templates/web/default/email_sent.html:17 +msgid "If you do not, your update will not be posted." +msgstr "se você não fizer isso, a sua atualização não será publicada" + +#: templates/web/default/report/new/councils_text_none.html:8 +#: templates/web/default/report/new/councils_text_none.html:9 +msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." +msgstr "" +"Se você enviar um problema sobre qualquer assunto e detalhes, será\"\n" +"\"Público, mas o problema nao <strong> vai </strong> ser comunicados ao\"\n" +"\"Conselho\"." + +#: templates/web/emptyhomes/report/new/councils_text_none.html:9 +msgid "If you submit a report here it will be left on the site, but not reported to the council – please still leave your report, so that we can show to the council the activity in their area." +msgstr "" +"Se você enviar um relatório no fixmystreet mindelo será deixado no local, mas se não informou ao\"\n" +"\"O Conselho - por favor, postar seu relatório, para que possamos mostrar aos\"\n" +"\"O Conselho da atividade em sua área.\"" + +#: templates/web/default/auth/token.html:22 +#: templates/web/default/email_sent.html:9 +msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." +msgstr "" +"Se 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\"" + +#: templates/web/default/questionnaire/index.html:86 +#: templates/web/fixmystreet/questionnaire/index.html:77 +msgid "" +"If you wish to leave a public update on the problem, please enter it here\n" +"(please note it will not be sent to the council). For example, what was\n" +"your experience of getting the problem fixed?" +msgstr "" +"Se você quiser deixar uma atualização pública sobre o problema, por favor insira-o aqui \\ n\"\n" +"(Note que não será enviado para o conselho). Por exemplo, o que era \\ n\"\n" +"A sua experiência de ter o problema resolvido" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +msgid "Illegal ID" +msgstr "ID ilegal" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:100 +msgid "Illegal feed selection" +msgstr "Seleção de feed ilegal" + +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 +#: templates/web/default/dashboard/index.html:142 +#: templates/web/default/dashboard/index.html:144 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 +msgid "In Progress" +msgstr "Em andamento" + +#: templates/web/default/open311/index.html:90 +msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." +msgstr "Além disso, os seguintes atributos que não fazem parte da especificação v2 Open311 são retornados: agency_sent_datetime, título (também retornou como parte da descrição), interface_used, comment_count, requestor_name (presente apenas se solicitante permitido o nome a ser mostrado neste site) ." + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 +#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:8 +#: templates/web/zurich/admin/report_edit.html:100 +#: templates/web/zurich/report/banner.html:15 +msgid "In progress" +msgstr "Em andamento" + +#: templates/web/seesomething/report/new/fill_in_details_form.html:38 +msgid "Incident Category" +msgstr "Categoria incidente" + +#: templates/web/zurich/admin/report_edit.html:143 +msgid "Include reporter personal details" +msgstr "Incluir reports detalhes perssoais" + +#: templates/web/default/admin/stats.html:76 +msgid "Include unconfirmed reports" +msgstr "Incluir dados nao confirmados" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +msgid "Incorrect has_photo value \"%s\"" +msgstr "Foto_has valor incorreto \"%s\"" + +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:82 +msgid "Internal notes:" +msgstr "Notas internas" + +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:48 +msgid "Internal referral" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +msgid "Invalid agency_responsible value %s" +msgstr "Agencia_responsavel valor %s inválido" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 +msgid "Invalid end date" +msgstr "Invalido data final" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +msgid "Invalid format %s specified." +msgstr "Formato inválido%s especificado." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 +msgid "Invalid start date" +msgstr "Data de inicio invalida" + +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/dashboard/index.html:142 +#: templates/web/default/dashboard/index.html:143 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 +msgid "Investigating" +msgstr "Investigando" + +#: templates/web/emptyhomes/tokens/confirm_problem.html:12 +#: templates/web/emptyhomes/tokens/confirm_problem.html:14 +msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn’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." +msgstr "É interessante notar, porém, que o processo pode ser lento às vezes, especialmente se o imóvel está em muito mau estado de conservação ou o proprietário não está disposto a agir. Na maioria dos casos pode demorar seis meses ou mais antes que você pode esperar para ver nada mudam e às vezes pode haver barreiras consideráveis para a propriedade que está sendo trazido de volta ao uso. Isso não significa que o município não está fazendo nada. Nós encorajamos conselhos para atualizar o site para que você possa ver o que está acontecendo. Pode ser um processo longo, mas você relatar suas preocupações sobre este imóvel para o município é um primeiro passo importante." + +#: templates/web/bromley/report/display.html:168 +#: templates/web/bromley/report/new/fill_in_details_form.html:209 +#: templates/web/default/auth/general.html:44 +#: templates/web/default/report/new/fill_in_details_form.html:149 +#: templates/web/default/report/update-form.html:104 +#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 +#: templates/web/fixmystreet/report/update-form.html:100 +#: templates/web/seesomething/auth/general.html:35 +#: templates/web/zurich/auth/general.html:39 +msgid "Keep me signed in on this computer" +msgstr "Manter-me logado neste computador" + +#: templates/web/bromley/report/display.html:197 +#: templates/web/bromley/report/new/fill_in_details_form.html:119 +#: templates/web/bromley/report/new/fill_in_details_form.html:166 +msgid "Last Name" +msgstr "Ultimo Nome" + +#: templates/web/default/admin/body.html:40 +#: templates/web/zurich/admin/body.html:15 +msgid "Last editor" +msgstr "Última editor" + +#: templates/web/default/admin/report_edit.html:72 +msgid "Last update:" +msgstr "Última atualização:" + +#: templates/web/default/admin/problem_row.html:39 +msgid "Last update:" +msgstr "Última atualização:" + +#: templates/web/default/admin/body.html:14 +#: templates/web/default/admin/body.html:16 +msgid "List all reported problems" +msgstr "Listar todos os problemas relatados" + +#: templates/web/bromley/report/new/fill_in_details_form.html:69 +#: templates/web/default/report/new/fill_in_details_form.html:68 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 +#: templates/web/seesomething/report/new/fill_in_details_form.html:25 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 +msgid "Loading..." +msgstr "Carregando ..." + +#: templates/web/default/alert/choose.html:1 +#: templates/web/default/alert/choose.html:3 +#: templates/web/default/alert/index.html:1 +#: templates/web/default/alert/index.html:3 +#: templates/web/default/alert/list.html:1 +#: templates/web/default/alert/list.html:5 +#: templates/web/default/alert/updates.html:1 +#: templates/web/default/tokens/confirm_alert.html:1 +#: templates/web/default/tokens/confirm_alert.html:3 +#: templates/web/emptyhomes/alert/index.html:1 +#: templates/web/emptyhomes/alert/index.html:3 +#: templates/web/fixmybarangay/alert/index.html:1 +#: templates/web/fixmybarangay/alert/index.html:3 +#: templates/web/fixmystreet/alert/updates.html:1 +msgid "Local RSS feeds and email alerts" +msgstr "RSS feeds e alertas de e-mail locais" + +#: templates/web/default/alert/list.html:1 +#: templates/web/default/alert/list.html:12 +#: templates/web/default/alert/list.html:14 +#: templates/web/default/alert/list.html:3 +msgid "Local RSS feeds and email alerts for ‘%s’" +msgstr "RSS feeds e alertas de e-mail locais para '%s'" + +#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23 +#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13 +#: templates/web/fiksgatami/footer.html:8 +#: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/fixmybarangay/footer.html:22 +#: templates/web/fixmystreet/footer.html:50 +#: templates/web/oxfordshire/footer.html:25 +#: templates/web/oxfordshire/header.html:71 +#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45 +msgid "Local alerts" +msgstr "Alertas locais" + +#: templates/web/default/index-steps.html:25 +msgid "Locate the problem on a map of the area" +msgstr "Localize o problema em um mapa da área ou zona" + +#: templates/web/default/js/translation_strings.html:37 +msgid "MAP" +msgstr "Mapa" + +#: perllib/FixMyStreet/Map/OSM.pm:44 +msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" +msgstr "Mapa © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\"> OpenStreetMap </a> e colaboradores, <a href = \"http://creativecommons.org/licenses/by- sa/2.0 / \"> CC-BY-SA </a>" + +#: templates/web/fixmystreet/contact/index.html:98 +msgid "Message" +msgstr "Menssagem" + +#: templates/web/default/contact/index.html:90 +msgid "Message:" +msgstr "Menssagem" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +msgid "Missing jurisdiction_id" +msgstr "Falta informaçao jurisdiction_id" + +#: templates/web/zurich/admin/stats.html:34 +msgid "Moderated by division within one working day" +msgstr "Moderado por divisão dentro de um dia de trabalho" + +#: templates/web/default/admin/stats.html:11 +msgid "Month" +msgstr "Mês" + +#: templates/web/default/report/display.html:30 +msgid "More problems nearby" +msgstr "Mais problemas próximos" + +#: templates/web/default/admin/bodies.html:7 +#: templates/web/default/admin/body-form.html:4 +#: templates/web/default/admin/flagged.html:11 +#: templates/web/default/admin/flagged.html:28 +#: templates/web/default/admin/list_updates.html:8 +#: templates/web/default/admin/reports.html:13 +#: templates/web/default/admin/users.html:12 +#: templates/web/default/reports/index.html:15 +#: templates/web/emptyhomes/reports/index.html:9 +#: templates/web/fiksgatami/nn/reports/index.html:9 +#: templates/web/fiksgatami/reports/index.html:9 +#: templates/web/fixmybarangay/reports/index.html:15 +#: templates/web/fixmystreet/auth/general.html:56 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:120 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:187 +#: templates/web/fixmystreet/report/update-form.html:136 +#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/auth/general.html:58 +#: templates/web/zurich/report/new/fill_in_details_form.html:100 +msgid "Name" +msgstr "Nome" + +#: templates/web/seesomething/report/new/fill_in_details_form.html:74 +msgid "Name (optional)" +msgstr "Nome (opcional)" + +#: templates/web/default/admin/report_edit.html:66 +#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/user-form.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/stats.html:41 +msgid "Name:" +msgstr "Nome:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 +msgid "Name: %s" +msgstr "Nome: %s" + +#: templates/web/fiksgatami/footer.html:3 +#: templates/web/fiksgatami/nn/footer.html:3 +#: templates/web/reading/footer.html:4 +msgid "Navigation" +msgstr "Navegaçao" + +#: perllib/FixMyStreet/Geocode/OSM.pm:166 +msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" +msgstr "Nomeado rodoviário mais próximo ao pino colocado no mapa (gerado automaticamente usando OpenStreetMap): %s%s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:148 +msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" +msgstr "Código postal mais próximo do pino colocado no mapa (gerado automaticamente): %s (%sm distância)" + +#: perllib/FixMyStreet/Cobrand/Default.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:458 +msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" +msgstr "Estrada mais próxima para o pino colocado no mapa (gerado automaticamente por Bing Maps): %s" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 +msgid "" +"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" +"\n" +msgstr "" +"Estrada mais próxima para o pino colocado no mapa (gerado automaticamente por Bing Maps): %s\n" +"\n" +"\n" + +#: templates/web/default/email_sent.html:3 +msgid "Nearly Done! Now check your email..." +msgstr "Quase pronto! Agora, verifique seu e-mail ..." + +#: templates/web/default/reports/index.html:16 +#: templates/web/fixmybarangay/reports/index.html:16 +msgid "New <br>problems" +msgstr "Novos <br>problemas" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 +msgid "New body added" +msgstr "Novo corpo adicionado" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 +msgid "New category contact added" +msgstr "Novo contato de categoria adicionado" + +#: db/alert_types.pl:18 db/alert_types.pl:22 +msgid "New local problems on FixMyStreet" +msgstr "Novos problemas locais FixMyStreetMindelo" + +#: db/alert_types_eha.pl:12 +msgid "New local reports on reportemptyhomes.com" +msgstr "Novos relatórios locais reportemptyhomes.com" + +#: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/fiksgatami/nn/reports/index.html:10 +#: templates/web/fiksgatami/reports/index.html:10 +msgid "New problems" +msgstr "Novos problemas" + +#: db/alert_types.pl:38 +msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" +msgstr "Novos problemas para {{CONSELHO}} {{dentro WARD}} enfermaria em FixMyStreetMindelo" + +#: db/alert_types.pl:26 db/alert_types.pl:30 +msgid "New problems near {{POSTCODE}} on FixMyStreet" +msgstr "Novos problemas perto de CÓDIGO POSTAL {{}} em FixMyStreetMindelo" + +#: db/alert_types.pl:10 +msgid "New problems on FixMyStreet" +msgstr "Novos problemas no FixMyStreetMindelo" + +#: db/alert_types.pl:34 +msgid "New problems to {{COUNCIL}} on FixMyStreet" +msgstr "Novos problemas para {{}} CONSELHO em FixMyStreetMindelo" + +#: db/alert_types.pl:42 +msgid "New problems within {{NAME}}'s boundary on FixMyStreet" +msgstr "Novos problemas dentro de {{NAME}} 's fronteira em FixMyStreetMindelo" + +#: templates/web/zurich/admin/index-sdm.html:4 +msgid "New reports" +msgstr "Novos reports" + +#: db/alert_types_eha.pl:23 +msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" +msgstr "Novos relatórios para {{CONSELHO}} {{dentro WARD}} em reportemptyhomes.com" + +#: db/alert_types_eha.pl:5 +msgid "New reports on reportemptyhomes.com" +msgstr "Novos relatórios sobre reportemptyhomes.com" + +#: db/alert_types_eha.pl:16 +msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" +msgstr "Novos relatórios sobre reportemptyhomes.com perto CÓDIGO POSTAL {{}}" + +#: db/alert_types_eha.pl:19 +msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" +msgstr "Novos Relatorios sobre reportemptyhomes.com Perto CÓDIGO POSTAL {{}}" + +#: db/alert_types_eha.pl:27 +msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" +msgstr "Novos relatórios dentro de {{NAME}} 's fronteira em reportemptyhomes.com" + +#: templates/web/default/admin/questionnaire.html:24 +msgid "New state" +msgstr "Novo estado" + +#: templates/web/zurich/admin/report_edit-sdm.html:58 +msgid "New update:" +msgstr "Nova actualizaçao" + +#: templates/web/fiksgatami/front/news.html:9 +#: templates/web/fiksgatami/nn/front/news.html:9 +#: templates/web/fixmystreet/front/news.html:8 +msgid "New!" +msgstr "Novo?" + +#: templates/web/default/pagination.html:13 +msgid "Next" +msgstr "Proximo" + +#: templates/web/default/admin/body.html:50 +#: templates/web/default/admin/body.html:51 +#: templates/web/default/admin/body.html:52 +#: templates/web/default/admin/body_edit.html:4 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:25 +#: templates/web/default/questionnaire/creator_fixed.html:16 +#: templates/web/default/questionnaire/index.html:111 +#: templates/web/default/questionnaire/index.html:68 +#: templates/web/fixmystreet/questionnaire/index.html:101 +#: templates/web/fixmystreet/questionnaire/index.html:62 +msgid "No" +msgstr "Nao" + +#: templates/web/default/admin/user-form.html:8 +msgid "No body" +msgstr "Nenhum corpo" + +#: templates/web/default/admin/stats.html:85 +msgid "No council" +msgstr "Sem conselho" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +msgid "No council selected" +msgstr "Nenhum Conselho selecionado" + +#: templates/web/default/admin/edit-league.html:10 +msgid "No edits have yet been made." +msgstr "Nenhum ediçao efectuada" + +#: templates/web/default/admin/flagged.html:20 +msgid "No flagged problems found" +msgstr "Nenhum problema sinalizado" + +#: templates/web/default/admin/flagged.html:41 +msgid "No flagged users found" +msgstr "Nenhum usuário sinalizado encontrado" + +#: templates/web/zurich/admin/report_edit-sdm.html:65 +msgid "No further updates" +msgstr "Sem mais atualizações" + +#: templates/web/default/around/around_map_list_items.html:17 +#: templates/web/fixmystreet/around/around_map_list_items.html:8 +msgid "No problems found." +msgstr "Nenhum problema encontrado" + +#: templates/web/default/around/on_map_list_items.html:14 +#: templates/web/fixmystreet/around/on_map_list_items.html:6 +msgid "No problems have been reported yet." +msgstr "Nenhuns problemas foram ianda reportados" + +#: templates/web/default/js/translation_strings.html:32 +msgid "No result returned" +msgstr "Nenhum resultado retornado" + +#: templates/web/default/report/_support.html:2 +#: templates/web/default/report/_support.html:4 +msgid "No supporters" +msgstr "Não apoiantes" + +#: templates/web/default/admin/body.html:55 +msgid "Non Public" +msgstr "Nao publico" + +#: templates/web/default/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:61 +msgid "None" +msgstr "Nenhum" + +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:33 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:31 +msgid "Not Responsible" +msgstr "Nao responsavel" + +#: templates/web/zurich/admin/report_edit-sdm.html:21 +msgid "Not for my subdivision" +msgstr "Nao pertence ao meu sector" + +#: templates/web/default/admin/questionnaire.html:6 +msgid "Not reported before" +msgstr "Nao reportado antes" + +#: templates/web/default/report/_main.html:14 +msgid "Not reported to council" +msgstr "Nao reportado ao conselho" + +#: templates/web/default/admin/body.html:41 +#: templates/web/default/admin/body_edit.html:87 +#: templates/web/zurich/admin/body.html:16 +msgid "Note" +msgstr "Nota" + +#: templates/web/default/admin/stats.html:51 +msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +msgstr "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/default/admin/body.html:92 +#: templates/web/default/admin/body_edit.html:44 +#: templates/web/zurich/admin/body.html:47 +msgid "Note:" +msgstr "Nota" + +#: templates/web/default/open311/index.html:75 +msgid "Note: <strong>%s</strong>" +msgstr "Nota: <strong>%s</strong>" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +msgid "Now to submit your report…" +msgstr "Agora, para apresentar o seu relatório ..." + +#: templates/web/default/report/new/fill_in_details_form.html:131 +msgid "Now to submit your report… do you have a FixMyStreet password?" +msgstr "Agora, para apresentar o seu relatório ... você tem de ter uma senha FixMyStreetMindelo?" + +#: templates/web/fixmystreet/report/update-form.html:83 +msgid "Now to submit your update…" +msgstr "Agora, para apresentar a sua atualização ..." + +#: templates/web/default/report/update-form.html:86 +msgid "Now to submit your update… do you have a FixMyStreet password?" +msgstr "Agora, para apresentar a sua atualização ... você tem de ter uma senha FixMyStreetMindelo?" + +#: templates/web/default/js/translation_strings.html:36 +msgid "OK" +msgstr "OK" + +#: templates/web/default/report/display.html:24 +#: templates/web/default/report/update.html:16 +msgid "Offensive? Unsuitable? Tell us" +msgstr "Ofensivo? Inadequado? Informem-nos" + +#: templates/web/default/reports/index.html:18 +#: templates/web/fixmybarangay/reports/index.html:18 +msgid "Old / unknown <br>problems" +msgstr " Velho / desconhecido <br>problems" + +#: templates/web/fiksgatami/nn/reports/index.html:12 +#: templates/web/fiksgatami/reports/index.html:12 +msgid "Old problems,<br>state unknown" +msgstr "VElhos problemas,<br>estado desconhecido" + +#: templates/web/default/admin/questionnaire.html:24 +msgid "Old state" +msgstr "Estado antigo" + +#: templates/web/default/reports/index.html:20 +#: templates/web/fixmybarangay/reports/index.html:20 +msgid "Older <br>fixed" +msgstr "Mais antigo <br>fixado" + +#: templates/web/default/reports/index.html:17 +#: templates/web/fixmybarangay/reports/index.html:17 +msgid "Older <br>problems" +msgstr "Mais antigo <br>problemas" + +#: templates/web/fiksgatami/nn/reports/index.html:14 +#: templates/web/fiksgatami/reports/index.html:14 +msgid "Older fixed" +msgstr "Mais antigo fixed" + +#: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/fiksgatami/nn/reports/index.html:11 +#: templates/web/fiksgatami/reports/index.html:11 +msgid "Older problems" +msgstr "Problemas mais antigos" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 +#: templates/web/bromley/report/display.html:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/update_edit.html:28 +#: templates/web/default/dashboard/index.html:142 +#: templates/web/default/report/update-form.html:30 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:7 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:89 +#: templates/web/zurich/admin/update_edit.html:18 +#: templates/web/zurich/report/banner.html:11 +msgid "Open" +msgstr "Aberto" + +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26 +msgid "Open reports" +msgstr "Relatorios abertos" + +#: templates/web/default/open311/index.html:72 +msgid "Open311 API for the mySociety FixMyStreet server" +msgstr "Open311 API para o servidor FixMyStreet mySociety" + +#: templates/web/default/open311/index.html:82 +msgid "Open311 initiative web page" +msgstr "Open311 página web iniciativa" + +#: templates/web/default/open311/index.html:83 +msgid "Open311 specification" +msgstr "Especificação Open311" + +#: templates/web/default/alert/_list.html:58 +#: templates/web/fixmystreet/alert/_list.html:60 +msgid "Or problems reported to:" +msgstr "Ou os problemas relatados para:" + +#: templates/web/default/alert/_list.html:33 +#: templates/web/fixmystreet/alert/_list.html:36 +msgid "Or you can subscribe to an alert based upon what ward or council you’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:1046 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 +msgid "Other" +msgstr "Outro" + +#: templates/web/default/footer.html:27 +msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." +msgstr "Nosso código é open source e <a href=\"http://github.com/mysociety/fixmystreet\"> disponível no GitHub </a>." + +#: templates/web/default/admin/list_updates.html:12 +msgid "Owner" +msgstr "Proprietário" + +#: templates/web/default/errors/page_error_404_not_found.html:1 +#: templates/web/default/errors/page_error_404_not_found.html:3 +msgid "Page Not Found" +msgstr "Pagina nao encontrada" + +#: templates/web/default/admin/body-form.html:9 +#: templates/web/zurich/admin/body-form.html:15 +msgid "Parent" +msgstr "Parente" + +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +msgid "Partial" +msgstr "Parcial" + +#: templates/web/bromley/report/display.html:147 +#: templates/web/bromley/report/new/fill_in_details_form.html:186 +#: templates/web/fixmystreet/auth/general.html:59 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208 +#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/zurich/auth/general.html:32 +#: templates/web/zurich/auth/general.html:61 +msgid "Password (optional)" +msgstr "Password (opcional)" + +#: templates/web/default/auth/change_password.html:25 +msgid "Password:" +msgstr "Password:" + +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + +#: templates/web/bromley/report/new/fill_in_details_form.html:136 +#: templates/web/bromley/report/new/fill_in_details_form.html:183 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205 +#: templates/web/seesomething/report/new/fill_in_details_form.html:89 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 +msgid "Phone number (optional)" +msgstr "Telefone (opcional)" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 +#: templates/web/default/admin/report_edit.html:68 +#: templates/web/default/report/new/fill_in_details_form.html:215 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/stats.html:39 +msgid "Phone:" +msgstr "Telefone:" + +#: templates/web/bromley/report/display.html:111 +#: templates/web/bromley/report/new/fill_in_details_form.html:104 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 +#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-sdm.html:24 +#: templates/web/zurich/admin/stats.html:37 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 +msgid "Photo" +msgstr "Foto" + +#: templates/web/default/questionnaire/index.html:99 +#: templates/web/default/report/new/fill_in_details_form.html:102 +#: templates/web/default/report/update-form.html:62 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:99 +#: templates/web/fixmystreet/questionnaire/index.html:90 +msgid "Photo:" +msgstr "Foto" + +#: templates/web/default/alert/list.html:26 +msgid "Photos of recent nearby reports" +msgstr "Fotos de relatórios recentes mais proximos" + +#: templates/web/default/js/translation_strings.html:24 +msgid "Place pin on map" +msgstr "Coloque a fix pin no mapa" + +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/dashboard/index.html:142 +#: templates/web/default/dashboard/index.html:143 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:9 +#: templates/web/zurich/admin/index-dm.html:9 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 +msgid "Planned" +msgstr "Planejado" + +#: templates/web/fixmystreet/questionnaire/index.html:44 +msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." +msgstr "<a Class=\"tab_link\" href=\"#report\"> dar uma olhada </a> nas atualizações que foram deixadas." + +#: templates/web/default/report/new/notes.html:6 +#: templates/web/fixmystreet/report/new/notes.html:6 +#: templates/web/oxfordshire/report/new/notes.html:5 +msgid "Please be polite, concise and to the point." +msgstr "Por favor, seja educado, objectivo, conciso e direto ao ponto." + +#: templates/web/default/auth/change_password.html:12 +#: templates/web/default/auth/change_password.html:17 +msgid "Please check the passwords and try again" +msgstr "Por favor verifique as senhas e tente novamente" + +#: templates/web/default/auth/token.html:14 +msgid "Please check your email" +msgstr "Favor verificar seu email" + +#: templates/web/default/auth/general.html:14 +#: templates/web/default/auth/general.html:8 +#: templates/web/fixmystreet/auth/general.html:15 +#: templates/web/fixmystreet/auth/general.html:9 +#: templates/web/seesomething/auth/general.html:15 +#: templates/web/seesomething/auth/general.html:9 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:9 +msgid "Please check your email address is correct" +msgstr "Favor verificar se seu email esta correcto" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:917 +#: perllib/FixMyStreet/DB/Result/Problem.pm:420 +#: templates/web/default/js/translation_strings.html:9 +msgid "Please choose a category" +msgstr "Escolher uma categoria" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +msgid "Please choose a property type" +msgstr "Por favor, escolha um tipo de imóvel" + +#: templates/web/seesomething/js/translation_strings.html:6 +msgid "Please choose a transport category" +msgstr "Por favor escolha uma categoria de transporte" + +#: templates/web/seesomething/js/translation_strings.html:7 +msgid "Please choose an incident category" +msgstr "Por favor escolha uma categoria incidente" + +#: templates/web/bromley/report/new/fill_in_details_form.html:64 +msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”" +msgstr "Por favor, descreva a localização exata do relatório. Exemplo: \"2 postes iluminaçao partidos na rua lisboa\"" + +#: templates/web/default/contact/blurb.html:2 +msgid "" +"Please do <strong>not</strong> report problems through this form; messages go to\n" +"the team behind FixMyStreet, not a council. To report a problem,\n" +"please <a href=\"/\">go to the front page</a> and follow the instructions." +msgstr "" +"Por favor, faça <strong> não </strong> relatar problemas através deste formulário; mensagens de ir para ⏎\n" +"a equipe por trás FixMyStreet, não um conselho. Para relatar um problema, ⏎\n" +"<a href=\"/\"> ir para a página inicial </a> e siga as instruções." + +#: templates/web/default/report/new/notes.html:7 +#: templates/web/fixmystreet/report/new/notes.html:7 +#: templates/web/oxfordshire/report/new/notes.html:6 +msgid "Please do not be abusive — abusing your council devalues the service for all users." +msgstr "" +"Por favor, o Faça <strong> Localidade: Não </strong> relatar Problemas atraves dEste Formulário; Point Of Sale de ir par ⏎\n" +"a Equipe POR Trás FixMyStreet, Nao hum Conselho. Pará relatar hum Problema, ⏎\n" +"<a href=\"/\"> ir par a Página Inicial </a> e como SIGA INSTRUÇÕES." + +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 +msgid "Please do not give address or personal information in this section." +msgstr "Por favor, não fornecer o endereço ou informações pessoais nesta seção." + +#: perllib/FixMyStreet/DB/Result/Comment.pm:145 +#: templates/web/default/js/translation_strings.html:2 +msgid "Please enter a message" +msgstr "Por favor insira uma mensagem" + +#: templates/web/default/auth/change_password.html:12 +#: templates/web/default/auth/change_password.html:15 +msgid "Please enter a password" +msgstr "Por favor insira uma password" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:97 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 +#: templates/web/default/js/translation_strings.html:3 +msgid "Please enter a subject" +msgstr "Por favor insira um assunto" + +#: perllib/FixMyStreet/DB/Result/User.pm:115 +#: templates/web/default/js/translation_strings.html:12 +#: templates/web/default/js/translation_strings.html:16 +#: templates/web/seesomething/js/translation_strings.html:10 +#: templates/web/seesomething/js/translation_strings.html:13 +msgid "Please enter a valid email" +msgstr "Por favor insira um email valido" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:346 +#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +msgid "Please enter a valid email address" +msgstr "Por favor insira um endereço de e-mail válido" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: templates/web/default/js/translation_strings.html:4 +#: templates/web/seesomething/js/translation_strings.html:2 +msgid "Please enter some details" +msgstr "Por favor, insira alguns detalhes" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:96 +#: perllib/FixMyStreet/DB/Result/User.pm:112 +#: templates/web/default/auth/general.html:13 +#: templates/web/default/auth/general.html:8 +#: templates/web/default/js/translation_strings.html:11 +#: templates/web/default/js/translation_strings.html:15 +#: templates/web/fixmystreet/auth/general.html:14 +#: templates/web/fixmystreet/auth/general.html:9 +#: templates/web/seesomething/auth/general.html:14 +#: templates/web/seesomething/auth/general.html:9 +#: templates/web/seesomething/js/translation_strings.html:9 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:8 +msgid "Please enter your email" +msgstr "Digite seu e-mail" + +#: templates/web/bromley/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +#: templates/web/seesomething/report/new/fill_in_details_form.html:85 +#: templates/web/zurich/report/new/fill_in_details_form.html:92 +msgid "Please enter your email address" +msgstr "Por favor, insira o seu endereço de email" + +#: templates/web/default/js/translation_strings.html:19 +msgid "Please enter your first name" +msgstr "Digite seu primeiro nome" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: templates/web/default/js/translation_strings.html:7 +#: templates/web/seesomething/js/translation_strings.html:4 +msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" +msgstr "Por favor, insira o seu nome completo, os conselhos precisam desta informação - se você não quiser que seu nome seja mostrado no site, desmarque a caixa abaixo" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:95 +#: perllib/FixMyStreet/DB/Result/Comment.pm:142 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 +#: perllib/FixMyStreet/DB/Result/User.pm:108 +#: templates/web/default/js/translation_strings.html:6 +msgid "Please enter your name" +msgstr "Digite seu nome" + +#: templates/web/default/js/translation_strings.html:20 +msgid "Please enter your second name" +msgstr "Digite seu segundo nome, apelido" + +#: templates/web/default/js/translation_strings.html:18 +msgid "Please enter your title" +msgstr "Por favor, insira o seu título" + +#: templates/web/default/auth/sign_out.html:5 +#: templates/web/zurich/auth/sign_out.html:5 +msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." +msgstr "Por favor, sinta-se livre para <a href=\"%s\"> se inscrever de novo </a>, ou voltar para a página inicial href=\"/\"> <a </a>." + +#: templates/web/emptyhomes/report/new/fill_in_details_text.html:1 +msgid "" +"Please fill in details of the empty property below, saying what type of\n" +"property it is e.g. an empty home, block of flats, office etc. Tell us\n" +"something about its condition and any other information you feel is relevant.\n" +"There is no need for you to give the exact address. Please be polite, concise\n" +"and to the point; writing your message entirely in block capitals makes it hard\n" +"to read, as does a lack of punctuation." +msgstr "" +"Por favor, preencha a ficha do imóvel vazio abaixo, dizendo que tipo de ⏎\n" +"propriedade é, por exemplo, uma casa vazia, bloco de apartamentos, escritório etc Diga-nos ⏎\n" +"algo sobre sua condição e qualquer outra informação que você sente é relevante. ⏎\n" +"Não há nenhuma necessidade para você dar o endereço exato. Por favor, seja educado, conciso ⏎\n" +"e direto ao ponto, escrever a mensagem inteiramente em letras maiúsculas torna difícil ⏎" + +#: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8 +msgid "Please fill in details of the problem below." +msgstr "Por favor, preencha os detalhes do problema abaixo." + +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3 +msgid "" +"Please fill in details of the problem below. Leave as much detail as you can, \n" +"and if possible describe the exact location of\n" +"the problem (e.g. if there is a streetlight number or road name)." +msgstr "" +"Por favor, preencha os detalhes do problema abaixo. Deixar o máximo de detalhes possível, ⏎\n" +"e se possível descrever a localização exata de ⏎\n" +"o problema (por exemplo, se existe um número de rua ou o nome da rua, zona. lugar, praça, beco, ruela, etc)." + +#: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/default/report/new/fill_in_details_text.html:3 +msgid "" +"Please fill in details of the problem below. The council won't be able\n" +"to help unless you leave as much detail as you can, so please describe the exact location of\n" +"the problem (e.g. on a wall), what it is, how long it has been there, a description (and a\n" +"photo of the problem if you have one), etc." +msgstr "" +"Por favor, preencha os detalhes do problema abaixo. O conselho não será capaz ⏎\n" +"para ajudar a menos que você deixe o máximo de detalhes como você pode, então, por favor descrever a localização exata de ⏎\n" +"o problema (por exemplo, uma parede, um poste, lixo, entulho), o que é, quanto tempo ele tem estado lá, uma descrição (e um ⏎\n" +"foto do problema se você tiver um), etc" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 +#: templates/web/seesomething/report/new/fill_in_details_form.html:20 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 +msgid "Please fill in details of the problem." +msgstr "Por favor, preencha os detalhes do problema." + +#: templates/web/bromley/report/new/fill_in_details_form.html:28 +#: templates/web/default/report/new/fill_in_details_form.html:27 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 +#: templates/web/zurich/report/new/fill_in_details_form.html:20 +msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." +msgstr "Por favor, preencha o formulário abaixo com detalhes do problema e descrever a localização mais precisa possível na caixa de detalhes." + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +msgid "Please indicate whether you'd like to receive another questionnaire" +msgstr "Por favor, indique se você gostaria de receber um outro questionário" + +#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3 +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/default/report/update-form.html:7 +msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +msgstr "Por favor, note que as atualizações Localidade: Não São enviadas par o Conselho. Se Você. deixar Seu Nome Será, Público. SUAS Informations Só Serao utilizadas according to Nossa <a href=\"/faq#privacy\"> Politica de Privacidade </a>" + +#: templates/web/barnet/report/updates-sidebar-notes.html:1 +msgid "Please note that updates are not sent to the relevant department. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +msgstr "Por favor, note que as atualizações não são enviadas para o departamento competente. Se você deixar seu nome será público. Suas informações só serão utilizadas de acordo com nossa <a href=\"/faq#privacy\"> política de privacidade </a>" + +#: templates/web/bromley/report/new/fill_in_details_form.html:23 +#: templates/web/default/report/new/fill_in_details_form.html:5 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 +#: templates/web/zurich/report/new/fill_in_details_form.html:11 +msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." +msgstr "Por favor, note o relatório ainda não foi enviado <strong> </strong>. Escolha uma categoria e acrescentar mais informações abaixo, em seguida, enviar." + +#: templates/web/default/report/new/notes.html:1 +#: templates/web/fixmybarangay/report/new/notes.html:1 +#: templates/web/fixmystreet/report/new/notes.html:1 +#: templates/web/oxfordshire/report/new/notes.html:1 +msgid "Please note:" +msgstr "Favor notar:" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +msgid "Please provide some explanation as to why you're reopening this report" +msgstr "Favor fornecer uma explicação de por que você está reabrindo este relatório" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +msgid "Please provide some text as well as a photo" +msgstr "Por favor, forneça algum texto, bem como uma foto" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +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" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:80 +msgid "Please select the feed you want" +msgstr "Por favor, selecione o feed que deseja" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:118 +msgid "Please select the type of alert you want" +msgstr "Selecione o tipo de alerta que deseja" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +msgid "Please state whether or not the problem has been fixed" +msgstr "Por favor, indique se o problema foi corrigido" + +#: templates/web/default/questionnaire/index.html:50 +msgid "Please take a look at the updates that have been left." +msgstr "Por favor, dê uma olhada nas atualizações que foram deixadas." + +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 +msgid "Please upload a JPEG image only" +msgstr "Faça upload somente de uma imagem em JPEG " + +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 +msgid "Please upload a JPEG image only\n" +msgstr "Faça upload de uma imagem JPEG \n" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:98 +msgid "Please write a message" +msgstr "Por favor, escreva uma mensagem" + +#: templates/web/bromley/report/display.html:70 +#: templates/web/fixmystreet/report/update-form.html:23 +msgid "Please write your update here" +msgstr "Por favor, escreva a sua atualização aqui" + +#: templates/web/bromley/report/display.html:123 +#: templates/web/bromley/report/display.html:151 +#: templates/web/bromley/report/display.html:163 +#: templates/web/default/contact/index.html:93 +#: templates/web/default/report/update-form.html:109 +#: templates/web/default/report/update-form.html:131 +#: templates/web/default/report/update-form.html:72 +#: templates/web/fixmystreet/contact/index.html:105 +#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/fixmystreet/report/update-form.html:71 +#: templates/web/fixmystreet/report/update-form.html:95 +msgid "Post" +msgstr "Postar" + +#: templates/web/default/report/updates.html:15 +msgid "Posted anonymously at %s" +msgstr "Postado anonimamente em %s" + +#: templates/web/default/report/updates.html:22 +msgid "Posted by %s (<strong>%s</strong>) at %s" +msgstr "Postado por %s (<strong>%s</strong>) em %s" + +#: templates/web/default/report/updates.html:24 +msgid "Posted by %s at %s" +msgstr "Postado por %s aem %s" + +#: templates/web/default/pagination.html:7 +msgid "Previous" +msgstr "Anterior" + +#: templates/web/default/admin/body.html:97 +#: templates/web/default/admin/body_edit.html:40 +#: templates/web/default/admin/report_edit.html:79 +msgid "Private" +msgstr "Privado" + +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:108 +msgid "Private information (not shown on site)" +msgstr "Informações privadas (não mostrado no site)" + +#: templates/web/default/maps/openlayers.html:85 +msgid "Problem" +msgstr "Problema" + +#: templates/web/default/admin/timeline.html:22 +msgid "Problem %d created" +msgstr "Problema %d criado" + +#: templates/web/default/admin/timeline.html:24 +msgid "Problem %s confirmed" +msgstr "Problema %s confirmado" + +#: templates/web/default/admin/timeline.html:26 +msgid "Problem %s sent to council %s" +msgstr "Problema %s enviado ao conselho %s" + +#: templates/web/default/admin/index.html:28 +#: templates/web/zurich/admin/index.html:9 +msgid "Problem breakdown by state" +msgstr "Colapso problema por estado" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 +msgid "Problem marked as open." +msgstr "Problema marcado como aberto." + +#: templates/web/default/admin/questionnaire.html:21 +msgid "Problem state change based on survey results" +msgstr "Mudança de estado do problema com base nos resultados da pesquisa" + +#: templates/web/default/admin/flagged.html:5 +msgid "Problems" +msgstr "Problemas" + +#: templates/web/default/around/_updates.html:1 +msgid "Problems in this area" +msgstr "Problemas nesta área" + +#: templates/web/bromley/report/display.html:31 +#: templates/web/fixmystreet/around/tabbed_lists.html:4 +#: templates/web/fixmystreet/report/display.html:46 +msgid "Problems nearby" +msgstr "Problemas nas proximidades" + +#: templates/web/fixmystreet/around/tabbed_lists.html:3 +#: templates/web/fixmystreet/report/display.html:44 +msgid "Problems on the map" +msgstr "Problemas no mapa" + +#: db/alert_types.pl:14 +msgid "Problems recently reported fixed on FixMyStreet" +msgstr "Problemas relatados recentemente fixados em FixMyStreetMindelo" + +#: templates/web/default/alert/_list.html:19 +#: templates/web/fixmystreet/alert/_list.html:21 +msgid "Problems within %.1fkm of this location" +msgstr "Problemas dentro de %.1fkm deste local" + +#: perllib/FixMyStreet/Cobrand/Default.pm:626 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 +#: perllib/FixMyStreet/Cobrand/UK.pm:228 +msgid "Problems within %s" +msgstr "Problemas dentro de %s" + +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:242 +msgid "Problems within %s ward" +msgstr "Problemas dentro de %s ala" + +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:24 +msgid "Problems within %s, FixMyStreet" +msgstr "Problemas dentro de %s, FixMyStreetMindelo" + +#: templates/web/default/alert/_list.html:40 +#: templates/web/fixmybarangay/alert/_list.html:13 +#: templates/web/fixmystreet/alert/_list.html:42 +msgid "Problems within the boundary of:" +msgstr "Problemas dentro do limite de:" + +#: db/alert_types_eha.pl:8 +msgid "Properties recently reported as put back to use on reportemptyhomes.com" +msgstr "Propriedades informou recentemente como colocar de volta para uso em reportemptyhomes.com" + +#: templates/web/default/admin/report_edit.html:32 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 +msgid "Property address:" +msgstr "Endereço do imóvel:" + +#: templates/web/default/report/new/category.html:8 +msgid "Property type:" +msgstr "Tipo de propriedade:" + +#: templates/web/bromley/report/new/fill_in_details_form.html:52 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +msgid "Provide a title" +msgstr "Dê um título" + +#: templates/web/bromley/report/display.html:57 +#: templates/web/default/report/update-form.html:3 +#: templates/web/fixmystreet/report/update-form.html:4 +msgid "Provide an update" +msgstr "Fornecer uma atualização" + +#: templates/web/fixmystreet/auth/general.html:53 +msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." +msgstr "" + +#: templates/web/bromley/report/new/fill_in_details_form.html:180 +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Fornecer uma senha é opcional, mas isso vai permitir que você mais facilmente relatar problemas futuros, deixe as atualizações e gerenciar seus relatórios." + +#: templates/web/bromley/report/display.html:144 +#: templates/web/default/report/new/fill_in_details_form.html:173 +#: templates/web/default/report/update-form.html:128 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202 +#: templates/web/fixmystreet/report/update-form.html:116 +msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." +msgstr "Fornecer uma senha é opcional, mas isso vai permitir que você mais facilmente relate seus problemas, deixe as atualizações e gerencie seus relatórios." + +#: templates/web/default/admin/body.html:42 +#: templates/web/default/admin/body.html:55 +msgid "Public" +msgstr "Publico" + +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:44 +msgid "Public information (shown on site)" +msgstr "A informação pública (mostrado no site)" + +#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:194 +msgid "Public response:" +msgstr "Resposta do público:" + +#: templates/web/zurich/admin/report_edit.html:78 +#: templates/web/zurich/admin/stats.html:38 +msgid "Publish photo" +msgstr "Publicar foto" + +#: templates/web/zurich/admin/report_edit.html:202 +msgid "Publish the response" +msgstr "Publicar a resposta" + +#: templates/web/default/questionnaire/completed.html:1 +#: templates/web/default/questionnaire/completed.html:2 +#: templates/web/default/questionnaire/index.html:0 +#: templates/web/default/questionnaire/index.html:14 +#: templates/web/default/questionnaire/index.html:4 +#: templates/web/fixmystreet/questionnaire/index.html:0 +#: templates/web/fixmystreet/questionnaire/index.html:14 +#: templates/web/fixmystreet/questionnaire/index.html:32 +#: templates/web/fixmystreet/questionnaire/index.html:4 +msgid "Questionnaire" +msgstr "Questionario" + +#: templates/web/default/admin/timeline.html:30 +msgid "Questionnaire %d answered for problem %d, %s to %s" +msgstr "Questionário %d respondeu para o problema de %d, %s para %s" + +#: templates/web/default/admin/timeline.html:28 +msgid "Questionnaire %d sent for problem %d" +msgstr "Questionário %d enviou para o problema de %d" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +msgid "Questionnaire filled in by problem reporter" +msgstr "Questionário preenchido por problema repórter" + +#: templates/web/bromley/report/display.html:37 +#: templates/web/default/alert/_list.html:21 +#: templates/web/default/around/display_location.html:1 +#: templates/web/default/around/display_location.html:3 +#: templates/web/default/report/display.html:46 +#: templates/web/default/reports/_rss.html:1 +#: templates/web/fixmystreet/alert/_list.html:22 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:61 +msgid "RSS feed" +msgstr "RSS feed" + +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 +msgid "RSS feed for %s" +msgstr "RSS feed para %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 +msgid "RSS feed for %s ward, %s" +msgstr "RSS feed for %s ala,%s" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 +msgid "RSS feed of %s" +msgstr "RSS feed de %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +msgid "RSS feed of %s, within %s ward" +msgstr "RSS feed de %s, %s problemas pendentes" + +#: templates/web/default/alert/_list.html:21 +#: templates/web/fixmystreet/alert/_list.html:22 +msgid "RSS feed of nearby problems" +msgstr "RSS feed dos problemas próximos" + +#: templates/web/default/reports/_rss.html:1 +msgid "RSS feed of problems in this %s" +msgstr "RSS feed dos problemas nesta %s" + +#: perllib/FixMyStreet/Cobrand/Default.pm:627 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 +#: perllib/FixMyStreet/Cobrand/UK.pm:235 +msgid "RSS feed of problems within %s" +msgstr "RSS feed dos Problemas Nesta %s" + +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 +msgid "RSS feed of problems within %s ward" +msgstr "RSS feed dos problemas dentro de %s ala" + +#: templates/web/default/around/display_location.html:1 +#: templates/web/default/around/display_location.html:4 +msgid "RSS feed of recent local problems" +msgstr "RSS feed dos problemas locais recentes" + +#: templates/web/bromley/report/display.html:37 +#: templates/web/default/report/display.html:46 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:61 +msgid "RSS feed of updates to this problem" +msgstr "RSS feed de atualizações para este problema" + +#: templates/web/bromley/report/display.html:39 +#: templates/web/default/alert/updates.html:9 +#: templates/web/default/report/display.html:37 +#: templates/web/fixmystreet/alert/updates.html:14 +#: templates/web/fixmystreet/report/display.html:63 +msgid "Receive email when updates are left on this problem." +msgstr "RSS feed dos problemas locais recentes" + +#: templates/web/default/around/display_location.html:0 +#: templates/web/default/around/display_location.html:32 +msgid "Recent local problems, FixMyStreet" +msgstr "Recentes problemas locais, FixMyStreetMindelo" + +#: templates/web/default/reports/index.html:19 +#: templates/web/fixmybarangay/reports/index.html:19 +msgid "Recently <br>fixed" +msgstr "Recentement <br>fixed" + +#: templates/web/fiksgatami/nn/reports/index.html:13 +#: templates/web/fiksgatami/reports/index.html:13 +msgid "Recently fixed" +msgstr "Problemas recentemente fixados" + +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 +#: templates/web/fixmystreet/index.html:45 +msgid "Recently reported problems" +msgstr "Problemas recentemente reportados" + +#: templates/web/default/report/new/notes.html:9 +#: templates/web/fixmystreet/report/new/notes.html:10 +msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." +msgstr "Lembre-se que FixMyStreetMIndelo é principalmente para relatar problemas físicos que podem ser corrigidos. Se o seu problema não é apropriado para a apresentação através deste site, lembre-se que você pode contactar o seu município diretamente usando seu próprio site." + +#: templates/web/fixmybarangay/report/new/notes.html:9 +msgid "Remember that, for the pilot project, FixMyBarangay is only for reporting potholes and streetlights in bgy. Luz or Basak San Nicolas." +msgstr "Lembre-se que, para o projeto piloto, FixMyStreet é apenas para relatar buracos e postes em bgy. " + +#: templates/web/default/admin/report_blocks.html:16 +msgid "Remove flag" +msgstr "Remover bandeira" + +#: templates/web/default/admin/report_edit.html:89 +#: templates/web/default/admin/update_edit.html:57 +#: templates/web/zurich/admin/update_edit.html:35 +msgid "Remove photo (can't be undone!)" +msgstr "Remover foto (não pode ser desfeita!)" + +#: templates/web/emptyhomes/header.html:12 +msgid "Report Empty Homes" +msgstr "Relatório Casas vazias, pardeeiros." + +#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 +#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31 +#: templates/web/fiksgatami/footer.html:5 +#: templates/web/fiksgatami/nn/footer.html:5 +#: templates/web/fixmystreet/footer.html:44 +#: templates/web/oxfordshire/footer.html:19 +#: templates/web/reading/footer.html:6 +#: templates/web/seesomething/footer.html:11 +#: templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17 +#: templates/web/zurich/nav_over_content.html:4 +msgid "Report a problem" +msgstr "Comunicar um problema" + +#: templates/web/bromley/report/display.html:28 +#: templates/web/fixmystreet/report/display.html:35 +msgid "Report abuse" +msgstr "Denunciar um abuso" + +#: templates/web/default/report_created.html:1 +#: templates/web/default/report_created.html:3 +#: templates/web/seesomething/report_created.html:0 +#: templates/web/seesomething/report_created.html:8 +msgid "Report created" +msgstr "Relatorio criado" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:295 +msgid "Report on %s" +msgstr "Relatório sobre %s" + +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 +#: templates/web/fixmystreet/around/intro.html:1 +#: templates/web/stevenage/around/intro.html:1 +#: templates/web/zurich/around/intro.html:1 +msgid "Report, view, or discuss local problems" +msgstr "Relatório, vista, ou discutir os problemas locais" + +#: templates/web/default/my/my.html:74 +msgid "Reported %s" +msgstr "Relatado %s" + +#: templates/web/default/my/my.html:72 +msgid "Reported %s, to %s" +msgstr "Reportados %s, para %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: templates/web/default/contact/index.html:45 +#: templates/web/fixmystreet/contact/index.html:58 +msgid "Reported anonymously at %s" +msgstr "Relatado anonimamente em %s" + +#: templates/web/default/admin/questionnaire.html:5 +#: templates/web/default/questionnaire/index.html:77 +#: templates/web/fixmystreet/questionnaire/index.html:71 +msgid "Reported before" +msgstr "Relatado antes" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +msgid "Reported by %s anonymously at %s" +msgstr "Relatado por %s anonimamente em %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/default/contact/index.html:47 +#: templates/web/fixmystreet/contact/index.html:60 +msgid "Reported by %s at %s" +msgstr "Relatado por %s em %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 +msgid "Reported by %s by %s at %s" +msgstr "Relatado por %s por%s em %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +msgid "Reported by %s in the %s category anonymously at %s" +msgstr "Relatado por %s na categoria %s anonimamente em %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +msgid "Reported by %s in the %s category by %s at %s" +msgstr "Relatado por %s na categoria %s por %s em %s" + +#: templates/web/zurich/report/_main.html:2 +msgid "Reported in the %s category" +msgstr "Relatado na categoria %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +msgid "Reported in the %s category anonymously at %s" +msgstr "Relatado na categoria %s anonimamente em %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +msgid "Reported in the %s category by %s at %s" +msgstr "Relatado na categoria %s por %s em %s" + +#: templates/web/default/around/around_index.html:1 +#: templates/web/default/js/translation_strings.html:35 +#: templates/web/default/report/new/fill_in_details.html:0 +#: templates/web/default/report/new/fill_in_details.html:3 +#: templates/web/default/report/new/fill_in_details_form.html:1 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:1 +#: templates/web/fixmystreet/around/around_index.html:2 +#: templates/web/fixmystreet/report/new/fill_in_details.html:0 +#: templates/web/fixmystreet/report/new/fill_in_details.html:5 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/seesomething/around/around_index.html:1 +#: templates/web/seesomething/report/new/fill_in_details_form.html:3 +#: templates/web/zurich/report/new/fill_in_details_form.html:2 +msgid "Reporting a problem" +msgstr "Relatando um problema" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:201 +#: templates/web/seesomething/admin/stats.html:1 +#: templates/web/zurich/header.html:60 +msgid "Reports" +msgstr "Relatórios" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:432 +msgid "Reports are limited to 2000 characters in length. Please shorten your report" +msgstr "Os relatórios são limitadas a 2000 caracteres. Por favor, encurtar o seu relatório" + +#: templates/web/zurich/admin/index-sdm.html:7 +msgid "Reports awaiting approval" +msgstr "Relatórios aguardando aprovação" + +#: templates/web/default/around/tabbed_lists.html:3 +msgid "Reports on and around the map" +msgstr "Relatórios sobre e ao redor do mapa" + +#: templates/web/zurich/admin/index-sdm.html:10 +msgid "Reports published" +msgstr "Os relatórios publicados" + +#: templates/web/default/admin/report_edit.html:71 +msgid "Resend report" +msgstr "Reenviar relatório" + +#: templates/web/default/js/translation_strings.html:22 +msgid "Right place?" +msgstr "Lugar certo?" + +#: perllib/FixMyStreet/Geocode/OSM.pm:173 +msgid "Road operator for this named road (derived from road reference number and type): %s" +msgstr "Operador de estrada por esta estrada chamada (derivado do número de referência estrada e tipo): %s" + +#: perllib/FixMyStreet/Geocode/OSM.pm:170 +msgid "Road operator for this named road (from OpenStreetMap): %s" +msgstr "Operador de estrada por esta estrada chamada (a partir de OpenStreetMap): %s" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: templates/web/default/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:74 +msgid "Rotate Left" +msgstr "Girar para a esquerda" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: templates/web/default/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:75 +msgid "Rotate Right" +msgstr "Girar para a direita" + +#: templates/web/default/admin/body_edit.html:76 +msgid "Save changes" +msgstr "Salvar alterações" + +#: templates/web/default/admin/flagged.html:1 +#: templates/web/default/admin/reports.html:1 +#: templates/web/zurich/admin/reports.html:1 +msgid "Search Reports" +msgstr "Busca Reports" + +#: templates/web/default/admin/users.html:1 +msgid "Search Users" +msgstr "Procurar Usuários" + +#: templates/web/zurich/header.html:77 +msgid "Search reports" +msgstr "elatórios de pesquisa" + +#: templates/web/default/admin/reports.html:5 +#: templates/web/default/admin/users.html:5 +#: templates/web/zurich/admin/reports.html:5 +msgid "Search:" +msgstr "Pesquisar:" + +#: templates/web/default/admin/body-form.html:11 +#: templates/web/zurich/admin/body-form.html:17 +msgid "Select a body" +msgstr "Selecione um corpo" + +#: templates/web/default/admin/body-form.html:21 +#: templates/web/zurich/admin/body-form.html:27 +msgid "Select an area" +msgstr "Selecione uma área" + +#: templates/web/default/alert/_list.html:8 +#: templates/web/fixmystreet/alert/_list.html:10 +msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." +msgstr "Selecione o tipo de alerta fixstreet que você gostaria de receber e clique no botão para um feed RSS ou introduza o seu endereço de email para assinar um alerta de e-mail." + +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +msgid "Sent to %s %s later" +msgstr "Enviado para %s %s mais tarde" + +#: templates/web/default/admin/report_edit.html:71 +msgid "Sent:" +msgstr "Enviar:" + +#: templates/web/default/admin/report_edit.html:73 +#: templates/web/zurich/admin/stats.html:45 +msgid "Service:" +msgstr "Srerviço:" + +#: templates/web/fixmystreet/report/display.html:41 +msgid "Share" +msgstr "Acçao" + +#: templates/web/bromley/report/display.html:205 +#: templates/web/bromley/report/new/fill_in_details_form.html:129 +#: templates/web/bromley/report/new/fill_in_details_form.html:175 +#: templates/web/default/report/new/fill_in_details_form.html:210 +#: templates/web/default/report/update-form.html:157 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 +#: templates/web/fixmystreet/report/update-form.html:144 +msgid "Show my name publicly" +msgstr "Mostrar meu nome publicamente" + +#: templates/web/default/around/display_location.html:69 +msgid "Show old" +msgstr "Mostrar antigo" + +#: templates/web/default/around/display_location.html:60 +msgid "Show pins" +msgstr "Mostrar pins" + +#: templates/web/default/auth/general.html:3 +#: templates/web/default/auth/general.html:49 +#: templates/web/fixmybarangay/header.html:70 +#: templates/web/fixmystreet/auth/general.html:3 +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/auth/general.html:62 +#: templates/web/fixmystreet/header.html:54 +#: templates/web/oxfordshire/header.html:115 +#: templates/web/seesomething/auth/general.html:3 +#: templates/web/seesomething/auth/general.html:39 +#: templates/web/stevenage/header.html:101 +#: templates/web/zurich/auth/general.html:18 +#: templates/web/zurich/auth/general.html:35 +msgid "Sign in" +msgstr "Entrar" + +#: templates/web/default/auth/general.html:74 +msgid "Sign in by email" +msgstr "Entrar por email" + +#: templates/web/default/auth/general.html:1 +#: templates/web/fixmystreet/auth/general.html:1 +#: templates/web/seesomething/auth/general.html:1 +#: templates/web/zurich/auth/general.html:1 +msgid "Sign in or create an account" +msgstr "Entar e crear uma conta" + +#: templates/web/bromley/auth/sign_out.html:1 +#: templates/web/default/auth/sign_out.html:1 +#: templates/web/default/header.html:30 +#: templates/web/emptyhomes/header.html:46 +#: templates/web/fiksgatami/header.html:22 +#: templates/web/fiksgatami/nn/header.html:22 +#: templates/web/lichfielddc/header.html:177 +#: templates/web/reading/header.html:33 +#: templates/web/seesomething/auth/sign_out.html:1 +#: templates/web/zurich/auth/sign_out.html:1 +msgid "Sign out" +msgstr "Sair " + +#: templates/web/default/header.html:29 +#: templates/web/emptyhomes/header.html:45 +#: templates/web/fiksgatami/header.html:21 +#: templates/web/fiksgatami/nn/header.html:21 +#: templates/web/lichfielddc/header.html:177 +#: templates/web/reading/header.html:32 +msgid "Signed in as %s" +msgstr "Entrou como %s" + +#: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 +msgid "Some categories may require additional information." +msgstr "Algumas categorias podem solicitar informações adicionais." + +#: templates/web/default/alert/index.html:42 +#: templates/web/fixmybarangay/alert/index.html:32 +msgid "Some photos of recent reports" +msgstr "Fotos de reports recentes" + +#: perllib/FixMyStreet/App/View/Email.pm:32 +#: perllib/FixMyStreet/App/View/Web.pm:44 +msgid "Some text to localize" +msgstr "Algum informaçao para localizar" + +#: perllib/FixMyStreet/Cobrand/UK.pm:93 +msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." +msgstr "Desculpe, codigo postal nao coincide. Area nao comprrendida." + +#: templates/web/default/tokens/abuse.html:5 +msgid "Sorry, there has been an error confirming your problem." +msgstr "Desculpe, houve um erro ao confirmar o seu problema." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 +#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 +#: perllib/FixMyStreet/Geocode/Google.pm:74 +#: perllib/FixMyStreet/Geocode/OSM.pm:66 +msgid "Sorry, we could not find that location." +msgstr "Desculpe, não conseguimos encontrar esse local." + +#: perllib/FixMyStreet/Geocode/Bing.pm:53 +#: perllib/FixMyStreet/Geocode/Google.pm:69 +#: perllib/FixMyStreet/Geocode/Zurich.pm:87 +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." + +#: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/nn/footer.html:16 +msgid "Source code" +msgstr "O código-fonte" + +#: templates/web/default/admin/stats.html:64 +msgid "Start Year:" +msgstr "Ano:" + +#: templates/web/default/admin/stats.html:66 +msgid "Start day:" +msgstr "Dia:" + +#: templates/web/default/admin/stats.html:65 +msgid "Start month:" +msgstr "Mes:" + +#: templates/web/bromley/report/display.html:78 +#: templates/web/default/admin/flagged.html:13 +#: templates/web/default/admin/list_updates.html:7 +#: templates/web/default/admin/reports.html:15 +#: templates/web/fixmystreet/report/update-form.html:26 +msgid "State" +msgstr "Estado" + +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/update_edit.html:17 +msgid "State:" +msgstr "Estado" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:216 +#: templates/web/default/admin/stats.html:1 +#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 +msgid "Stats" +msgstr "Stats" + +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 +msgid "Status" +msgstr "Status" + +#: templates/web/default/report/updates.html:10 +msgid "Still open, via questionnaire, %s" +msgstr "Ainda em aberto, via questionário, %s" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 +msgid "Subcategory: %s" +msgstr "Subcategoria: %s" + +#: templates/web/zurich/admin/index-dm.html:27 +msgid "Subdivision/Body" +msgstr "Zona / Bairro" + +#: templates/web/bromley/report/new/fill_in_details_form.html:48 +#: templates/web/fixmystreet/contact/index.html:91 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 +msgid "Subject" +msgstr "Assunto:" + +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/contact/index.html:83 +#: templates/web/default/report/new/fill_in_details_form.html:52 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 +#: templates/web/zurich/admin/report_edit.html:35 +msgid "Subject:" +msgstr "Assunto:" + +#: templates/web/bromley/report/new/fill_in_details_form.html:140 +#: templates/web/bromley/report/new/fill_in_details_form.html:190 +#: templates/web/bromley/report/new/fill_in_details_form.html:204 +#: templates/web/default/questionnaire/creator_fixed.html:19 +#: templates/web/default/report/new/fill_in_details_form.html:114 +#: templates/web/default/report/new/fill_in_details_form.html:154 +#: templates/web/default/report/new/fill_in_details_form.html:176 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:144 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212 +#: templates/web/seesomething/report/new/fill_in_details_form.html:93 +#: templates/web/zurich/report/new/fill_in_details_form.html:111 +msgid "Submit" +msgstr "Submeter" + +#: templates/web/default/admin/report_edit.html:92 +#: templates/web/default/admin/update_edit.html:60 +#: templates/web/default/admin/user-form.html:17 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:204 +#: templates/web/zurich/admin/update_edit.html:38 +msgid "Submit changes" +msgstr "Submeter alteraçoes" + +#: templates/web/default/questionnaire/index.html:116 +#: templates/web/fixmystreet/questionnaire/index.html:105 +msgid "Submit questionnaire" +msgstr "Submeter questionario" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:6 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-dm.html:6 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:88 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/report/banner.html:9 +msgid "Submitted" +msgstr "Submitido" + +#: templates/web/bromley/report/display.html:44 +#: templates/web/default/alert/updates.html:17 +#: templates/web/default/report/display.html:42 +#: templates/web/fixmystreet/alert/updates.html:23 +#: templates/web/fixmystreet/report/display.html:68 +msgid "Subscribe" +msgstr "Subscrever" + +#: templates/web/default/alert/_list.html:97 +#: templates/web/fixmybarangay/alert/_list.html:42 +#: templates/web/fixmystreet/alert/_list.html:92 +msgid "Subscribe me to an email alert" +msgstr "Subcrever um alerta de e-mail" + +#: templates/web/fixmybarangay/alert/_list.html:6 +msgid "Subscribe to an alert based upon what baranagay you’re in:" +msgstr "Subcrever um alerta baseado no que baranagay você está em:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:200 +#: templates/web/default/admin/index.html:1 +#: templates/web/zurich/admin/index-dm.html:1 +#: templates/web/zurich/admin/index-sdm.html:1 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 +#: templates/web/zurich/header.html:57 +msgid "Summary" +msgstr "Resumo" + +#: templates/web/default/reports/index.html:1 +#: templates/web/emptyhomes/reports/index.html:1 +#: templates/web/fiksgatami/nn/reports/index.html:1 +#: templates/web/fiksgatami/reports/index.html:1 +#: templates/web/fixmybarangay/reports/index.html:1 +#: templates/web/zurich/reports/index.html:0 +#: templates/web/zurich/reports/index.html:4 +msgid "Summary reports" +msgstr "Resumo reports" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 +msgid "Survey" +msgstr "Teste" + +#: templates/web/default/admin/questionnaire.html:1 +msgid "Survey Results" +msgstr "Resultados teste" + +#: templates/web/default/admin/list_updates.html:15 +#: templates/web/zurich/admin/list_updates.html:8 +msgid "Text" +msgstr "Texto" + +#: templates/web/default/admin/body.html:18 +msgid "Text only version" +msgstr "Somente versao texto" + +#: templates/web/default/admin/update_edit.html:20 +#: templates/web/zurich/admin/update_edit.html:12 +msgid "Text:" +msgstr "Texto:" + +#: templates/web/default/tokens/confirm_update.html:7 +#: templates/web/default/tokens/confirm_update.html:8 +msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." +msgstr "Obrigado - você pode <a href=\"%s\"> ver o seu problema atualizados </a> no site." + +#: templates/web/emptyhomes/tokens/confirm_problem.html:6 +#: templates/web/emptyhomes/tokens/confirm_problem.html:8 +msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible." +msgstr "Obrigado por relatar um imóvel vazio em ReportEmptyHomes.com. Temos enviado o oficial de ligação para as casas vazias no conselho responsável, com detalhes, e pediu-lhes para fazer o que puder para obter a propriedade vazia novamente em uso o mais rápido possível." + +#: templates/web/emptyhomes/tokens/confirm_problem.html:30 +#: templates/web/emptyhomes/tokens/confirm_problem.html:31 +msgid "" +"Thank you for reporting this empty property on ReportEmptyHomes.com.\n" +"At present the report cannot be sent through to the council for this area. We\n" +"are working with councils to link them into the system so that as many areas\n" +"as possible will be covered." +msgstr "" +"Obrigado por relatar essa propriedade vazia na ReportEmptyHomes.com. ⏎\n" +"Actualmente, o relatório não pode ser enviado através do Conselho para esta área. Nós ⏎\n" +"estão trabalhando com os conselhos de vincular-los no sistema de modo que o maior número de áreas ⏎\n" +"quanto possível será coberto." + +#: templates/web/default/tokens/error.html:7 +msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." +msgstr "Obrigado por tentar confirmar a sua atualização ou problema. Parece que temos um erro a nós mesmos, porém, assim <a href=\"%s\"> por favor deixe-nos saber o que aconteceu </a> e vamos olhar para ele." + +#: templates/web/emptyhomes/tokens/confirm_problem.html:24 +#: templates/web/emptyhomes/tokens/confirm_problem.html:26 +msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK’s empty homes crisis." +msgstr "Obrigado por usar ReportEmptyHomes.com. Sua ação já está ajudando a resolver vazio crise casas em Mindelo." + +#: templates/web/fixmystreet/around/around_index.html:27 +msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" +msgstr "Obrigado por upload de sua foto. Precisamos agora de localizar o seu problema, então digite um nome de rua nas proximidades ou código postal na caixa acima:" + +#: templates/web/default/contact/submit.html:8 +msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +msgstr "Obrigado pelo seu feedback. Nós vamos responder o mais rapidamente possível!" + +#: templates/web/default/questionnaire/creator_fixed.html:9 +msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" +msgstr "Obrigado, gratos em ouvir que o problema foi corrigido! Podemos apenas perguntar se você já relatou um problema para um conselho antes?" + +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 +msgid "That image doesn't appear to have uploaded correctly (%s), please try again." +msgstr "Essa imagem não parece ter sido carregada corretamente (%s), por favor, tente novamente." + +#: perllib/FixMyStreet/App/Controller/Council.pm:90 +msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." +msgstr "Esse local não parece ser coberto por um conselho, talvez seja no mar ou fora do país. Por favor, tente novamente." + +#: perllib/FixMyStreet/App/Controller/Location.pm:123 +msgid "That location does not appear to be in the UK; please try again." +msgstr "Esse local não parece estar em Mindelo, por favor tente novamente." + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 +#: perllib/FixMyStreet/Cobrand/UK.pm:86 +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:683 +msgid "That problem will now be resent." +msgstr "Esse problema agora será reenviado e reportado ao conselho." + +#: perllib/FixMyStreet/App/Controller/Report.pm:117 +msgid "That report cannot be viewed on %s." +msgstr "Esse relatório não pode ser visualizado em %s." + +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +msgid "That report has been removed from FixMyStreet." +msgstr "Esse relatório foi removido FixMyStreetMIndelo" + +#: templates/web/default/open311/index.html:92 +msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." +msgstr "O Open311 v2 atributo agency_responsible é usada para listar as administrações que receberam o relatório de problemas, o que não é muito a forma como o atributo é definido na especificação v2 Open311." + +#: templates/web/default/auth/token.html:19 +#: templates/web/default/email_sent.html:6 +msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." +msgstr "O e-mail de confirmação <strong> Maio </strong> levar alguns minutos para chegar - <em> por favor </em>, seja paciente." + +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 +msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." +msgstr "O conselho não vai ser capaz de ajudar a menos que você deixe o máximo de detalhes possível. Por favor, descreva a localização exata do problema (por exemplo, em uma parede, passeio, pavimento, iluminaçao), o que é, quanto tempo ele tem estado lá, uma descrição (e uma foto do problema se você tiver um), e outras informaçoes uteis." + +#: templates/web/fixmystreet/questionnaire/index.html:43 +msgid "The details of your problem are available from the other tab above." +msgstr "Os detalhes do seu problema estão disponíveis na outra aba acima." + +#: templates/web/default/questionnaire/index.html:49 +msgid "The details of your problem are available on the right hand side of this page." +msgstr "Os detalhes do seu problema estão disponíveis no lado direito desta página." + +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +msgid "The error was: %s" +msgstr "O erro foi: %s" + +#: templates/web/default/open311/index.html:88 +msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." +msgstr "Os seguintes atributos Open311 v2 são devolvidos para cada solicitação: service_request_id, descrição, lat, long, MEDIA_URL, status, requested_datetime, updated_datetime, service_code e service_name." + +#: perllib/FixMyStreet/Geocode/OSM.pm:165 +msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." +msgstr "As seguintes informações sobre a estrada mais próxima pode ser imprecisas ou irrelevantes, se o problema está perto de várias estradas ou perto de uma estrada sem nome registrado no OpenStreetMap." + +#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27 +#: db/alert_types.pl:31 +msgid "The latest local problems reported by users" +msgstr "Os últimos problemas locais relatados por usuários" + +#: db/alert_types_eha.pl:13 +msgid "The latest local reports reported by users" +msgstr "Os últimos relatórios locais relatados por usuários" + +#: db/alert_types.pl:35 +msgid "The latest problems for {{COUNCIL}} reported by users" +msgstr "Os últimos problemas para {{}} CONSELHO relatados por usuários" + +#: db/alert_types.pl:39 +msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users" +msgstr "Os últimos problemas para {{CONSELHO}} {{dentro WARD}} ala relatados por usuários" + +#: db/alert_types.pl:11 +msgid "The latest problems reported by users" +msgstr "Os últimos problemas relatados por usuários" + +#: db/alert_types.pl:15 +msgid "The latest problems reported fixed by users" +msgstr "Os últimos problemas relatados fixado por usuários" + +#: db/alert_types.pl:43 +msgid "The latest problems within {{NAME}}'s boundary reported by users" +msgstr "Os últimos problemas dentro de {{NAME}} 's fronteira relatados por usuários" + +#: db/alert_types_eha.pl:9 +msgid "The latest properties reported back to use by users" +msgstr "As propriedades mais relatadas de usar por usuários" + +#: db/alert_types_eha.pl:20 +msgid "The latest reports for {{COUNCIL}} reported by users" +msgstr "Os últimos relatórios para {{}} CONSELHO relatados por usuários" + +#: db/alert_types_eha.pl:24 +msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" +msgstr "Os últimos relatórios para {{CONSELHO}} {{dentro WARD}} ala relatados por usuários" + +#: db/alert_types_eha.pl:28 +msgid "The latest reports within {{NAME}}'s boundary reported by users" +msgstr "Os últimos relatórios dentro de {{NAME}} 's fronteira relatados por usuários" + +#: templates/web/default/auth/change_password.html:12 +#: templates/web/default/auth/change_password.html:16 +msgid "The passwords do not match" +msgstr "As senhas não são iguais" + +#: templates/web/default/errors/page_error_404_not_found.html:10 +#: templates/web/default/errors/page_error_404_not_found.html:12 +msgid "The requested URL '%s' was not found on this server" +msgstr " A URL solicitada '%s' não foi encontrada neste servidor" + +#: templates/web/default/alert/_list.html:14 +#: templates/web/fixmystreet/alert/_list.html:16 +msgid "The simplest alert is our geographic one:" +msgstr "O alerta mais simples é o nosso único ponto localizaçao geográfica:" + +#: templates/web/barnet/report/new/councils_text_all.html:3 +#: templates/web/default/report/new/councils_extra_text.html:1 +#: templates/web/default/report/new/councils_text_some.html:10 +#: templates/web/default/report/new/councils_text_some.html:11 +#: templates/web/default/report/new/fill_in_details_form.html:17 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +msgid "The subject and details of the problem will be public, plus your name if you give us permission." +msgstr "O tema e os detalhes do problema serão públicos, além de seu nome se você nos der permissão." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +msgid "The user could not locate the problem on a map, but to see the area around the location they entered" +msgstr "O usuário não conseguiu localizar o problema em um mapa, localizar a area mais proxima do local" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 +msgid "There was a problem showing the All Reports page. Please try again later." +msgstr "Houve um problema ao mostrar a página de todos os relatórios. Por favor, tente novamente mais tarde." + +#: perllib/FixMyStreet/App/Controller/Contact.pm:116 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +msgid "There was a problem showing this page. Please try again later." +msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mais tarde." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 +#: templates/web/default/auth/general.html:23 +#: templates/web/fixmystreet/auth/general.html:24 +#: templates/web/seesomething/auth/general.html:24 +#: templates/web/zurich/auth/general.html:28 +msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘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." + +#: perllib/FixMyStreet/App/Controller/Alert.pm:355 +msgid "There was a problem with your email/password combination. Please try again." +msgstr "Houve um problema com o email / combinação de senha. Por favor, tente novamente." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +msgid "There was a problem with your update. Please try again." +msgstr "Houve um problema com a sua atualização. Por favor, tente novamente." + +#: perllib/FixMyStreet/App/Controller/Contact.pm:120 +msgid "There were problems with your report. Please see below." +msgstr "Houve problemas com o seu relatório. Por favor, veja abaixo." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:299 +msgid "There were problems with your update. Please see below." +msgstr "Houve problemas com a sua atualização. Por favor, veja abaixo." + +#: templates/web/default/open311/index.html:79 +msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." +msgstr "Esta implementação API é um trabalho em andamento e ainda não estabilizou. Ela vai mudar sem avisos no futuro." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 +msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." +msgstr "Este e-mail foi enviado para ambos os conselhos que cobrem o local do problema, como o usuário não categorizá-lo, por favor, ignorar se você não é o conselho correto para lidar com o problema, ou deixe-nos saber que categoria de problema é para que possamos adicioná-lo ao nosso sistema." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." +msgstr "Este e-mail foi enviado para vários conselhos que cobrem o local do problema, como a categoria selecionada é fornecida para todos eles, por favor, ignorar se você não é o conselho correto para lidar com o problema." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 +#: perllib/FixMyStreet/Cobrand/UK.pm:58 +msgid "This information is required" +msgstr "Esta informação é necessária" + +#: templates/web/default/debug_header.html:3 +msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." +msgstr "Este é um site do desenvolvedor, as coisas podem quebrar a qualquer momento, e o banco de dados serão apagados periodicamente." + +#: templates/web/fixmybarangay/reports/index.html:7 +msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." +msgstr "Este é um resumo de todos os relatórios sobre este site, selecionar um barangay especial para ver os relatórios enviados para lá.." + +#: templates/web/emptyhomes/reports/index.html:4 +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." +msgstr "" + +#: templates/web/default/reports/index.html:7 +#: templates/web/fiksgatami/nn/reports/index.html:4 +#: templates/web/fiksgatami/reports/index.html:4 +msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." +msgstr "Este é um resumo de todos os relatórios sobre este site, selecionar um conselho especial para ver os relatórios enviados para lá." + +#: templates/web/default/auth/token.html:9 +msgid "This may be because the link is too old or already used, or the address was not copied correctly." +msgstr "Isso pode ser porque o link é velho demais ou já foi utilizado, ou o endereço não foi copiado corretamente." + +#: templates/web/default/report/banner.html:15 +msgid "This problem has been closed" +msgstr "Este problema esta solucionado." + +#: templates/web/bromley/report/display.html:98 +#: templates/web/default/report/banner.html:12 +#: templates/web/default/report/update-form.html:48 +#: templates/web/emptyhomes/report/banner.html:3 +#: templates/web/fixmystreet/report/update-form.html:46 +msgid "This problem has been fixed" +msgstr "Este problema foi resolvido" + +#: templates/web/bromley/report/display.html:92 +#: templates/web/default/report/update-form.html:43 +#: templates/web/fixmystreet/report/update-form.html:40 +msgid "This problem has not been fixed" +msgstr "Este problema não foi corrigido" + +#: templates/web/default/report/banner.html:19 +msgid "This problem is in progress" +msgstr "Este problema está em progresso" + +#: templates/web/default/report/banner.html:9 +msgid "This problem is old and of unknown status." +msgstr "Este problema é antigo e de status desconhecido." + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 +#: templates/web/zurich/report/_main.html:14 +msgid "This report is awaiting moderation." +msgstr "Este relatório está aguardando moderação." + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +msgid "This report is currently marked as closed." +msgstr "Este relatório está marcado como fechado." + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +msgid "This report is currently marked as fixed." +msgstr "Este relatório está marcado como fixo." + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +msgid "This report is currently marked as open." +msgstr "Este relatório está marcado como aberto." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 +msgid "This report was submitted anonymously" +msgstr "Este relatório foi enviado anonimamente" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 +msgid "This web page also contains a photo of the problem, provided by the user." +msgstr "Esta página também contém uma foto do problema, fornecido pelo usuário." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#: templates/web/default/admin/timeline.html:1 +msgid "Timeline" +msgstr "Timeline" + +#: templates/web/default/admin/flagged.html:10 +#: templates/web/default/admin/reports.html:12 +msgid "Title" +msgstr "Titulo" + +#: templates/web/default/around/_report_banner.html:2 +msgid "To <strong>report a problem</strong>, click on the map at the correct location." +msgstr "Para <strong> relatar um problema </strong>, clique no mapa no local correto." + +#: templates/web/default/alert/index.html:27 +msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" +msgstr "Para descobrir quais os alertas locais que temos para si, deve inserir o seu código postal ou nome de rua e área ou zona" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 +msgid "To view a map of the precise location of this issue" +msgstr "Para ver no mapa a localização exata desse problema" + +#: templates/web/default/admin/index.html:36 +#: templates/web/default/admin/questionnaire.html:24 +#: templates/web/default/admin/stats.html:24 +#: templates/web/default/admin/stats.html:43 +#: templates/web/zurich/admin/stats.html:30 +msgid "Total" +msgstr "Total" + +#: templates/web/seesomething/report/new/fill_in_details_form.html:24 +msgid "Transport Category" +msgstr "Categoria Transporte" + +#: templates/web/default/js/translation_strings.html:23 +msgid "Try again" +msgstr "Tente novamente" + +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:33 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:31 +msgid "Unable to fix" +msgstr "Incapaz de ser resolvido" + +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:59 +#: templates/web/zurich/admin/update_edit.html:18 +msgid "Unconfirmed" +msgstr "Não confirmado" + +#: templates/web/fixmystreet/report/banner.html:9 +msgid "Unknown" +msgstr "Desconhecido" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +msgid "Unknown alert type" +msgstr "Tipo de alerta desconhecido" + +#: templates/web/default/js/translation_strings.html:33 +msgid "Unknown error" +msgstr "Erro desconhecido" + +#: perllib/FixMyStreet/App/Controller/Report.pm:106 +msgid "Unknown problem ID" +msgstr "Desconhecido problema com ID" + +#: templates/web/bromley/report/display.html:66 +#: templates/web/fixmystreet/report/update-form.html:19 +msgid "Update" +msgstr "Actualizar" + +#: templates/web/default/admin/timeline.html:33 +msgid "Update %s created for problem %d; by %s" +msgstr "Atualize %s criado para o problema de %d; por %s" + +#: templates/web/default/contact/index.html:21 +#: templates/web/fixmystreet/contact/index.html:34 +msgid "Update below added anonymously at %s" +msgstr "Atualize abaixo colocado de forma anónima em %s" + +#: templates/web/default/contact/index.html:23 +#: templates/web/fixmystreet/contact/index.html:36 +msgid "Update below added by %s at %s" +msgstr "Actualizar abaixo adicionado por %s em %s" + +#: templates/web/default/admin/body-form.html:82 +#: templates/web/zurich/admin/body-form.html:47 +msgid "Update body" +msgstr "Atualize corpo" + +#: templates/web/default/admin/index.html:30 +msgid "Update breakdown by state" +msgstr "Atualize repartição por Estado" + +#: db/alert_types.pl:7 +msgid "Update by {{name}}" +msgstr "Atualize por {{name}}" + +#: templates/web/default/admin/update_edit.html:42 +#: templates/web/zurich/admin/update_edit.html:25 +msgid "Update changed problem state to %s" +msgstr "Alterado a actualizaçao do estado do problema para %s" + +#: templates/web/default/admin/update_edit.html:44 +msgid "Update marked problem as fixed" +msgstr "Atualizaçao do problema marcado como fixo" + +#: templates/web/default/admin/update_edit.html:46 +msgid "Update reopened problem" +msgstr "Reaberto a actualizaçao do problema" + +#: templates/web/default/admin/body.html:65 +msgid "Update statuses" +msgstr "Atualizar status" + +#: templates/web/default/report/update-form.html:22 +msgid "Update:" +msgstr "Actualizar:" + +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 +msgid "Updated" +msgstr "Atualizado" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:972 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:488 +msgid "Updated!" +msgstr "Actualizado!" + +#: templates/web/default/admin/list_updates.html:2 +#: templates/web/default/report/update.html:3 +#: templates/web/fixmystreet/report/update.html:3 +#: templates/web/zurich/admin/list_updates.html:2 +#: templates/web/zurich/report/updates.html:2 +msgid "Updates" +msgstr "Actualizaçoes" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:150 +msgid "Updates are limited to 2000 characters in length. Please shorten your update" +msgstr "As atualizações são limitadas a 2000 caracteres. Por favor, encurtar a sua atualização" + +#: db/alert_types.pl:5 db/alert_types.pl:6 +msgid "Updates on {{title}}" +msgstr "Atualizações sobre {{título}}" + +#: templates/web/bromley/report/display.html:0 +#: templates/web/bromley/report/display.html:8 +#: templates/web/default/report/display.html:0 +#: templates/web/default/report/display.html:5 +#: templates/web/fixmystreet/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:8 +msgid "Updates to this problem, FixMyStreet" +msgstr "Atualizações para este problema, FixMyStreetMindelo" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 +msgid "User flag removed" +msgstr "Bandeira usuário removida" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +msgid "User flagged" +msgstr "Usuário sinalizado" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:215 +#: templates/web/default/admin/flagged.html:24 +#: templates/web/zurich/header.html:69 +msgid "Users" +msgstr "Usuários" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +msgid "Values updated" +msgstr "Valores atualizados" + +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:23 +#: templates/web/zurich/admin/update_edit.html:10 +msgid "View report on site" +msgstr "Ver relatório no site" + +#: templates/web/default/reports/body.html:14 +msgid "View reports by ward" +msgstr "Exibir relatórios por Ward" + +#: templates/web/emptyhomes/tokens/confirm_problem.html:39 +msgid "View your report" +msgstr "Ver o seu relatório" + +#: templates/web/default/around/display_location.html:0 +#: templates/web/default/around/display_location.html:34 +#: templates/web/seesomething/around/display_location.html:0 +#: templates/web/seesomething/around/display_location.html:16 +msgid "Viewing a location" +msgstr "Visualizando um local" + +#: templates/web/bromley/report/display.html:0 +#: templates/web/default/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:0 +msgid "Viewing a problem" +msgstr "Visualizando um problema" + +#: templates/web/default/reports/body.html:16 +msgid "Wards of this council" +msgstr "Wards deste conselho" + +#: templates/web/default/alert/choose.html:6 +#: templates/web/default/around/around_index.html:13 +#: templates/web/fixmystreet/around/around_index.html:16 +#: templates/web/seesomething/around/around_index.html:13 +msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." +msgstr "Encontramos mais de uma correspondência para essa localização. Mostramos até dez partidas, por favor tente uma pesquisa diferente se não estiver aqui." + +#: templates/web/default/auth/token.html:8 +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." + +#: templates/web/default/auth/token.html:16 +msgid "We have sent you an email containing a link to confirm your account." +msgstr "Nós enviamos um e-mail contendo um link para confirmar sua conta." + +#: templates/web/emptyhomes/tokens/confirm_problem.html:18 +#: templates/web/emptyhomes/tokens/confirm_problem.html:20 +msgid "We may contact you periodically to ask if anything has changed with the property you reported." +msgstr "Podemos contactá-lo periodicamente para perguntar se alguma coisa mudou com a propriedade que você relatou." + +#: templates/web/bromley/report/display.html:143 +#: templates/web/fixmystreet/report/update-form.html:115 +msgid "We never show your email" +msgstr "Nós nunca divulgaremos o seu e-mail" + +#: templates/web/bromley/report/new/fill_in_details_form.html:133 +#: templates/web/bromley/report/new/fill_in_details_form.html:179 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 +#: templates/web/zurich/report/new/fill_in_details_form.html:96 +msgid "We never show your email address or phone number." +msgstr "Nós nunca divulgaremos o seu endereço de e-mail ou número de telefone." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 +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/default/index-steps.html:31 +msgid "We send it to the council on your behalf" +msgstr "Nós enviá-lo para o conselho em seu nome" + +#: templates/web/bromley/report/new/fill_in_details_form.html:217 +#: templates/web/default/report/new/notes.html:5 +#: templates/web/fixmybarangay/report/new/notes.html:5 +msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>" +msgstr "Nós só usamos as suas informações pessoais de acordo com a nossa <a href=\"/faq#privacy\">política de privacidade.</a>" + +#: templates/web/fixmystreet/report/new/notes.html:4 +#: templates/web/oxfordshire/report/new/notes.html:4 +msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" +msgstr "Nós só usamos as suas informações pessoais de acordo com a nossa <a href=\"/privacy\"> política de privacidade.</a>" + +#: templates/web/emptyhomes/contact/blurb.html:2 +msgid "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>." +msgstr "Adoraríamos ouvir o que você pensa sobre este website. Basta preencher o formulário.Dê a sua openiao sobre fixmystreetMindelo. Por favor, não entre em contato conosco sobre casas vazias individuais; usar a caixa acessado a partir <a href=\"/\"> primeira página </a>." + +#: templates/web/default/contact/blurb.html:8 +msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +msgstr "Adoraríamos ouvir o que você pensa sobre este site. Basta preencher o formulário, ou envie um e-mail para <a href='mailto:%s'>%s</a>:" + +#: templates/web/default/admin/body.html:43 +#: templates/web/default/admin/body_edit.html:82 +#: templates/web/zurich/admin/body.html:17 +msgid "When edited" +msgstr "Quando editar" + +#: templates/web/default/admin/problem_row.html:35 +msgid "When sent" +msgstr "Quando enviar" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +msgid "Whole block of empty flats" +msgstr "Bloco inteiro de apartamentos vazios" + +#: templates/web/default/open311/index.html:94 +msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." +msgstr "Com o pedido de pesquisa, também é possível pesquisar agency_responsavel para limitar as solicitações às enviados para uma única administração. O termo de pesquisa é a identificação de administração fornecidos pela <a href=\"%s\"> MapIt </a>." + +#: templates/web/fixmystreet/footer.html:21 +#: templates/web/stevenage/footer.html:22 +msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>." +msgstr "Gostaria de uma melhor integração com FixMyStreet <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\"> Descobre FixMyStreet para os conselhos </a>." + +#: templates/web/fixmystreet/footer.html:17 +#: templates/web/stevenage/footer.html:18 +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." +msgstr "Gostaria de contribuir para FixMyStreet Nosso código é open source e <a href=\"http://github.com/mysociety/fixmystreet\"> disponível no GitHub </a>." + +#: templates/web/default/questionnaire/index.html:106 +#: templates/web/fixmystreet/questionnaire/index.html:96 +msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" +msgstr "Gostaria de receber um questionário em 4 semanas, lembrando que você verifique o status?" + +#: templates/web/default/report/new/notes.html:8 +#: templates/web/fixmybarangay/report/new/notes.html:8 +#: templates/web/fixmystreet/report/new/notes.html:8 +#: templates/web/oxfordshire/report/new/notes.html:7 +msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." +msgstr "Escrever a mensagem inteiramente em letras maiúsculas torna difícil de ler, assim como a falta de pontuação." + +#: templates/web/default/admin/stats.html:10 +msgid "Year" +msgstr "Ano" + +#: templates/web/default/admin/body.html:50 +#: templates/web/default/admin/body.html:51 +#: templates/web/default/admin/body.html:52 +#: templates/web/default/admin/body_edit.html:5 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:63 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:24 +#: templates/web/default/admin/users.html:26 +#: templates/web/default/questionnaire/creator_fixed.html:14 +#: templates/web/default/questionnaire/index.html:109 +#: templates/web/default/questionnaire/index.html:66 +#: templates/web/fixmystreet/questionnaire/index.html:60 +#: templates/web/fixmystreet/questionnaire/index.html:99 +msgid "Yes" +msgstr "Sim" + +#: templates/web/bromley/report/display.html:157 +#: templates/web/bromley/report/new/fill_in_details_form.html:198 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 +#: templates/web/fixmystreet/report/update-form.html:89 +msgid "Yes I have a password" +msgstr "Sim, tenho uma password" + +#: templates/web/default/contact/index.html:37 +#: templates/web/fixmystreet/contact/index.html:50 +msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" +msgstr "Você está reportando o seguinte relatório de problema por ser abusiva, contendo informações pessoais, ou similar:" + +#: templates/web/default/contact/index.html:15 +#: templates/web/fixmystreet/contact/index.html:28 +msgid "You are reporting the following update for being abusive, containing personal information, or similar:" +msgstr "Você está reportando a seguinte atualização por ser abusiva, contendo informações pessoais, ou similar:" + +#: templates/web/default/tokens/confirm_problem.html:19 +#: templates/web/default/tokens/confirm_problem.html:21 +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:8 +msgid "You can <a href=\"%s%s\">view the problem on this site</a>." +msgstr "Você pode <a href=\"%s%s\"> ver o problema neste site </a>." + +#: templates/web/default/report/new/councils_text_none.html:11 +#: templates/web/default/report/new/councils_text_none.html:13 +#: templates/web/default/report/new/councils_text_some.html:20 +#: templates/web/default/report/new/councils_text_some.html:22 +msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." +msgstr "Você pode nos ajudar a encontrar um endereço de e-mail de contato para os problemas locais para %s e e-mail para nós em <a href='mailto:%s'>%s</a>." + +#: templates/web/default/js/translation_strings.html:30 +msgid "You declined; please fill in the box above" +msgstr "Você recusou, por favor preencha o quadro de cima" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 +msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" +msgstr "Você já respondeu a este questionário. Se você tem uma pergunta, por favor <a href='%s'> entrar em contato </a>, ou <a href='%s'> ver o seu problema </a>. \n" + +#: templates/web/bromley/report/new/fill_in_details_form.html:97 +#: templates/web/default/questionnaire/index.html:96 +#: templates/web/default/report/new/fill_in_details_form.html:93 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90 +#: templates/web/fixmystreet/questionnaire/index.html:87 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99 +#: templates/web/seesomething/report/new/fill_in_details_form.html:59 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 +msgid "You have already attached a photo to this report, attaching another one will replace it." +msgstr "Você já anexou uma foto com este relatório, anexando outro irá substituí-lo." + +#: templates/web/bromley/report/display.html:108 +#: templates/web/default/report/update-form.html:59 +#: templates/web/fixmystreet/report/update-form.html:56 +msgid "You have already attached a photo to this update, attaching another one will replace it." +msgstr "Você já anexou uma foto a esta atualização, anexando outra irá substituí-la." + +#: templates/web/default/auth/sign_out.html:3 +#: templates/web/seesomething/auth/sign_out.html:3 +#: templates/web/zurich/auth/sign_out.html:3 +msgid "You have been signed out" +msgstr "Voce foi logado fora" + +#: templates/web/bromley/report/new/fill_in_details_form.html:25 +#: templates/web/default/report/new/fill_in_details_form.html:7 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 +#: templates/web/zurich/report/new/fill_in_details_form.html:13 +msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " +msgstr "Você localizou o problema no ponto marcado com um pino verde no mapa. Se este não é o local correto, basta clicar no mapa novamente." + +#: templates/web/default/tokens/confirm_alert.html:7 +msgid "You have successfully confirmed your alert." +msgstr "Você confirmou com sucesso o seu alerta." + +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:6 +msgid "You have successfully confirmed your email address." +msgstr "Você confirmou com sucesso o seu endereço de e-mail." + +#: templates/web/default/tokens/confirm_problem.html:14 +#: templates/web/default/tokens/confirm_problem.html:15 +msgid "You have successfully confirmed your problem" +msgstr "Você confirmou com sucesso o seu problema" + +#: templates/web/default/tokens/confirm_update.html:11 +#: templates/web/default/tokens/confirm_update.html:12 +msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." +msgstr "Você confirmou com êxito a sua atualização e agora você pode <a href=\"%s\"> vê-lo no site </a>." + +#: templates/web/default/tokens/confirm_alert.html:11 +msgid "You have successfully created your alert." +msgstr "Você criou com sucesso o seu alerta." + +#: templates/web/default/tokens/confirm_alert.html:9 +msgid "You have successfully deleted your alert." +msgstr "Você removeu com sucesso o seu alerta." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 +msgid "You have successfully signed in; please check and confirm your details are accurate:" +msgstr "Você se inscreveu com sucesso nos, por favor, verificar e confirmar os seus dados estão correctos:" + +#: templates/web/default/email_sent.html:13 +msgid "You must now click the link in the email we've just sent you." +msgstr "Agora você deve clicar no link do e-mail que acabamos de lhe enviar." + +#: templates/web/default/admin/report_edit.html:71 +msgid "You really want to resend?" +msgstr "Você realmente deseja reenviar o email?" + +#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14 +#: templates/web/default/my/my.html:3 templates/web/fixmystreet/my/my.html:0 +#: templates/web/fixmystreet/my/my.html:14 +#: templates/web/fixmystreet/my/my.html:3 +msgid "Your Reports" +msgstr "Seus relatorios" + +#: templates/web/bromley/report/display.html:41 +#: templates/web/bromley/report/display.html:43 +#: templates/web/bromley/report/new/fill_in_details_form.html:145 +#: templates/web/fixmystreet/alert/_list.html:89 +#: templates/web/fixmystreet/alert/updates.html:19 +#: templates/web/fixmystreet/alert/updates.html:22 +#: templates/web/fixmystreet/contact/index.html:84 +#: templates/web/fixmystreet/report/display.html:65 +#: templates/web/fixmystreet/report/display.html:67 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 +msgid "Your email" +msgstr "Seu e-mail" + +#: templates/web/seesomething/report/new/fill_in_details_form.html:81 +msgid "Your email (optional)" +msgstr "Seu e-mail (opcional)" + +#: templates/web/bromley/report/display.html:132 +#: templates/web/fixmystreet/auth/general.html:26 +#: templates/web/fixmystreet/report/update-form.html:80 +#: templates/web/seesomething/auth/general.html:26 +#: templates/web/zurich/auth/general.html:30 +#: templates/web/zurich/auth/general.html:56 +msgid "Your email address" +msgstr "O seu endereço de email" + +#: templates/web/default/auth/general.html:27 +msgid "Your email address:" +msgstr "O seu endereço de email:" + +#: templates/web/default/alert/_list.html:92 +#: templates/web/default/report/new/fill_in_details_form.html:124 +#: templates/web/default/report/update-form.html:81 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:133 +#: templates/web/fixmybarangay/alert/_list.html:37 +msgid "Your email:" +msgstr "Seu e-mail:" + +#: templates/web/bromley/report/display.html:195 +#: templates/web/bromley/report/new/fill_in_details_form.html:117 +#: templates/web/bromley/report/new/fill_in_details_form.html:164 +msgid "Your first name" +msgstr "Nome" + +#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5 +msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" +msgstr "Suas informações só serão utilizadas de acordo com nossa <a href=\"/privacy\"> política de privacidade </a>" + +#: templates/web/bromley/report/display.html:201 +#: templates/web/bromley/report/new/fill_in_details_form.html:123 +#: templates/web/bromley/report/new/fill_in_details_form.html:170 +msgid "Your last name" +msgstr "Apelido" + +#: templates/web/fixmystreet/auth/general.html:57 +#: templates/web/fixmystreet/contact/index.html:77 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 +#: templates/web/fixmystreet/report/update-form.html:140 +#: templates/web/seesomething/report/new/fill_in_details_form.html:79 +#: templates/web/zurich/auth/general.html:59 +#: templates/web/zurich/report/new/fill_in_details_form.html:104 +msgid "Your name" +msgstr "Nome" + +#: templates/web/default/auth/general.html:59 +#: templates/web/default/contact/index.html:68 +#: templates/web/default/report/new/fill_in_details_form.html:203 +#: templates/web/default/report/update-form.html:151 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:124 +msgid "Your name:" +msgstr "Nome" + +#: templates/web/bromley/report/display.html:162 +#: templates/web/bromley/report/new/fill_in_details_form.html:203 +#: templates/web/fixmystreet/auth/general.html:41 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 +#: templates/web/fixmystreet/report/update-form.html:94 +#: templates/web/seesomething/auth/general.html:30 +#: templates/web/zurich/auth/general.html:34 +msgid "Your password" +msgstr "Password" + +#: templates/web/default/auth/change_password.html:6 +msgid "Your password has been changed" +msgstr "Sua password foi alterada" + +#: templates/web/bromley/report/new/fill_in_details_form.html:137 +#: templates/web/bromley/report/new/fill_in_details_form.html:184 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206 +#: templates/web/seesomething/report/new/fill_in_details_form.html:90 +#: templates/web/zurich/report/new/fill_in_details_form.html:107 +msgid "Your phone number" +msgstr "Telefone " + +#: templates/web/fixmystreet/questionnaire/index.html:15 +msgid "Your report" +msgstr "Seu relatório" + +#: templates/web/default/report_created.html:6 +msgid "Your report has been created and will shortly be sent." +msgstr "Seu relatório foi criado e será enviado em breve." + +#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19 +#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9 +#: templates/web/fiksgatami/footer.html:6 +#: templates/web/fiksgatami/nn/footer.html:6 +#: templates/web/fixmystreet/footer.html:46 +#: templates/web/oxfordshire/footer.html:21 +#: templates/web/oxfordshire/header.html:63 +#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41 +msgid "Your reports" +msgstr "Seus relatórios" + +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49 +msgid "Your updates" +msgstr "Suas atualizações" + +#: templates/web/default/contact/index.html:76 +msgid "Your email:" +msgstr "Seu e-mail:" + +#: templates/web/default/admin/timeline.html:4 +msgid "by %s" +msgstr "por %s" + +#: templates/web/default/reports/body.html:6 +#: templates/web/default/reports/body.html:7 +msgid "council" +msgstr "conselho" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +msgid "council ref: %s" +msgstr "conselho ref:%s" + +#: templates/web/default/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:55 +msgid "didn't use map" +msgstr "não usar o mapa" + +#: templates/web/default/alert/index.html:33 +#: templates/web/fixmystreet/around/postcode_form.html:20 +#: templates/web/seesomething/around/postcode_form.html:9 +msgid "e.g. ‘%s’ or ‘%s’" +msgstr "por exemplo '%s' ou '%s'" + +#: templates/web/default/admin/index.html:15 +#: templates/web/zurich/admin/index.html:5 +msgid "from %d different users" +msgstr "e %d usuários diferentes" + +#: templates/web/fixmystreet/report/_item.html:12 +#: templates/web/zurich/report/_item.html:16 +msgid "last updated %s" +msgstr "Última atualizada %s" + +#: perllib/Utils.pm:263 +msgid "less than a minute" +msgstr "menos de um minuto" + +#: templates/web/default/report/updates.html:57 +#, fuzzy +msgid "marked as a duplicate report" +msgstr "duplicar relatório" + +#: templates/web/default/report/updates.html:47 +#, fuzzy +msgid "marked as action scheduled" +msgstr "Ação Programada" + +#: templates/web/default/report/updates.html:59 +msgid "marked as an internal referral" +msgstr "" + +#: templates/web/default/report/updates.html:49 +#, fuzzy +msgid "marked as closed" +msgstr "marcado como %s" + +#: templates/web/default/report/updates.html:28 +#: templates/web/default/report/updates.html:51 +msgid "marked as fixed" +msgstr "marcado como fixo" + +#: templates/web/default/report/updates.html:45 +#, fuzzy +msgid "marked as in progress" +msgstr "Este problema está em progresso" + +#: templates/web/default/report/updates.html:41 +#, fuzzy +msgid "marked as investigating" +msgstr "Investigando" + +#: templates/web/default/report/updates.html:55 +#, fuzzy +msgid "marked as not the council's responsibility" +msgstr "não da responsabilidade do conselho" + +#: templates/web/default/report/updates.html:43 +#, fuzzy +msgid "marked as planned" +msgstr "marcado como fixo" + +#: templates/web/default/report/updates.html:53 +#, fuzzy +msgid "marked as unable to fix" +msgstr "marcado como fixo" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:128 +#: templates/web/default/admin/questionnaire.html:15 +#: templates/web/default/admin/questionnaire.html:16 +msgid "n/a" +msgstr "n / a" + +#: templates/web/default/alert/_list.html:87 +#: templates/web/fixmybarangay/alert/_list.html:32 +#: templates/web/fixmystreet/alert/_list.html:85 +msgid "or" +msgstr "ou" + +#: templates/web/default/js/translation_strings.html:21 +msgid "or locate me automatically" +msgstr "ou localizár-me automaticamente" + +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:53 +msgid "originally entered: “%s”" +msgstr "originalmente introduzido: \"%s\"" + +#: templates/web/default/admin/report_edit.html:30 +msgid "other areas:" +msgstr "outras áreas:" + +#: templates/web/default/report/updates.html:29 +#: templates/web/default/report/updates.html:39 +msgid "reopened" +msgstr "reaberto" + +#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 +#: templates/web/bromley/header.html:65 +#: templates/web/fixmybarangay/header.html:67 +#: templates/web/fixmystreet/header.html:51 +#: templates/web/oxfordshire/header.html:112 +#: templates/web/oxfordshire/header.html:48 +#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12 +msgid "sign out" +msgstr "sair" + +#: templates/web/bromley/report/new/fill_in_details_form.html:4 +#: templates/web/bromley/report/new/fill_in_details_form.html:7 +#: templates/web/default/report/new/fill_in_details_form.html:11 +#: templates/web/default/report/new/fill_in_details_form.html:14 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 +msgid "the local council" +msgstr "o conselho local" + +#: templates/web/default/report/_main.html:6 +#: templates/web/zurich/report/_main.html:5 +msgid "there is no pin shown as the user did not use the map" +msgstr "não há nenhum fix pin para o usuario usar no mapa" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 +msgid "this type of local problem" +msgstr "este tipo de problema local" + +#: perllib/Utils.pm:235 +msgid "today" +msgstr "hoje" + +#: templates/web/default/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:55 +msgid "used map" +msgstr "mapa usado" + +#: templates/web/default/admin/update_edit.html:35 +msgid "user is from same council as problem - %d" +msgstr "usuário é da mesmo conselho do problema - %d" + +#: templates/web/default/admin/update_edit.html:38 +msgid "user is problem owner" +msgstr "usuário é proprietário problema" + +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:3 +msgid "ward" +msgstr "pendente" + +#: templates/web/default/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> Relatorio recentemente" +msgstr[1] "<big>%s</big> Relatorios recentemente" + +#: perllib/Utils.pm:282 +#, perl-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hora" +msgstr[1] "%d horas" + +#: templates/web/default/report/_support.html:6 +#, perl-format +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d suppoter" +msgstr[1] "%d supporters" + +#: perllib/Utils.pm:284 +#, perl-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuto" +msgstr[1] "%d minutos" + +#: templates/web/default/front/stats.html:29 +#, perl-format +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> atualização em relatório" +msgstr[1] "<big>%s</big> atualização los Relatorios" + +#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#, perl-format +msgid "We do not yet have details for the council that covers this location." +msgid_plural "We do not yet have details for the councils that cover this location." +msgstr[0] "Nós ainda não temos detalhes para o conselho, que abrange este local." +msgstr[1] "Nós ainda não temos detalhes para o conselho, que abrange este local." + +#: perllib/Utils.pm:278 +#, perl-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d semana" +msgstr[1] "%d semanas" + +#: templates/web/default/front/stats.html:12 +#, perl-format +msgid "<big>%s</big> report in past week" +msgid_plural "<big>%s</big> reports in past week" +msgstr[0] "<big>%s</big> Relatório de semana passada" +msgstr[1] "<big>%s</big> Relatórios de semana passado" + +#: templates/web/default/front/stats.html:23 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> fixado no mês passado" +msgstr[1] "<big>%s</big> fixado no mês passado" + +#: templates/web/default/report/new/councils_text_some.html:14 +#, perl-format +msgid "We do <strong>not</strong> yet have details for the other council that covers this location." +msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." +msgstr[0] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local." +msgstr[1] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local." + +#: perllib/Utils.pm:280 +#, perl-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dia" +msgstr[1] "%d dias" + +#~ msgid "no further action" +#~ msgstr "nenhuma outra ação" + +#~ msgid "third party responsibility" +#~ msgstr "terceiro a responsabilidade do partido" diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index 05140efde..38613db48 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,15 +6,14 @@ # Translators: # Joel Hansen <johaswe@gmail.com>, 2012 # jonas <jonas@morus.se>, 2012 -# morusrikard <rikard@morus.se>, 2013 -# morusrikard <rikard@morus.se>, 2012 +# morusrikard <rikard@morus.se>, 2012-2013 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-04-24 08:59+0100\n" -"PO-Revision-Date: 2013-04-03 13:51+0000\n" -"Last-Translator: morusrikard <rikard@morus.se>\n" +"POT-Creation-Date: 2013-09-05 17:39+0100\n" +"PO-Revision-Date: 2013-05-02 21:06+0000\n" +"Last-Translator: mysociety <transifex@mysociety.org>\n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/fixmystreet/language/sv_SE/)\n" "Language: sv_SE\n" "MIME-Version: 1.0\n" @@ -23,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid " and " msgstr "eller" @@ -44,7 +43,7 @@ msgstr " och <strong>vi kommer skicka det till kommunen</strong>" msgid " or " msgstr "eller" -#: templates/web/default/admin/bodies.html:32 +#: templates/web/default/admin/bodies.html:36 msgid "%d addresses" msgstr "%d adresser" @@ -82,33 +81,29 @@ msgstr "%s - Sammanställningsrapporter" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "%s ward, %s" msgstr "Administrativa området %s, %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:572 -#, fuzzy msgid "%s, reported at %s" -msgstr "%s rapporterat av %s %s" +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 +#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315 msgid "%s, within %s ward" msgstr "%s inom det administrativa området %s" #: templates/web/default/email_sent.html:29 -#, fuzzy msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" -msgstr "vi sparar din bevakning medan du kollar din epost." +msgstr "" #: templates/web/default/email_sent.html:25 -#, fuzzy msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" -msgstr "vi behåller din rapport medan du kollar din epost." +msgstr "" #: templates/web/default/email_sent.html:27 -#, fuzzy msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" -msgstr "vi behåller din uppdatering medans du kollar din epost." +msgstr "" #: templates/web/default/admin/report_blocks.html:11 #: templates/web/default/admin/users.html:26 @@ -139,7 +134,7 @@ msgstr "(stängd)" msgid "(fixed)" msgstr "(fixad)" -#: templates/web/default/index.html:11 templates/web/default/index.html:15 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(ex.v. grafitti, skräp, trasiga gatustenar eller belysning)" @@ -168,21 +163,20 @@ msgstr "(vi visar aldrig din epostadress eller telefonnummer)" msgid "(we never show your email)" msgstr "(vi visar aldrig din epostadress)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 #: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Välj en katagori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 #: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Välj en fastighetstyp --" #: templates/web/emptyhomes/front/stats.html:5 -#, fuzzy msgid "<big>%s</big> reports" -msgstr "<big>%s</big> uppdatering av rapporter" +msgstr "" #: templates/web/default/questionnaire/completed.html:20 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" @@ -296,6 +290,8 @@ msgstr "<strong>Ja</strong>, jag har ett lösenord" #: templates/web/default/static/about-en-gb.html:1 #: templates/web/default/static/about-en-gb.html:3 #: templates/web/emptyhomes/header.html:34 +#: templates/web/emptyhomes/static/about-cy.html:1 +#: templates/web/emptyhomes/static/about-cy.html:3 #: templates/web/emptyhomes/static/about-en-gb.html:1 #: templates/web/emptyhomes/static/about-en-gb.html:3 msgid "About us" @@ -303,6 +299,8 @@ msgstr "Om oss" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -310,7 +308,8 @@ msgstr "Om oss" msgid "Action Scheduled" msgstr "" -#: templates/web/default/admin/bodies.html:47 +#: templates/web/default/admin/bodies.html:53 +#: templates/web/default/admin/bodies.html:57 #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" @@ -411,12 +410,12 @@ msgid "An update marked this problem as fixed." msgstr "En uppdatering markerade det här problemet som löst." #: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/problem_row.html:14 +#: templates/web/default/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonym:" @@ -439,31 +438,30 @@ msgstr "Arbetar du på en kommun?" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:124 #: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:127 +#: templates/web/zurich/admin/report_edit.html:133 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:113 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:99 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 #: templates/web/zurich/report/updates.html:11 -#, fuzzy msgid "Assigned to %s" -msgstr "Inloggad som %s" +msgstr "" -#: templates/web/default/open311/index.html:17 +#: templates/web/default/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "Som mest returneras %d svar i varje förfrågan. De returnerade svaren är sorterade efter requested_datetime. Om du vill få alla svar måste du göra flera sökningar med rullande start_date och end_date." -#: templates/web/default/open311/index.html:9 +#: templates/web/default/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "För tillfället fungerar det endast att söka för eller leta efter rapporter." @@ -484,8 +482,8 @@ msgstr "Förbjud epostadress" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "Välj kategori så noggrant som möjligt eftersom det hjälper oss att avgöra vem rapporten ska skickas till." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:208 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:64 msgid "Bodies" @@ -538,16 +536,16 @@ msgstr "Kategorins lösningsnivå för problem över 4 veckor gamla" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:61 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/report_edit.html:123 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "Category: %s" msgstr "Kategori: %s" @@ -557,22 +555,23 @@ msgstr "Kategori: %s" msgid "Change Password" msgstr "Ända lösenord" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/default/js/translation_strings.html:41 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klicka på kartan för att rapportera ett problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:76 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:90 -#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit.html:98 #: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" @@ -586,7 +585,7 @@ msgstr "Stängd av kommunen" msgid "Closed reports" msgstr "Stängda rapporter" -#: templates/web/default/admin/problem_row.html:32 +#: templates/web/default/admin/problem_row.html:38 msgid "Closed:" msgstr "Stängd:" @@ -595,9 +594,9 @@ msgstr "Stängd:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Närmaste närliggande problem <small>(inom %s km)</small>" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Co-ordinates:" msgstr "Koordinater:" @@ -605,17 +604,17 @@ msgstr "Koordinater:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/default/admin/report_edit.html:50 -#: templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:75 +#: templates/web/default/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Cobrand data:" -#: templates/web/default/admin/report_edit.html:49 -#: templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:74 +#: templates/web/default/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Konfigurationen uppdaterad. Kontakterna kommer att genereras automatiskt senare" @@ -662,8 +661,8 @@ msgstr "Bekräftat" msgid "Confirmed reports between %s and %s" msgstr "Bekräftade rapporter mellan %s och %s" -#: templates/web/default/admin/problem_row.html:30 -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/problem_row.html:36 +#: templates/web/default/admin/report_edit.html:70 msgid "Confirmed:" msgstr "Bekräftat:" @@ -688,12 +687,12 @@ msgstr "Kontakta oss" #: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 -#: templates/web/fixmystreet/contact/index.html:7 +#: templates/web/fixmystreet/contact/index.html:19 msgid "Contact the team" msgstr "Kontakta teamet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1265 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1293 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 msgid "Could not find user" msgstr "Kan inte hitta användaren" @@ -732,15 +731,15 @@ msgid "Create category" msgstr "Skapa en kategori" #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/problem_row.html:34 #: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Skapad" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:45 +#: templates/web/default/admin/report_edit.html:69 +#: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 -#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Skapad:" @@ -779,12 +778,12 @@ msgstr "" msgid "Details" msgstr "Detaljer" -#: templates/web/default/admin/report_edit.html:14 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:25 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:36 msgid "Details:" msgstr "Detaljer:" @@ -814,6 +813,8 @@ msgstr "Vet ej" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -821,10 +822,10 @@ msgstr "Vet ej" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 -#: templates/web/default/admin/problem_row.html:35 +#: templates/web/default/admin/list_updates.html:42 +#: templates/web/default/admin/problem_row.html:41 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:36 +#: templates/web/zurich/admin/problem_row.html:44 msgid "Edit" msgstr "Ändra" @@ -837,7 +838,7 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:4 +#: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Ändrar problem %d" @@ -871,11 +872,11 @@ msgstr "Redaktör" msgid "Email" msgstr "Epost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1241 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1253 msgid "Email added to abuse list" msgstr "Epostadressen tillagd till missbrukslistan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 msgid "Email already in abuse list" msgstr "Epostadressen finns redan i missbrukslistan" @@ -889,31 +890,30 @@ msgstr "Eposta mig uppdateringar" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:42 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:67 +#: templates/web/default/admin/update_edit.html:33 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit.html:58 msgid "Email:" msgstr "Epost:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" -msgstr "Epost:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty flat or maisonette" msgstr "Tom lägenhet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty house or bungalow" msgstr "Tomt hus" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 msgid "Empty office or other commercial" msgstr "Tomt kontor eller annan kommersiell lokal" @@ -921,11 +921,11 @@ msgstr "Tomt kontor eller annan kommersiell lokal" msgid "Empty property details form" msgstr "Tom fastighet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 msgid "Empty public building - school, hospital, etc." msgstr "Tom publik byggnad - skola, sjukhus, etc." @@ -942,14 +942,12 @@ msgid "End month:" msgstr "Slutmånad:" #: templates/web/default/admin/body-form.html:40 -#, fuzzy msgid "Endpoint" -msgstr "Konfigurera slutpunkt" +msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:29 -#, fuzzy +#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 msgid "Enter a Zürich street name" -msgstr "Ange ett närligande gatunamn och ort" +msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:18 msgid "Enter a nearby UK postcode, or street name and area" @@ -1002,11 +1000,11 @@ msgstr "Fel" msgid "Example postcode %s" msgstr "Exempelpostnummer %s" -#: templates/web/default/open311/index.html:27 +#: templates/web/default/open311/index.html:96 msgid "Examples:" msgstr "Exempel:" -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:76 msgid "Extra data:" msgstr "Extra data:" @@ -1015,11 +1013,10 @@ msgstr "Extra data:" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "Misslyckades med att skicka meddelandet. Var vänlig försök igen eller <a href=\"mailto:%s\">eposta oss</a>." -#: templates/web/zurich/admin/index-dm.html:32 -#: templates/web/zurich/admin/index-sdm.html:29 -#, fuzzy +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" -msgstr "Lösta rapporer" +msgstr "" #: templates/web/emptyhomes/front/stats.html:6 msgid "Find latest local and national news" @@ -1070,8 +1067,9 @@ msgstr "FixaMinGata skickar olika kategorier av rapporter till olika enheter ino #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1082,13 +1080,13 @@ msgstr "FixaMinGata skickar olika kategorier av rapporter till olika enheter ino msgid "Fixed" msgstr "Löst" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "Löst - Kommun" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:42 msgid "Fixed - User" msgstr "Löst - Användare" @@ -1096,7 +1094,7 @@ msgstr "Löst - Användare" msgid "Fixed reports" msgstr "Lösta rapporer" -#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/problem_row.html:37 msgid "Fixed:" msgstr "Löst:" @@ -1104,12 +1102,12 @@ msgstr "Löst:" msgid "Flag user" msgstr "Flagga användare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flaggat" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:78 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Flaggat:" @@ -1119,7 +1117,7 @@ msgstr "Flaggat:" msgid "Follow a ward link to view only reports within that ward." msgstr "Följ en länk till ett område för att se rapporter endast inom det området." -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "For council(s):" msgstr "För kommuner:" @@ -1133,6 +1131,7 @@ msgstr "Glömt ditt lösenord?" #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmindelo/faq/faq-pt-cv.html:1 #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 @@ -1140,11 +1139,12 @@ msgstr "Glömt ditt lösenord?" msgid "Frequently Asked Questions" msgstr "Vanliga frågor" -#: templates/web/default/open311/index.html:69 +#: templates/web/default/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" #: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/around/_updates.html:3 #: templates/web/fixmystreet/report/display.html:38 msgid "Get updates" msgstr "Få uppdateringar" @@ -1173,7 +1173,7 @@ msgstr "Ge mig ett RSS-flöde" msgid "Go" msgstr "Gå" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "Skicka enkät?" @@ -1182,7 +1182,6 @@ msgid "Graph of problem creation by status over time" msgstr "Visualisering av rapporter över tid" #: templates/web/default/reports/index.html:8 -#: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "Utgråade linjer är kommuner som inte längre existerar." @@ -1229,13 +1228,14 @@ msgstr "Här är de olika typerna för lokala problem för ‘%s’" msgid "Hi %s" msgstr "Hej %s" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:91 #: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" @@ -1265,7 +1265,7 @@ msgstr "Hur man rapporterar ett problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:700 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Tyvärr kan du inte bekräfta obekräftade rapporter" @@ -1292,19 +1292,16 @@ msgid "ID" msgstr "ID" #: templates/web/default/email_sent.html:19 -#, fuzzy msgid "If you do not, your alert will not be activated." -msgstr "din bevakning kommer inte aktiveras" +msgstr "" #: templates/web/default/email_sent.html:15 -#, fuzzy msgid "If you do not, your problem will not be posted." -msgstr "din rapport kommer inte skickas" +msgstr "" #: templates/web/default/email_sent.html:17 -#, fuzzy msgid "If you do not, your update will not be posted." -msgstr "din uppdatering kommer inte skickas" +msgstr "" #: templates/web/default/report/new/councils_text_none.html:8 #: templates/web/default/report/new/councils_text_none.html:9 @@ -1347,64 +1344,67 @@ msgstr "Ogiltigt RSS-flöde" msgid "In Progress" msgstr "Pågående" -#: templates/web/default/open311/index.html:21 +#: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "I tillägg, följande attribut som inte är del av Open311 v2-specifikationen returneras: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:79 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:94 +#: templates/web/zurich/admin/report_edit.html:100 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Pågående" #: templates/web/seesomething/report/new/fill_in_details_form.html:38 -#, fuzzy msgid "Incident Category" -msgstr "Kategori" +msgstr "" -#: templates/web/zurich/admin/report_edit.html:137 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:143 msgid "Include reporter personal details" -msgstr "Vänligen skriv några detaljer" +msgstr "" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Inkludera obekräftade rapporter" -#: perllib/FixMyStreet/App/Controller/Open311.pm:348 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "Inkorrekt värde för has_photo, \"%s\"" -#: templates/web/zurich/admin/report_edit-sdm.html:56 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:82 msgid "Internal notes:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:333 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:48 +msgid "Internal referral" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "Inkorrekt värde för agency_responsible, \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1052 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 msgid "Invalid end date" msgstr "Inkorrekt slutdatum" -#: perllib/FixMyStreet/App/Controller/Open311.pm:424 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "Inkorrekt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 msgid "Invalid start date" msgstr "Inkorrekt startdatum" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1443,11 +1443,11 @@ msgstr "Efternamn" msgid "Last editor" msgstr "Senaste redaktör" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:72 msgid "Last update:" msgstr "Senaste uppdatering:" -#: templates/web/default/admin/problem_row.html:33 +#: templates/web/default/admin/problem_row.html:39 msgid "Last update:" msgstr "Senaste uppdatering:" @@ -1513,7 +1513,7 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "Karta © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> och bidragsgivare" -#: templates/web/fixmystreet/contact/index.html:86 +#: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "Meddelande" @@ -1521,7 +1521,7 @@ msgstr "Meddelande" msgid "Message:" msgstr "Meddelande:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "Saknat jurisdiction_id" @@ -1545,7 +1545,7 @@ msgstr "Fler närliggande problem" #: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 -#: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:9 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmybarangay/reports/index.html:15 @@ -1560,23 +1560,21 @@ msgid "Name" msgstr "Namn" #: templates/web/seesomething/report/new/fill_in_details_form.html:74 -#, fuzzy msgid "Name (optional)" -msgstr "(valfritt)" +msgstr "" -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:66 +#: templates/web/default/admin/update_edit.html:32 #: templates/web/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:57 #: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Namn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" -msgstr "Namn:" +msgstr "" #: templates/web/fiksgatami/footer.html:3 #: templates/web/fiksgatami/nn/footer.html:3 @@ -1592,12 +1590,12 @@ 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:415 -#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:458 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Närmaste gata till placeringen på kartan (genereras automatiskt av Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1614,12 +1612,11 @@ msgstr "Nästan klar! Kolla nu din epost." msgid "New <br>problems" msgstr "Nya <br>problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:249 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:250 msgid "New body added" -msgstr "Nya kategorikontakter tillagda" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:362 msgid "New category contact added" msgstr "Nya kategorikontakter tillagda" @@ -1631,7 +1628,7 @@ msgstr "Nya lokala problem på FixaMinGata" msgid "New local reports on reportemptyhomes.com" msgstr "Nya lokala rapporter på reportemptyhomes.com" -#: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New problems" @@ -1658,9 +1655,8 @@ msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "Nya problem inom {{NAME}}'s administrativa gräns på FixaMinGata" #: templates/web/zurich/admin/index-sdm.html:4 -#, fuzzy msgid "New reports" -msgstr "Öppna rapporter" +msgstr "" #: db/alert_types_eha.pl:23 msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -1686,10 +1682,9 @@ msgstr "Nya rapporter inom {{NAME}}'s administrativa gräns på reportemptyhomes msgid "New state" msgstr "Ny status" -#: templates/web/zurich/admin/report_edit-sdm.html:59 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" -msgstr "Få uppdateringar" +msgstr "" #: templates/web/fiksgatami/front/news.html:9 #: templates/web/fiksgatami/nn/front/news.html:9 @@ -1705,13 +1700,13 @@ msgstr "" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:25 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 #: templates/web/default/questionnaire/index.html:68 @@ -1744,10 +1739,9 @@ msgstr "Inga flaggade problem hittade" msgid "No flagged users found" msgstr "Inga flaggade användare hittade" -#: templates/web/zurich/admin/report_edit-sdm.html:66 -#, fuzzy +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" -msgstr "Dina uppdateringar" +msgstr "" #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 @@ -1772,14 +1766,16 @@ msgstr "Inga supporters" msgid "Non Public" msgstr "Icke-publikt" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 msgid "None" msgstr "Inget" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1815,7 +1811,7 @@ msgstr "Observera att när vi listar obegräftade rapporter använder vi datumet msgid "Note:" msgstr "Observera:" -#: templates/web/default/open311/index.html:6 +#: templates/web/default/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "Observera: <strong>%s</strong>" @@ -1873,23 +1869,25 @@ msgstr "Äldre <br>problem" msgid "Older fixed" msgstr "Äldre lösta problem" -#: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/emptyhomes/reports/index.html:11 #: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "Äldre problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:83 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1899,15 +1897,15 @@ msgstr "Öppen" msgid "Open reports" msgstr "Öppna rapporter" -#: templates/web/default/open311/index.html:3 +#: templates/web/default/open311/index.html:72 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API för FixaMinGata" -#: templates/web/default/open311/index.html:13 +#: templates/web/default/open311/index.html:82 msgid "Open311 initiative web page" msgstr "Open311" -#: templates/web/default/open311/index.html:14 +#: templates/web/default/open311/index.html:83 msgid "Open311 specification" msgstr "Open311 Specifikation" @@ -1921,15 +1919,15 @@ msgstr "Eller problem rapporterade til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Du kan också prenumerera på bevakningar baserat på vilken kommun du bor i:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1046 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:588 #: perllib/FixMyStreet/DB/Result/Problem.pm:598 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Other" msgstr "Övrig" @@ -1951,8 +1949,8 @@ msgstr "Sidan hittas ej" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 msgid "Partial" msgstr "Partiell" @@ -1970,6 +1968,10 @@ msgstr "Lösenord (valfritt)" msgid "Password:" msgstr "Lösenord:" +#: templates/web/default/js/translation_strings.html:39 +msgid "Permalink" +msgstr "" + #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 @@ -1979,12 +1981,12 @@ msgstr "Lösenord:" msgid "Phone number (optional)" msgstr "Telefonnummer (valfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 -#: templates/web/default/admin/report_edit.html:43 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 +#: templates/web/default/admin/report_edit.html:68 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 #: templates/web/zurich/admin/report_edit-sdm.html:46 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonnummer:" @@ -1994,6 +1996,8 @@ msgstr "Telefonnummer:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/index-dm.html:29 +#: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" @@ -2015,15 +2019,15 @@ msgstr "Foton från närliggande rapporter" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 msgid "Planned" msgstr "Planerat" @@ -2057,10 +2061,10 @@ msgstr "Vänligen kontrollera din epost" msgid "Please check your email address is correct" msgstr "Vänligen kontrollera att din epostadress är korrekt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:852 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:871 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:914 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:917 #: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" @@ -2071,14 +2075,12 @@ msgid "Please choose a property type" msgstr "Vänligen välj en fastighetstyp" #: templates/web/seesomething/js/translation_strings.html:6 -#, fuzzy msgid "Please choose a transport category" -msgstr "Vänligen välj en kategori" +msgstr "" #: templates/web/seesomething/js/translation_strings.html:7 -#, fuzzy msgid "Please choose an incident category" -msgstr "Vänligen välj en kategori" +msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:64 msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”" @@ -2094,9 +2096,8 @@ msgstr "Var snäll och rapportera <strong>inga</strong> problem genom det här f #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:7 #: templates/web/oxfordshire/report/new/notes.html:6 -#, fuzzy msgid "Please do not be abusive — abusing your council devalues the service for all users." -msgstr "Var snäll och missbruka inte tjänsten, det förstör för alla." +msgstr "" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 msgid "Please do not give address or personal information in this section." @@ -2301,11 +2302,11 @@ msgstr "Ange om problemet har lösts eller ej" msgid "Please take a look at the updates that have been left." msgstr "Titta på de uppdateringar som har lämnats." -#: perllib/FixMyStreet/App/Controller/Photo.pm:172 +#: perllib/FixMyStreet/App/Controller/Photo.pm:174 msgid "Please upload a JPEG image only" msgstr "Ladda upp en JPEG-bild" -#: perllib/FixMyStreet/App/Controller/Photo.pm:179 +#: perllib/FixMyStreet/App/Controller/Photo.pm:181 msgid "Please upload a JPEG image only\n" msgstr "Ladda upp en JPEG-bild\n" @@ -2325,7 +2326,7 @@ msgstr "Skriv din uppdatering här" #: templates/web/default/report/update-form.html:109 #: templates/web/default/report/update-form.html:131 #: templates/web/default/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/contact/index.html:105 #: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/fixmystreet/report/update-form.html:71 #: templates/web/fixmystreet/report/update-form.html:95 @@ -2350,14 +2351,13 @@ msgstr "" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "Privat" #: templates/web/emptyhomes/report/new/fill_in_details_form.html:108 -#, fuzzy msgid "Private information (not shown on site)" -msgstr "Mer information om vårt arbete med tomma hus" +msgstr "" #: templates/web/default/maps/openlayers.html:85 msgid "Problem" @@ -2380,7 +2380,7 @@ msgstr "Rapport %s skickad till %s" msgid "Problem breakdown by state" msgstr "Rapporter per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:917 +#: perllib/FixMyStreet/App/Controller/Admin.pm:929 msgid "Problem marked as open." msgstr "Problemet markerat som öppet." @@ -2416,15 +2416,15 @@ msgstr "Problem nyligen rapporterade som lösta på FixaMinGata" msgid "Problems within %.1fkm of this location" msgstr "Problem inom %.1f km från denna position" -#: perllib/FixMyStreet/Cobrand/Default.pm:615 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/Default.pm:626 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 -#: perllib/FixMyStreet/Cobrand/UK.pm:227 +#: perllib/FixMyStreet/Cobrand/UK.pm:228 msgid "Problems within %s" msgstr "Problem inom %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:241 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:242 msgid "Problems within %s ward" msgstr "Problem inom området %s" @@ -2443,11 +2443,10 @@ msgstr "Problem inom gränsen för:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Fastigheter nyligen rapporterade som åtgärdade på reportemptyhomes.com" -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 -#, fuzzy msgid "Property address:" -msgstr "Fastighetstyp:" +msgstr "" #: templates/web/default/report/new/category.html:8 msgid "Property type:" @@ -2464,6 +2463,11 @@ msgstr "Ange en titel" msgid "Provide an update" msgstr "Ge en uppdatering" +#: templates/web/fixmystreet/auth/general.html:53 +#, fuzzy +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 "Att ange ett lösenord är valfritt, men om du gör det kommer du lättare att kunna rapportera problem, lämna uppdateringar och hantera dina anmälningar." + #: templates/web/bromley/report/new/fill_in_details_form.html:180 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "Att ange ett lösenord är valfritt, men om du gör det kommer du lättare att kunna rapportera framtida problem, lämna uppdateringar och hantera dina anmälningar." @@ -2485,17 +2489,17 @@ msgstr "Publikt" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:172 -#: templates/web/zurich/admin/report_edit.html:188 +#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:194 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/report_edit.html:78 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:196 +#: templates/web/zurich/admin/report_edit.html:202 msgid "Publish the response" msgstr "" @@ -2535,11 +2539,11 @@ msgstr "Frågeformulär ifyllt av rapportören" msgid "RSS feed" msgstr "RSS-flöde" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "RSS feed for %s" msgstr "RSS-flöde för %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed for %s ward, %s" msgstr "RSS-flöde för område %s, %s" @@ -2547,11 +2551,11 @@ msgstr "RSS-flöde för område %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 -#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 msgid "RSS feed of %s" msgstr "RSS-flöde för %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "RSS feed of %s, within %s ward" msgstr "RSS-flöde för %s, inom område %s" @@ -2564,15 +2568,15 @@ msgstr "RSS-flöde av närliggande problem" msgid "RSS feed of problems in this %s" msgstr "RSS-flöde för problem i denna %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:616 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 -#: perllib/FixMyStreet/Cobrand/UK.pm:234 +#: perllib/FixMyStreet/Cobrand/UK.pm:235 msgid "RSS feed of problems within %s" msgstr "RSS-flöde för problem inom %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "RSS feed of problems within %s ward" msgstr "RSS-flöde för problem inom område %s" @@ -2611,7 +2615,8 @@ msgstr "Nyligen <br>åtgärdat" msgid "Recently fixed" msgstr "Nyligen åtgärdat" -#: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 +#: templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Senaste rapporterade problemen" @@ -2628,13 +2633,13 @@ msgstr "Kom igår att, för pilotprojektet FixMyBarangay, rapporteras endast pot msgid "Remove flag" msgstr "Ta bort flagga" -#: templates/web/default/admin/report_edit.html:64 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:89 +#: templates/web/default/admin/update_edit.html:57 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Ta bort foto (kan inte ångras!)" -#: templates/web/default/index.html:9 templates/web/emptyhomes/header.html:12 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "Rapportera tomma fastigheter" @@ -2660,15 +2665,14 @@ msgstr "Rapportera missbruk" #: templates/web/default/report_created.html:3 #: templates/web/seesomething/report_created.html:0 #: templates/web/seesomething/report_created.html:8 -#, fuzzy msgid "Report created" -msgstr "Rapportera missbruk" +msgstr "" #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Rappoort på %s" -#: templates/web/default/index.html:18 +#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/stevenage/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 @@ -2685,7 +2689,7 @@ msgstr "Rapporterat %s till %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 -#: templates/web/fixmystreet/contact/index.html:46 +#: templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Rapporterat anonymt %s" @@ -2701,7 +2705,7 @@ msgstr "Rapporterat av %s anonymt %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 -#: templates/web/fixmystreet/contact/index.html:48 +#: templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Rapporterat av %s den %s" @@ -2718,9 +2722,8 @@ msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapporterat av %s i kategorin %s, anonymt av %s den %s" #: templates/web/zurich/report/_main.html:2 -#, fuzzy msgid "Reported in the %s category" -msgstr "Rapporterat i kategori %s av %s den %s" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" @@ -2746,33 +2749,30 @@ msgstr "Rapporterat i kategori %s av %s den %s" msgid "Reporting a problem" msgstr "Rapportera ett problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:198 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:201 #: templates/web/seesomething/admin/stats.html:1 #: templates/web/zurich/header.html:60 -#, fuzzy msgid "Reports" -msgstr "Alla rapporter" +msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" #: templates/web/zurich/admin/index-sdm.html:7 -#, fuzzy msgid "Reports awaiting approval" -msgstr "Rapportera ett problem" +msgstr "" #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Rapporter på och runt kartbilden" #: templates/web/zurich/admin/index-sdm.html:10 -#, fuzzy msgid "Reports published" -msgstr "Rapportera missbruk" +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Resend report" msgstr "Skicka om rapporten" @@ -2788,16 +2788,16 @@ msgstr "Vägoperatör för den här namngivna vägen (hämtat från vägens numm msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vägoperatör för den här namngivna vägen (från OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1343 -#: templates/web/default/admin/report_edit.html:60 -#: templates/web/zurich/admin/report_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: templates/web/default/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 -#: templates/web/default/admin/report_edit.html:61 -#: templates/web/zurich/admin/report_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: templates/web/default/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:75 msgid "Rotate Right" msgstr "" @@ -2816,9 +2816,8 @@ msgid "Search Users" msgstr "Sök användare" #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Search reports" -msgstr "Sök rapporter" +msgstr "" #: templates/web/default/admin/reports.html:5 #: templates/web/default/admin/users.html:5 @@ -2845,11 +2844,11 @@ msgstr "Välj vilken kategori av rapporter du vill få och klicka knappen för e msgid "Sent to %s %s later" msgstr "Skickades till %s, %s senare" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "Sent:" msgstr "Skickades:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:73 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Tjänst:" @@ -2950,7 +2949,7 @@ msgstr "Tyvärr, det verkar vara ett postnummer som vi inte täcker." msgid "Sorry, there has been an error confirming your problem." msgstr "Tyvärr har det uppstått ett fel med att bekräfta ditt problem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 #: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 #: perllib/FixMyStreet/Geocode/Google.pm:74 #: perllib/FixMyStreet/Geocode/OSM.pm:66 @@ -2988,17 +2987,17 @@ msgstr "Startmånad:" msgid "State" msgstr "Status" -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/update_edit.html:21 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:54 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:85 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1138 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:213 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:216 #: templates/web/default/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -3007,34 +3006,32 @@ msgstr "Statistik" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Status" -msgstr "Statistik" +msgstr "" #: templates/web/default/report/updates.html:10 msgid "Still open, via questionnaire, %s" msgstr "Fortfarande öppen, via frågeformulär, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 msgid "Subcategory: %s" -msgstr "Kategori: %s" +msgstr "" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:48 -#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/contact/index.html:91 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "Ärende" -#: templates/web/default/admin/report_edit.html:13 +#: templates/web/default/admin/report_edit.html:19 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:34 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Subject:" msgstr "Ärende:" @@ -3054,11 +3051,11 @@ msgstr "Ärende:" msgid "Submit" msgstr "Skicka" -#: templates/web/default/admin/report_edit.html:67 -#: templates/web/default/admin/update_edit.html:54 +#: templates/web/default/admin/report_edit.html:92 +#: templates/web/default/admin/update_edit.html:60 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:65 -#: templates/web/zurich/admin/report_edit.html:198 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:204 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Skicka förändringar" @@ -3068,19 +3065,18 @@ msgstr "Skicka förändringar" msgid "Submit questionnaire" msgstr "Skicka frågeformulär" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:81 -#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:88 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 -#, fuzzy msgid "Submitted" -msgstr "Skicka" +msgstr "" #: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 @@ -3100,8 +3096,8 @@ msgstr "Prenumerera med epost" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "Prenumerera på rapporter baserat på vilket baranagay du är i" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:200 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3120,10 +3116,9 @@ msgstr "Summering" msgid "Summary reports" msgstr "Sammanställningsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 msgid "Survey" -msgstr "Frågeresultat" +msgstr "" #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" @@ -3138,7 +3133,7 @@ msgstr "Text" msgid "Text only version" msgstr "Version med endast text" -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/update_edit.html:20 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "Text:" @@ -3183,7 +3178,7 @@ msgstr "Tack för din återkoppling. Vi återkommer så snart vi kan!" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Tack, vi är glada över att det har blivit åtgärdat. Har du rapporterat ett problem till en kommun tidigare?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:186 +#: perllib/FixMyStreet/App/Controller/Photo.pm:188 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." @@ -3200,20 +3195,19 @@ 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:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:683 msgid "That problem will now be resent." msgstr "Rapportern kommer nu att skickas om." #: perllib/FixMyStreet/App/Controller/Report.pm:117 -#, fuzzy msgid "That report cannot be viewed on %s." -msgstr "Rapporten kan inte visas på FixaMinGata." +msgstr "" #: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." msgstr "Rapporten har tagits bort från FixaMinGata." -#: templates/web/default/open311/index.html:23 +#: templates/web/default/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Open311 v2-attributet agency_responsible används för att lista de administrationer som tagit emot problemrapporten, vilket inte exakt är hur attributet definieras i Open311 v2-specifikationen." @@ -3224,9 +3218,8 @@ msgstr "Bekräftelsebrevet <strong>kan</strong> ta ett par minuter att komma fra #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 -#, fuzzy msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." -msgstr "Kommunen kommer inte att kunna hjälpa till om du inte lämnar så mycket detaljer som möjligt. Beskriv den exakta positionen (ex.v. \"på väggen\"), vad problemet är, hur länge det har funnits där, en beskrivning och foto (om du har), etc." +msgstr "" #: templates/web/fixmystreet/questionnaire/index.html:43 msgid "The details of your problem are available from the other tab above." @@ -3237,11 +3230,11 @@ msgid "The details of your problem are available on the right hand side of this msgstr "Detaljerna för ditt problem kan nu ses på höger sida av den här sidan." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:67 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "Felet var: %s" -#: templates/web/default/open311/index.html:19 +#: templates/web/default/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Följande Open311 v2-attribut returneras för varje begäran: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." @@ -3318,11 +3311,11 @@ msgstr "Vår enklaste bevakning är för rapporter inom ett geografiskt område: msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "Ärendet och informationen om problemet kommer att vara publikt. Ditt namn kommer också att vara publikt om du ger oss tillstånd att visa det." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Användaren kunde inte lokalisera problemet på kartan men angav en area inom vilket problemet finns" -#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Det uppstod ett problem med att visa sidan med alla rapporter. Försök gärna igen senare." @@ -3331,7 +3324,7 @@ msgstr "Det uppstod ett problem med att visa sidan med alla rapporter. Försök msgid "There was a problem showing this page. Please try again later." msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen senare." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3356,20 +3349,20 @@ msgstr "Det uppstod ett problem med din rapport. Se nedan." msgid "There were problems with your update. Please see below." msgstr "Det uppstod ett problem med din uppdatering. Se nedan." -#: templates/web/default/open311/index.html:10 +#: templates/web/default/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Den här API-implementationen är ett pågående arbete och har inte stabiliserats än. Den kommer att förändras." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:371 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Det här brevet har skickats till flera adresser eftersom rapportören inte angav någon kategori, eller den kategori som angavs hör till flera olika enheter. Du kan ignorera det här brevet om du inte är rätt person att hantera det, men det vore också mycket hjälpsamt om du kan ta reda på vem som är rätt person och anmäla detta till oss så att vi kan ändra databasen för framtida brev." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 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:891 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Den här informationen krävs" @@ -3379,12 +3372,15 @@ msgid "This is a developer site; things might break at any time, and the databas msgstr "Det här är en utvecklingsplats: olika saker kan komma att gå sönder vid olika tidpunkter och databasen kommer att rutinmässigt raderas." #: templates/web/fixmybarangay/reports/index.html:7 -#, fuzzy msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." +msgstr "" + +#: templates/web/emptyhomes/reports/index.html:4 +#, fuzzy +msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." msgstr "Det här är en sammanställning av alla rapporter. Du kan välja en enskild kommun för att se rapporterna skickade dit." #: templates/web/default/reports/index.html:7 -#: templates/web/emptyhomes/reports/index.html:4 #: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." @@ -3420,12 +3416,11 @@ msgstr "Arbete pågår med att lösa problemet" msgid "This problem is old and of unknown status." msgstr "Problemet är gammalt och har okänt status" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: perllib/FixMyStreet/Cobrand/Zurich.pm:67 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/report/_main.html:14 -#, fuzzy msgid "This report is awaiting moderation." -msgstr "Den här rapportern är öppen" +msgstr "" #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." @@ -3439,16 +3434,15 @@ msgstr "Det här problemet är markerat som löst" msgid "This report is currently marked as open." msgstr "Den här rapportern är öppen" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" -msgstr "%s rapporterat anonymt %s" +msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Den här sidan innehåller också ett foto av problemet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3466,7 +3460,7 @@ msgstr "Klicka på kartan för att <strong>rapportera ett problem</strong>." msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Skriv in postnummer eller gatunamn och ort för att se rapporter kring den platsen." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 msgid "To view a map of the precise location of this issue" msgstr "För att visa en karta med den exakta positionen för problemet" @@ -3479,9 +3473,8 @@ msgid "Total" msgstr "Totalt" #: templates/web/seesomething/report/new/fill_in_details_form.html:24 -#, fuzzy msgid "Transport Category" -msgstr "Skapa en kategori" +msgstr "" #: templates/web/default/js/translation_strings.html:23 msgid "Try again" @@ -3489,6 +3482,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:83 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/report/update-form.html:30 #: templates/web/default/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3496,11 +3491,11 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:32 -#: templates/web/default/admin/update_edit.html:22 +#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:59 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Obekräftat" @@ -3514,9 +3509,8 @@ msgid "Unknown alert type" msgstr "Okänd feltyp" #: templates/web/default/js/translation_strings.html:33 -#, fuzzy msgid "Unknown error" -msgstr "Okänt" +msgstr "" #: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" @@ -3532,20 +3526,19 @@ msgid "Update %s created for problem %d; by %s" msgstr "Uppdatering %s skapad för rapporten %d, av %s" #: templates/web/default/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:22 +#: templates/web/fixmystreet/contact/index.html:34 msgid "Update below added anonymously at %s" msgstr "Uppdateringen nedan tillagd anonymt %s" #: templates/web/default/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:24 +#: templates/web/fixmystreet/contact/index.html:36 msgid "Update below added by %s at %s" msgstr "Uppdateringen nedan tillagd av %s den %s" #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 -#, fuzzy msgid "Update body" -msgstr "Uppdaterad!" +msgstr "" #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" @@ -3555,16 +3548,16 @@ msgstr "Uppdatering per status" msgid "Update by {{name}}" msgstr "Uppdatering av {{name}}" -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Uppdateringen ändrade statusen till %s" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/default/admin/update_edit.html:44 msgid "Update marked problem as fixed" msgstr "Uppdateringen markerade problemet som löst" -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/update_edit.html:46 msgid "Update reopened problem" msgstr "Uppdateringen öppnade rapporten på nytt" @@ -3579,16 +3572,15 @@ msgstr "Uppdatering:" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#, fuzzy msgid "Updated" -msgstr "Uppdaterad!" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:763 -#: perllib/FixMyStreet/App/Controller/Admin.pm:907 -#: perllib/FixMyStreet/App/Controller/Admin.pm:960 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:485 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:972 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:488 msgid "Updated!" msgstr "Uppdaterad!" @@ -3617,30 +3609,30 @@ msgstr "Uppdateringar för {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Uppdateringar för det här problemet, FixaMinGata" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "User flag removed" msgstr "Användarflaggan borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 msgid "User flagged" msgstr "Användaren flaggad" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:215 #: templates/web/default/admin/flagged.html:24 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Användare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:357 +#: perllib/FixMyStreet/App/Controller/Admin.pm:387 msgid "Values updated" msgstr "Värden uppdaterade" -#: templates/web/default/admin/report_edit.html:12 -#: templates/web/default/admin/update_edit.html:12 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:23 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Visa rapporter på sidan" @@ -3678,9 +3670,8 @@ msgid "We found more than one match for that location. We show up to ten matches msgstr "Vi hittade fler än en träff. Vi visar upp till tio träffar nedan. Om ingen av dem överenstämmer med vald adress kan du söka igen. Om du söker efter en gata, lägg till stad efteråt: \"Vasagatan, Göteborg\" för att förfina sökningen." #: templates/web/default/auth/token.html:8 -#, fuzzy msgid "We have not been able to confirm your account - sorry." -msgstr "Vi har skickat dig epost med en länk för att bekräfta ditt konto." +msgstr "" #: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." @@ -3704,7 +3695,7 @@ msgstr "Vi visar aldrig din epostadress publikt" msgid "We never show your email address or phone number." msgstr "Vi visar aldrig din epostadress eller telefonnummer publikt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 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." @@ -3737,15 +3728,15 @@ msgstr "Vi vill gärna höra vad du tycker om FixaMinGata. Fyll i formuläret ne msgid "When edited" msgstr "Vid förändringar" -#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/problem_row.html:35 msgid "When sent" msgstr "Vid avsändning" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Whole block of empty flats" msgstr "Hela block med tomma lägenheter" -#: templates/web/default/open311/index.html:25 +#: templates/web/default/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "Vid sökningar är det också möjligt att söka efter agency_responsible för att begränsa svaren till de som skickats till en enstaka kommun. Söktermen för administrations-IDt erhålls av <a href=\"%s\">MapIt</a>." @@ -3779,13 +3770,13 @@ msgstr "År" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:33 -#: templates/web/default/admin/problem_row.html:14 -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/list_updates.html:37 +#: templates/web/default/admin/list_updates.html:38 +#: templates/web/default/admin/list_updates.html:39 +#: templates/web/default/admin/problem_row.html:20 +#: templates/web/default/admin/report_edit.html:63 +#: templates/web/default/admin/report_edit.html:77 +#: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:109 @@ -3803,12 +3794,12 @@ msgid "Yes I have a password" msgstr "Ja, jag har ett lösenord" #: templates/web/default/contact/index.html:37 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/fixmystreet/contact/index.html:50 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du vill anmäla missbruk, personlig inforation, eller motsvarande i följande rapport:" #: templates/web/default/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:16 +#: templates/web/fixmystreet/contact/index.html:28 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du vill anmäla missbruk, personlig inforation, eller motsvarande i följande uppdatering:" @@ -3816,9 +3807,8 @@ msgstr "Du vill anmäla missbruk, personlig inforation, eller motsvarande i föl #: templates/web/default/tokens/confirm_problem.html:21 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 -#, fuzzy msgid "You can <a href=\"%s%s\">view the problem on this site</a>." -msgstr ". Du kan <a href=\"%s%s\">visa problemet på webbsidan</a>." +msgstr "" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:13 @@ -3872,9 +3862,8 @@ msgstr "Du har bekräftat din bevakning." #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 -#, fuzzy msgid "You have successfully confirmed your email address." -msgstr "Du har bekräftat din bevakning." +msgstr "" #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 @@ -3894,17 +3883,16 @@ msgstr "Du har skapat en bevakning." msgid "You have successfully deleted your alert." msgstr "Du har tagit bort en bevakning." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har loggats in. Verifiera att dina uppgifter stämmer:" #: templates/web/default/email_sent.html:13 -#, fuzzy msgid "You must now click the link in the email we've just sent you." -msgstr "Du måste nu klicka på länken i det brev vi just skickat till dig. Om du inte gör det %s." +msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "Vill du verkligen skicka om?" @@ -3921,7 +3909,7 @@ msgstr "Dina rapporter" #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/contact/index.html:84 #: templates/web/fixmystreet/report/display.html:65 #: templates/web/fixmystreet/report/display.html:67 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 @@ -3931,9 +3919,8 @@ msgid "Your email" msgstr "Din epostadress" #: templates/web/seesomething/report/new/fill_in_details_form.html:81 -#, fuzzy msgid "Your email (optional)" -msgstr "Lösenord (valfritt)" +msgstr "" #: templates/web/bromley/report/display.html:132 #: templates/web/fixmystreet/auth/general.html:26 @@ -3973,7 +3960,7 @@ msgid "Your last name" msgstr "Ditt efternamn" #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/contact/index.html:77 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 @@ -4054,17 +4041,12 @@ msgstr "kommun" msgid "council ref: %s" msgstr "kommunens referens: %s" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "didn't use map" msgstr "använde inte kartan" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 -#, fuzzy -msgid "duplicate report" -msgstr "Skapa en rapport" - #: templates/web/default/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 #: templates/web/seesomething/around/postcode_form.html:9 @@ -4078,36 +4060,66 @@ msgstr "från %d olika användare" #: templates/web/fixmystreet/report/_item.html:12 #: templates/web/zurich/report/_item.html:16 -#, fuzzy msgid "last updated %s" -msgstr "Senaste uppdatering:" +msgstr "" #: perllib/Utils.pm:263 msgid "less than a minute" msgstr "mindre än en minut" -#: templates/web/default/report/updates.html:38 -msgid "marked as %s" +#: templates/web/default/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "" + +#: templates/web/default/report/updates.html:47 +#, fuzzy +msgid "marked as action scheduled" +msgstr "markerad som löst" + +#: templates/web/default/report/updates.html:59 +msgid "marked as an internal referral" +msgstr "" + +#: templates/web/default/report/updates.html:49 +#, fuzzy +msgid "marked as closed" msgstr "markerad som %s" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:28 +#: templates/web/default/report/updates.html:51 msgid "marked as fixed" msgstr "markerad som löst" +#: templates/web/default/report/updates.html:45 +#, fuzzy +msgid "marked as in progress" +msgstr "Arbete pågår med att lösa problemet" + +#: templates/web/default/report/updates.html:41 +#, fuzzy +msgid "marked as investigating" +msgstr "Undersöker" + +#: templates/web/default/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "" + +#: templates/web/default/report/updates.html:43 +#, fuzzy +msgid "marked as planned" +msgstr "markerad som löst" + +#: templates/web/default/report/updates.html:53 +#, fuzzy +msgid "marked as unable to fix" +msgstr "markerad som löst" + #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "Ej tillgängligt" -#: templates/web/default/report/updates.html:32 -msgid "no further action" -msgstr "" - -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 -msgid "not the council's responsibility" -msgstr "" - #: templates/web/default/alert/_list.html:87 #: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 @@ -4118,28 +4130,27 @@ msgstr "eller" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:27 -#: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:38 -#: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:50 -#: templates/web/zurich/admin/report_edit.html:52 -#, fuzzy +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:53 msgid "originally entered: “%s”" -msgstr "ursprungligen inmatat" +msgstr "" -#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/admin/report_edit.html:30 msgid "other areas:" msgstr "andra områden:" -#: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:36 +#: templates/web/default/report/updates.html:29 +#: templates/web/default/report/updates.html:39 msgid "reopened" msgstr "öppnat på nytt" @@ -4169,11 +4180,7 @@ msgstr "kommunen" msgid "there is no pin shown as the user did not use the map" msgstr "det finns ingen kartmarkering eftersom användaren inte använde kartan" -#: templates/web/default/report/updates.html:33 -msgid "third party responsibility" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 msgid "this type of local problem" msgstr "den här typen av problem" @@ -4181,17 +4188,17 @@ msgstr "den här typen av problem" msgid "today" msgstr "idag" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit.html:55 msgid "used map" msgstr "använde kartan" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:35 msgid "user is from same council as problem - %d" msgstr "användaren är från samma kommun som problemet - %d" -#: templates/web/default/admin/update_edit.html:32 +#: templates/web/default/admin/update_edit.html:38 msgid "user is problem owner" msgstr "användaren är inte problemägare" @@ -4215,11 +4222,11 @@ msgstr[0] "%d timme" msgstr[1] "%d timmar" #: templates/web/default/report/_support.html:6 -#, fuzzy, perl-format +#, perl-format msgid "%d supporter" msgid_plural "%d supporters" -msgstr[0] "%d supportrar" -msgstr[1] "%d supportrar" +msgstr[0] "" +msgstr[1] "" #: perllib/Utils.pm:284 #, perl-format @@ -4276,109 +4283,3 @@ msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagar" - -#~ msgid "(Don't worry — %s)" -#~ msgstr "(Oroa dig inte — %s)" - -#~ msgid "*unknown*" -#~ msgstr "*okänt*" - -#~ msgid "1 supporter" -#~ msgstr "1 supporter" - -#~ msgid "All confirmed" -#~ msgstr "Alla bekräftade" - -#~ msgid "All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your name if you give us permission." -#~ msgstr "All information du anger här kommer att skickas till ansvariga i <strong>%s</strong>. På FixaMinGata kommer vi att visa ärendet och information om problemet. Vi visar också ditt namn om du ger oss tillstånd till det." - -#~ msgid "Configuration updated" -#~ msgstr "Konfigurationen uppdaterad" - -#~ msgid "Configure Open311" -#~ msgstr "Konfigurera Open311" - -#~ msgid "Configure Open311 integration" -#~ msgstr "Konfigurera Open311-integration" - -#~ msgid "Council contacts" -#~ msgstr "Kommunkontakter" - -#~ msgid "Councils" -#~ msgstr "Kommuner" - -#~ msgid "Currently has 1+ deleted" -#~ msgstr "Har för närvarande 1+ borttagen" - -#~ msgid "Enter a nearby GB postcode, or street name and area" -#~ msgstr "Ange ett postnummer eller gatunamn och ort" - -#~ msgid "FixMyStreet administration" -#~ msgstr "FixaMinGata administration" - -#~ msgid "List Flagged" -#~ msgstr "Lista flaggade" - -#~ msgid "No info at all" -#~ msgstr "Ingen information alls" - -#~ msgid "Report empty properties" -#~ msgstr "Rapportera tomma fastigheter" - -#~ msgid "Search Abuse" -#~ msgstr "Sök missbruk" - -#~ msgid "Search Abuse Table" -#~ msgstr "Sök missbrukstabell" - -#~ msgid "Shelter Cymru" -#~ msgstr "Shelter Cymru" - -#~ msgid "" -#~ "Shelter Cymru is Wales’ people and homes charity and wants\n" -#~ " everyone in Wales to have a decent home. We believe a home is a fundamental\n" -#~ " right and essential to the health and well-being of people and communities.\n" -#~ " We work for people in housing need. We have offices all over Wales and\n" -#~ " prevent people from losing their homes by offering free, confidential and\n" -#~ " independent advice. When necessary we constructively challenge on behalf of\n" -#~ " people to ensure they are properly assisted and to improve practice and\n" -#~ " learning. We believe that bringing empty homes back into use can make a\n" -#~ " significant contribution to the supply of affordable homes in Wales." -#~ msgstr "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." - -#~ msgid "Some unconfirmeds" -#~ msgstr "Några obekräftade" - -#~ msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :" -#~ msgstr "Tack för att du bifogade ett foto. Vi måste nu lokalisera ditt problem så var vänlig ange närliggande gatunamn och ort eller postnummer i rutan nedan :" - -#~ msgid "The Empty Homes Agency" -#~ msgstr "Byrån för tomma bostäder" - -#~ msgid "" -#~ "The Empty Homes agency is an independent campaigning charity. We\n" -#~ " are not part of government, and have no formal links with local councils\n" -#~ " although we work in cooperation with both. We exist to highlight the waste\n" -#~ " of empty property and work with others to devise and promote sustainable\n" -#~ " solutions to bring empty property back into use. We are based in London but\n" -#~ " work across England. We also work in partnership with other charities across\n" -#~ " the UK." -#~ msgstr "Byrån för tomma bostäder är en oberoende kampanj. Vi är inte en del av någon myndighet och har inga formella kopplingar till kommuner, även om vi arbetar i samarbete med båda. Vi finns till för att lyfta fram frågan om bristen på bostäder och behovet av att ta byggnader och bostäder som inte används i besittning. Vi är baserade i London men arbetar runt om i England." - -#~ msgid "This is a summary of all reports for one %s." -#~ msgstr "Det här är en sammanställningsrapport för en %s." - -#~ msgid "This is a summary of all reports for this %s." -#~ msgstr "Det här är en sammanställningsrapport för %s." - -#~ msgid "To <strong>report a problem</strong>, simply click on the map at the correct location." -#~ msgstr "Klicka på kartan för att <strong>rapportera ett problem</strong>." - -#~ msgid "Unable to look up areas in MaPit. Please try again later." -#~ msgstr "Kan tyvärr inte validera adresser mot vår databas. Försök igen senare." - -#~ msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>." -#~ msgstr "Du kan <a href=\"%s\">se alla rapporter för kommunen</a> eller <a href=\"/reports\">visa alla kommuner</a>." - -#~ msgid "You can <a href=\"/reports\">show all councils</a>." -#~ msgstr "Du kan <a href=\"/reports\">visa alla kommuner</a>." diff --git a/notes/trouble_shooting.md b/notes/trouble_shooting.md new file mode 100644 index 000000000..7a982ff4b --- /dev/null +++ b/notes/trouble_shooting.md @@ -0,0 +1,42 @@ +# Trouble shooting + +## Empty datetime object + + Couldn't render template "index.html: undef error - Can't call method "strftime" without a package or object reference at /var/www/fixmystreet.127.0.0.1.xip.io/fixmystreet/perllib/Utils.pm line 232 + +- You might have a problem with a datefield that has been left empty by one cobrand that another expects to have a value. Inspert the problem table in the database. +- You may have problems being returned by memcached that your database does not have. Restart memcached to rule this out. + +## Wrong cobrand is displaying + +- Make sure that your hostname does not contain anything that another cobrand is matching on. For example if your config is + +``` yaml +ALLOWED_COBRANDS: + - fixmystreet + - zurich +```` + +Then a domain like `zurich.fixmystreet.com` will match `fixmystreet` first and that is the cobrand that will be served. + +## Account creation emails not arriving + +Your receiving email servers may be rejecting them because: + +* your VM IP address has been blacklisted +* your ISP blocks outgoing connections to port 25 (mobile broadband providers often do this) +* sender verification has failed (applies to `@mysociety.org` servers) - check that your `DO_NOT_REPLY_EMAIL` conf setting passes sender verification (using your own email address works well). + +Perhaps check the entries in `/var/log/mail.log` to check that the message has been sent by the app, and if it has been possible to send them on. + +## Translations not being used + +The locale needs to be installed too or the translations will not be used. Use +`locale -a` to list them all and ensure the one your translation uses is in the +list. + + +## Database connection errors trying to run update-schema + +Make sure that you specify a database host and password in `general.yml`. You +may need to explicitly give your user a password. diff --git a/perllib/FixMyStreet.pm b/perllib/FixMyStreet.pm index be488a796..6c664f1d1 100644 --- a/perllib/FixMyStreet.pm +++ b/perllib/FixMyStreet.pm @@ -7,6 +7,7 @@ use Path::Class; my $ROOT_DIR = file(__FILE__)->parent->parent->absolute->resolve; use Readonly; +use Sub::Override; use mySociety::Config; use mySociety::DBHandle; @@ -85,6 +86,41 @@ sub config { return exists $CONFIG{$key} ? $CONFIG{$key} : undef; } +sub override_config($&) { + my $config = shift; + my $code = \&{shift @_}; + + mySociety::MaPit::configure($config->{MAPIT_URL}) if $config->{MAPIT_URL}; + + # For historical reasons, we have two ways of askig for config variables. + # Override them both, I'm sure we'll find time to get rid of one eventually. + my $override_guard1 = Sub::Override->new( + "FixMyStreet::config", + sub { + my ($class, $key) = @_; + return $config->{$key} if exists $config->{$key}; + my $orig_config = mySociety::Config::load_default(); + return $orig_config->{$key} if exists $orig_config->{$key}; + } + ); + my $override_guard2 = Sub::Override->new( + "mySociety::Config::get", + sub ($;$) { + my ($key, $default) = @_; + return $config->{$key} if exists $config->{$key}; + my $orig_config = mySociety::Config::load_default(); + return $orig_config->{$key} if exists $orig_config->{$key}; + return $default if @_ == 2; + } + ); + + $code->(); + + $override_guard1->restore(); + $override_guard2->restore(); + mySociety::MaPit::configure() if $config->{MAPIT_URL};; +} + =head2 dbic_connect_info $connect_info = FixMyStreet->dbic_connect_info(); diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index e2547019b..4973b7c4e 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -130,6 +130,8 @@ sub index : Path : Args(0) { $c->stash->{categories} = $c->cobrand->problems->categories_summary(); + $c->stash->{total_bodies} = $c->model('DB::Body')->count(); + return 1; } @@ -234,6 +236,7 @@ sub bodies : Path('bodies') : Args(0) { my $posted = $c->req->param('posted') || ''; if ( $posted eq 'body' ) { + $c->forward('check_for_super_user'); $c->forward('check_token'); my $params = $c->forward('body_params'); @@ -296,6 +299,7 @@ sub body : Path('body') : Args(1) { $c->stash->{body_id} = $body_id; + $c->forward( 'check_for_super_user' ); $c->forward( 'get_token' ); $c->forward( 'lookup_body' ); $c->forward( 'fetch_all_bodies' ); @@ -311,6 +315,13 @@ sub body : Path('body') : Args(1) { return 1; } +sub check_for_super_user : Private { + my ( $self, $c ) = @_; + if ( $c->cobrand->moniker eq 'zurich' && $c->stash->{admin_type} ne 'super' ) { + $c->detach('/page_error_404_not_found', []); + } +} + sub update_contacts : Private { my ( $self, $c ) = @_; @@ -377,6 +388,7 @@ sub update_contacts : Private { $c->stash->{updated} = _('Values updated'); } elsif ( $posted eq 'body' ) { + $c->forward('check_for_super_user'); $c->forward('check_token'); my $params = $c->forward( 'body_params' ); @@ -401,7 +413,7 @@ sub update_contacts : Private { sub body_params : Private { my ( $self, $c ) = @_; - my @fields = qw/name endpoint jurisdiction api_key send_method send_comments suppress_alerts send_extended_statuses comment_user_id can_be_devolved parent/; + my @fields = qw/name endpoint jurisdiction api_key send_method send_comments suppress_alerts send_extended_statuses comment_user_id can_be_devolved parent deleted/; my %defaults = map { $_ => '' } @fields; %defaults = ( %defaults, send_comments => 0, @@ -410,6 +422,7 @@ sub body_params : Private { send_extended_statuses => 0, can_be_devolved => 0, parent => undef, + deleted => 0, ); my %params = map { $_ => $c->req->param($_) || $defaults{$_} } @fields; return \%params; @@ -420,6 +433,7 @@ sub display_contacts : Private { my $contacts = $c->stash->{body}->contacts->search(undef, { order_by => [ 'category' ] } ); $c->stash->{contacts} = $contacts; + $c->stash->{live_contacts} = $contacts->search({ deleted => 0 }); if ( $c->req->param('text') && $c->req->param('text') == 1 ) { $c->stash->{template} = 'admin/council_contacts.txt'; @@ -1014,8 +1028,20 @@ sub flagged : Path('flagged') : Args(0) { $c->stash->{problems} = [ $problems->all ]; my $users = $c->model('DB::User')->search( { flagged => 1 } ); + my @users = $users->all; + my %email2user = map { $_->email => $_ } @users; + $c->stash->{users} = [ @users ]; - $c->stash->{users} = $users; + my @abuser_emails = $c->model('DB::Abuse')->all(); + + foreach my $email (@abuser_emails) { + # Slight abuse of the boolean flagged value + if ($email2user{$email->email}) { + $email2user{$email->email}->flagged( 2 ); + } else { + push @{$c->stash->{users}}, { email => $email->email, flagged => 2 }; + } + } return 1; } diff --git a/perllib/FixMyStreet/App/Controller/JSON.pm b/perllib/FixMyStreet/App/Controller/JSON.pm index 1a7c1915b..17507a84b 100644 --- a/perllib/FixMyStreet/App/Controller/JSON.pm +++ b/perllib/FixMyStreet/App/Controller/JSON.pm @@ -8,6 +8,7 @@ use JSON; use DateTime; use DateTime::Format::ISO8601; use List::MoreUtils 'uniq'; +use FixMyStreet::App; =head1 NAME @@ -80,11 +81,13 @@ sub problems : Local { $date_col = 'lastupdate'; } + my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser; + my $one_day = DateTime::Duration->new( days => 1 ); my $query = { $date_col => { - '>=' => $start_dt, - '<=' => $end_dt + $one_day, + '>=' => $dt_parser->format_datetime($start_dt), + '<=' => $dt_parser->format_datetime($end_dt + $one_day), }, state => [ @state ], }; diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index 8b00d1533..09afabecf 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -30,17 +30,19 @@ Display a photo =cut -sub during :LocalRegex('^([0-9a-f]{40})\.temp\.jpeg$') { +sub during :LocalRegex('^([0-9a-f]{40})\.(temp|fulltemp)\.jpeg$') { my ( $self, $c ) = @_; - my ( $hash ) = @{ $c->req->captures }; + my ( $hash, $size ) = @{ $c->req->captures }; my $file = file( $c->config->{UPLOAD_DIR}, "$hash.jpeg" ); my $photo = $file->slurp; - if ( $c->cobrand->default_photo_resize ) { - $photo = _shrink( $photo, $c->cobrand->default_photo_resize ); - } else { - $photo = _shrink( $photo, '250x250' ); + if ( $size eq 'temp' ) { + if ( $c->cobrand->default_photo_resize ) { + $photo = _shrink( $photo, $c->cobrand->default_photo_resize ); + } else { + $photo = _shrink( $photo, '250x250' ); + } } $c->forward( 'output', [ $photo ] ); diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 3d3ddce1e..6018dfa80 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -956,6 +956,9 @@ sub check_for_errors : Private { delete $field_errors{name}; my $report = $c->stash->{report}; $report->title( Utils::cleanup_text( substr($report->detail, 0, 25) ) ); + if ( ! $c->req->param('phone') ) { + $field_errors{phone} = _("This information is required"); + } } # FIXME: need to check for required bromley fields here diff --git a/perllib/FixMyStreet/Cobrand/FixMindelo.pm b/perllib/FixMyStreet/Cobrand/FixMindelo.pm index 6f81bad84..59debf157 100644 --- a/perllib/FixMyStreet/Cobrand/FixMindelo.pm +++ b/perllib/FixMyStreet/Cobrand/FixMindelo.pm @@ -4,12 +4,12 @@ use base 'FixMyStreet::Cobrand::Default'; use strict; use warnings; - sub country { return 'CV'; } -sub language_domain { 'FixMindelo' } +sub languages { [ 'pt-cv,Portuguese,pt_CV', 'en-gb,English,en_GB' ] } +sub language_override { 'pt-cv' } sub disambiguate_location { return { diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm index ffdc1feab..e15170721 100644 --- a/perllib/FixMyStreet/Cobrand/Zurich.pm +++ b/perllib/FixMyStreet/Cobrand/Zurich.pm @@ -8,6 +8,47 @@ use RABX; use strict; use warnings; +=head1 NAME + +Zurich FixMyStreet cobrand + +=head1 DESCRIPTION + +This module provides the specific functionality for the Zurich FMS cobrand. + +=head1 DEVELOPMENT NOTES + +The admin for Zurich is different to the other cobrands. To access it you need +to be logged in as a user associated with an appropriate body. + +You can create the bodies needed to develop by running the 't/cobrand/zurich.t' +test script with the three C<$mech->delete...> lines at the end commented out. +This should leave you with the bodies and users correctly set up. + +The entries will be something like this (but with different ids). + + Bodies: + id | name | parent | endpoint + ----+---------------+--------+--------------------------- + 1 | Zurich | | + 2 | Division 1 | 1 | division@example.org + 3 | Subdivision A | 2 | subdivision@example.org + 4 | External Body | | external_body@example.org + + Users: + id | email | from_body + ----+------------------+----------- + 2 | dm1@example.org | 2 + 3 | sdm1@example.org | 3 + +The passwords for the users is 'secret'. + +Note: the password hashes are salted with the user's id so cannot be easily +changed. High ids have been used so that it should not conflict with anything +you already have, and the countres set so that they shouldn't in future. + +=cut + sub shorten_recency_if_new_greater_than_fixed { return 0; } @@ -356,29 +397,51 @@ sub admin_report_edit { } - # Problem updates upon submission + # If super or sdm check that the token is correct before proceeding if ( ($type eq 'super' || $type eq 'dm') && $c->req->param('submit') ) { $c->forward('check_token'); + } + + # All types of users can add internal notes + if ( ($type eq 'super' || $type eq 'dm' || $type eq 'sdm') && $c->req->param('submit') ) { + # If there is a new note add it as a comment to the problem (with is_internal_note set true in extra). + if ( my $new_internal_note = $c->req->params->{new_internal_note} ) { + $problem->add_to_comments( { + text => $new_internal_note, + user => $c->user->obj, + state => 'hidden', # seems best fit, should not be shown publicly + mark_fixed => 0, + anonymous => 1, + extra => { is_internal_note => 1 }, + } ); + } + } + # Problem updates upon submission + if ( ($type eq 'super' || $type eq 'dm') && $c->req->param('submit') ) { # Predefine the hash so it's there for lookups - # XXX Note you need to shallow copy each time you set it, due to a bug? in FilterColumn. my $extra = $problem->extra || {}; - $extra->{internal_notes} = $c->req->param('internal_notes'); $extra->{publish_photo} = $c->req->params->{publish_photo} || 0; $extra->{third_personal} = $c->req->params->{third_personal} || 0; # Make sure we have a copy of the original detail field $extra->{original_detail} = $problem->detail if !$extra->{original_detail} && $c->req->params->{detail} && $problem->detail ne $c->req->params->{detail}; + # Some changes will be accompanied by an internal note, which if needed + # should be stored in this variable. + my $internal_note_text = ""; + # Workflow things my $redirect = 0; my $new_cat = $c->req->params->{category}; if ( $new_cat && $new_cat ne $problem->category ) { my $cat = $c->model('DB::Contact')->search( { category => $c->req->params->{category} } )->first; + my $old_cat = $problem->category; $problem->category( $new_cat ); $problem->external_body( undef ); $problem->bodies_str( $cat->body_id ); $problem->whensent( undef ); $extra->{changed_category} = 1; + $internal_note_text = "Weitergeleitet von $old_cat an $new_cat"; $redirect = 1 if $cat->body_id ne $body->id; } elsif ( my $subdiv = $c->req->params->{body_subdivision} ) { $extra->{moderated_overdue} = $self->overdue( $problem ); @@ -396,12 +459,12 @@ sub admin_report_edit { $redirect = 1; } else { $problem->state( $c->req->params->{state} ) if $c->req->params->{state}; - if ( $problem->state eq 'hidden' ) { + if ( $problem->state eq 'hidden' && $c->req->params->{send_rejected_email} ) { _admin_send_email( $c, 'problem-rejected.txt', $problem ); } } - $problem->extra( { %$extra } ); + $problem->extra( $extra ); $problem->title( $c->req->param('title') ); $problem->detail( $c->req->param('detail') ); $problem->latitude( $c->req->param('latitude') ); @@ -410,7 +473,7 @@ sub admin_report_edit { # Final, public, Update from DM if (my $update = $c->req->param('status_update')) { $extra->{public_response} = $update; - $problem->extra( { %$extra } ); + $problem->extra( $extra ); if ($c->req->params->{publish_response}) { $problem->state( 'fixed - council' ); _admin_send_email( $c, 'problem-closed.txt', $problem ); @@ -424,9 +487,22 @@ sub admin_report_edit { '<p><em>' . _('Updated!') . '</em></p>'; # do this here otherwise lastupdate and confirmed times - # do not display correctly + # do not display correctly (reloads problem from database, including + # fields modified by the database when saving) $problem->discard_changes; + # Create an internal note if required + if ($internal_note_text) { + $problem->add_to_comments( { + text => $internal_note_text, + user => $c->user->obj, + state => 'hidden', # seems best fit, should not be shown publicly + mark_fixed => 0, + anonymous => 1, + extra => { is_internal_note => 1 }, + } ); + } + if ( $redirect ) { $c->detach('index'); } @@ -462,14 +538,6 @@ sub admin_report_edit { $db_update = 1; } - my $extra = $problem->extra || {}; - $extra->{internal_notes} ||= ''; - if ($c->req->param('internal_notes') && $c->req->param('internal_notes') ne $extra->{internal_notes}) { - $extra->{internal_notes} = $c->req->param('internal_notes'); - $problem->extra( { %$extra } ); - $db_update = 1; - } - $problem->update if $db_update; # Add new update from status_update @@ -491,7 +559,7 @@ sub admin_report_edit { if ($c->req->param('no_more_updates')) { my $extra = $problem->extra || {}; $extra->{subdiv_overdue} = $self->overdue( $problem ); - $problem->extra( { %$extra } ); + $problem->extra( $extra ); $problem->bodies_str( $body->parent->id ); $problem->whensent( undef ); $problem->state( 'planned' ); @@ -592,10 +660,31 @@ sub admin_stats { ); if ( $c->req->params->{export} ) { - my $problems = $c->model('DB::Problem')->search( { %params }, { columns => [ 'id', 'created', 'latitude', 'longitude', 'cobrand', 'category' ] } ); - my $body = "ID,Created,E,N,Category\n"; - while (my $report = $problems->next) { - $body .= join( ',', $report->id, $report->created, $report->local_coords, $report->category ) . "\n"; + my $problems = $c->model('DB::Problem')->search( + {%params}, + { + columns => [ + 'id', 'created', + 'latitude', 'longitude', + 'cobrand', 'category', + 'state', 'user_id', + 'external_body' + ] + } + ); + my $body = "ID,Created,E,N,Category,Status,UserID,External Body\n"; + while ( my $report = $problems->next ) { + my $external_body; + my $body_name = ""; + if ( $external_body = $report->body($c) ) { + $body_name = $external_body->name; + } + $body .= join( ',', + $report->id, $report->created, + $report->local_coords, $report->category, + $report->state, $report->user_id, + "\"$body_name\"" ) + . "\n"; } $c->res->content_type('text/csv; charset=utf-8'); $c->res->body($body); diff --git a/perllib/FixMyStreet/DB/RABXColumn.pm b/perllib/FixMyStreet/DB/RABXColumn.pm new file mode 100644 index 000000000..5f1583018 --- /dev/null +++ b/perllib/FixMyStreet/DB/RABXColumn.pm @@ -0,0 +1,98 @@ +package FixMyStreet::DB::RABXColumn; + +use strict; +use warnings; + +use IO::String; +use RABX; + +=head1 NAME + +FixMyStreet::DB::RABXColumn + +=head2 DESCRIPTION + +This is a helper component that will setup the RABX serialisation for some +fields. This is useful for when you want to persist some data structure such as +hashrefs etc. + +This code will also change the default FilterColumn behaviour so that whenever +your set a column, or specify a RABX'd column in an ->update the value is saved +to the database. The default behaviour is to check if the value is already set, +and for hashrefs this means that changes to the contents are missed as it is +still the same hashref. + +By putting all this code in one place there is also much less repetition. + +=cut + +# Store which columns are RABX cols. +# $RABX_COLUMNS{$class}{$col} = 1 +my %RABX_COLUMNS = (); + +sub _get_class_identifier { + my $class = ref $_[0] || $_[0]; + $class =~ s/.*?(\w+)$/$1/; + return $class; +} + +=head1 METHODS + +=head2 rabx_column + + # In one of your ::Result:: modules + __PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn"); + __PACKAGE__->rabx_column('data'); + +This sets up the filtering to and from the database, and also changes the +set_filtered_column behaviour to not trust the cache. + +=cut + +sub rabx_column { + my ($class, $col) = @_; + + # Apply the filtering for this column + $class->filter_column( + $col => { + filter_from_storage => sub { + my $self = shift; + my $ser = shift; + return undef unless defined $ser; + utf8::encode($ser) if utf8::is_utf8($ser); + my $h = new IO::String($ser); + return RABX::wire_rd($h); + }, + filter_to_storage => sub { + my $self = shift; + my $data = shift; + my $ser = ''; + my $h = new IO::String($ser); + RABX::wire_wr( $data, $h ); + return $ser; + }, + } + ); + + # store that this column is a RABX column. + $RABX_COLUMNS{ _get_class_identifier($class) }{$col} = 1; +} + + +sub set_filtered_column { + my ($self, $col, $val) = @_; + + my $class = ref $self; + + # because filtered objects may be expensive to marshall for storage there + # is a cache that attempts to detect if they have changed or not. For us + # this cache breaks things and our marshalling is cheap, so clear it when + # trying set a column. + delete $self->{_filtered_column}{$col} + if $RABX_COLUMNS{ _get_class_identifier($class) }{$col}; + + return $self->next::method($col, $val); +} + + +1; diff --git a/perllib/FixMyStreet/DB/Result/Alert.pm b/perllib/FixMyStreet/DB/Result/Alert.pm index fc84c8fd5..4ce72f873 100644 --- a/perllib/FixMyStreet/DB/Result/Alert.pm +++ b/perllib/FixMyStreet/DB/Result/Alert.pm @@ -48,7 +48,7 @@ __PACKAGE__->belongs_to( "alert_type", "FixMyStreet::DB::Result::AlertType", { ref => "alert_type" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, + { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" }, ); __PACKAGE__->has_many( "alerts_sent", @@ -60,12 +60,12 @@ __PACKAGE__->belongs_to( "user", "FixMyStreet::DB::Result::User", { id => "user_id" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, + { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vump36YxUO4FQi5Do6DwvA +# Created by DBIx::Class::Schema::Loader v0.07035 @ 2013-09-10 17:11:54 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:d9yIFiTGtbtFaULXZNKstQ # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/perllib/FixMyStreet/DB/Result/AlertSent.pm b/perllib/FixMyStreet/DB/Result/AlertSent.pm index a537c95cd..422e010a9 100644 --- a/perllib/FixMyStreet/DB/Result/AlertSent.pm +++ b/perllib/FixMyStreet/DB/Result/AlertSent.pm @@ -26,12 +26,12 @@ __PACKAGE__->belongs_to( "alert", "FixMyStreet::DB::Result::Alert", { id => "alert_id" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, + { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oN+36hDWJuc0hqkCW9BHOw +# Created by DBIx::Class::Schema::Loader v0.07035 @ 2013-09-10 17:11:54 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:COwsprqRSNZS1IxJrPYgMQ # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/perllib/FixMyStreet/DB/Result/Body.pm b/perllib/FixMyStreet/DB/Result/Body.pm index 83704563a..c2b0555fb 100644 --- a/perllib/FixMyStreet/DB/Result/Body.pm +++ b/perllib/FixMyStreet/DB/Result/Body.pm @@ -20,6 +20,8 @@ __PACKAGE__->add_columns( }, "name", { data_type => "text", is_nullable => 0 }, + "parent", + { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, "endpoint", { data_type => "text", is_nullable => 1 }, "jurisdiction", @@ -38,8 +40,8 @@ __PACKAGE__->add_columns( { data_type => "boolean", default_value => \"false", is_nullable => 0 }, "send_extended_statuses", { data_type => "boolean", default_value => \"false", is_nullable => 0 }, - "parent", - { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, + "deleted", + { data_type => "boolean", default_value => \"false", is_nullable => 0 }, ); __PACKAGE__->set_primary_key("id"); __PACKAGE__->has_many( @@ -59,10 +61,10 @@ __PACKAGE__->belongs_to( "FixMyStreet::DB::Result::User", { id => "comment_user_id" }, { - is_deferrable => 1, + is_deferrable => 0, join_type => "LEFT", - on_delete => "CASCADE", - on_update => "CASCADE", + on_delete => "NO ACTION", + on_update => "NO ACTION", }, ); __PACKAGE__->has_many( @@ -76,10 +78,10 @@ __PACKAGE__->belongs_to( "FixMyStreet::DB::Result::Body", { id => "parent" }, { - is_deferrable => 1, + is_deferrable => 0, join_type => "LEFT", - on_delete => "CASCADE", - on_update => "CASCADE", + on_delete => "NO ACTION", + on_update => "NO ACTION", }, ); __PACKAGE__->has_many( @@ -90,8 +92,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-12-19 12:47:10 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DdtXjMWRpz20ZHjtY3oP2w +# Created by DBIx::Class::Schema::Loader v0.07035 @ 2013-09-10 18:11:23 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hTOxxiiHmC8nmQK/p8dXhQ sub url { my ( $self, $c ) = @_; diff --git a/perllib/FixMyStreet/DB/Result/BodyArea.pm b/perllib/FixMyStreet/DB/Result/BodyArea.pm index 844a3277d..4447777dc 100644 --- a/perllib/FixMyStreet/DB/Result/BodyArea.pm +++ b/perllib/FixMyStreet/DB/Result/BodyArea.pm @@ -21,12 +21,12 @@ __PACKAGE__->belongs_to( "body", "FixMyStreet::DB::Result::Body", { id => "body_id" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, + { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-12-19 12:47:10 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:aAr+Nadyu8IckZlK6+PTNg +# Created by DBIx::Class::Schema::Loader v0.07035 @ 2013-09-10 17:11:54 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+hzie6kHleUBoEt199c/nQ __PACKAGE__->set_primary_key(__PACKAGE__->columns); diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm index eb9e52a65..2d5b6b2c3 100644 --- a/perllib/FixMyStreet/DB/Result/Comment.pm +++ b/perllib/FixMyStreet/DB/Result/Comment.pm @@ -54,6 +54,10 @@ __PACKAGE__->add_columns( { data_type => "boolean", default_value => \"false", is_nullable => 0 }, "problem_state", { data_type => "text", is_nullable => 1 }, + "external_id", + { data_type => "text", is_nullable => 1 }, + "extra", + { data_type => "text", is_nullable => 1 }, "send_fail_count", { data_type => "integer", default_value => 0, is_nullable => 0 }, "send_fail_reason", @@ -62,55 +66,32 @@ __PACKAGE__->add_columns( { data_type => "timestamp", is_nullable => 1 }, "whensent", { data_type => "timestamp", is_nullable => 1 }, - "external_id", - { data_type => "text", is_nullable => 1 }, - "extra", - { data_type => "text", is_nullable => 1 }, ); __PACKAGE__->set_primary_key("id"); __PACKAGE__->belongs_to( "problem", "FixMyStreet::DB::Result::Problem", { id => "problem_id" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, + { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" }, ); __PACKAGE__->belongs_to( "user", "FixMyStreet::DB::Result::User", { id => "user_id" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, + { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-07-11 18:53:26 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tSejJzLxHD/fMWjpa10lfA - -__PACKAGE__->filter_column( - extra => { - filter_from_storage => sub { - my $self = shift; - my $ser = shift; - return undef unless defined $ser; - utf8::encode($ser) if utf8::is_utf8($ser); - my $h = new IO::String($ser); - return RABX::wire_rd($h); - }, - filter_to_storage => sub { - my $self = shift; - my $data = shift; - my $ser = ''; - my $h = new IO::String($ser); - RABX::wire_wr( $data, $h ); - return $ser; - }, - } -); +# Created by DBIx::Class::Schema::Loader v0.07035 @ 2013-09-10 17:11:54 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:D/+UWcF7JO/EkCiJaAHUOw + +__PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn"); +__PACKAGE__->rabx_column('extra'); use DateTime::TimeZone; use Image::Size; use Moose; use namespace::clean -except => [ 'meta' ]; -use RABX; with 'FixMyStreet::Roles::Abuser'; @@ -179,8 +160,8 @@ sub get_photo_params { =head2 meta_problem_state -Returns a string suitable for display in the update meta section. -Mostly removes the '- council/user' bit from fixed states +Returns a string suitable for display lookup in the update meta section. +Removes the '- council/user' bit from fixed states. =cut @@ -190,10 +171,6 @@ sub meta_problem_state { my $state = $self->problem_state; $state =~ s/ -.*$//; - $state = _("not the council's responsibility") - if $state eq 'not responsible'; - $state = _('duplicate report') if $state eq 'duplicate'; - return $state; } diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm index 551bcd019..eca028c9b 100644 --- a/perllib/FixMyStreet/DB/Result/Contact.pm +++ b/perllib/FixMyStreet/DB/Result/Contact.pm @@ -53,32 +53,14 @@ __PACKAGE__->belongs_to( "body", "FixMyStreet::DB::Result::Body", { id => "body_id" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, + { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-12-13 12:34:33 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:imXq3EtrC0FrQwj+E2xfBw +# Created by DBIx::Class::Schema::Loader v0.07035 @ 2013-09-10 17:11:54 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hq/BFHDEu4OUI4MSy3OyHg -__PACKAGE__->filter_column( - extra => { - filter_from_storage => sub { - my $self = shift; - my $ser = shift; - return undef unless defined $ser; - utf8::encode($ser) if utf8::is_utf8($ser); - my $h = new IO::String($ser); - return RABX::wire_rd($h); - }, - filter_to_storage => sub { - my $self = shift; - my $data = shift; - my $ser = ''; - my $h = new IO::String($ser); - RABX::wire_wr( $data, $h ); - return $ser; - }, - } -); +__PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn"); +__PACKAGE__->rabx_column('extra'); 1; diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index ec15600b6..f14a29f56 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -120,12 +120,12 @@ __PACKAGE__->belongs_to( "user", "FixMyStreet::DB::Result::User", { id => "user_id" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, + { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-12-13 15:13:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:H2P3Og37G569nQdQA1IWaA +# Created by DBIx::Class::Schema::Loader v0.07035 @ 2013-09-10 17:11:54 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:U/4BT8EGfcCLKA/7LX+qyQ # Add fake relationship to stored procedure table __PACKAGE__->has_one( @@ -135,54 +135,15 @@ __PACKAGE__->has_one( { cascade_copy => 0, cascade_delete => 0 }, ); -__PACKAGE__->filter_column( - extra => { - filter_from_storage => sub { - my $self = shift; - my $ser = shift; - return undef unless defined $ser; - utf8::encode($ser) if utf8::is_utf8($ser); - my $h = new IO::String($ser); - return RABX::wire_rd($h); - }, - filter_to_storage => sub { - my $self = shift; - my $data = shift; - my $ser = ''; - my $h = new IO::String($ser); - RABX::wire_wr( $data, $h ); - return $ser; - }, - } -); - -__PACKAGE__->filter_column( - geocode => { - filter_from_storage => sub { - my $self = shift; - my $ser = shift; - return undef unless defined $ser; - utf8::encode($ser) if utf8::is_utf8($ser); - my $h = new IO::String($ser); - return RABX::wire_rd($h); - }, - filter_to_storage => sub { - my $self = shift; - my $data = shift; - my $ser = ''; - my $h = new IO::String($ser); - RABX::wire_wr( $data, $h ); - return $ser; - }, - } -); +__PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn"); +__PACKAGE__->rabx_column('extra'); +__PACKAGE__->rabx_column('geocode'); use DateTime::TimeZone; use Image::Size; use Moose; use namespace::clean -except => [ 'meta' ]; use Utils; -use RABX; with 'FixMyStreet::Roles::Abuser'; diff --git a/perllib/FixMyStreet/DB/Result/Questionnaire.pm b/perllib/FixMyStreet/DB/Result/Questionnaire.pm index fcaa17d99..7f9c79d9a 100644 --- a/perllib/FixMyStreet/DB/Result/Questionnaire.pm +++ b/perllib/FixMyStreet/DB/Result/Questionnaire.pm @@ -36,12 +36,12 @@ __PACKAGE__->belongs_to( "problem", "FixMyStreet::DB::Result::Problem", { id => "problem_id" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, + { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" }, ); -# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NGlSRjoBpDoIvK3EueqN6Q +# Created by DBIx::Class::Schema::Loader v0.07035 @ 2013-09-10 17:11:54 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oL1Hk4/bNG14CY74GA75SA use DateTime::TimeZone; use Moose; diff --git a/perllib/FixMyStreet/DB/Result/Token.pm b/perllib/FixMyStreet/DB/Result/Token.pm index 028300842..5525fe7a5 100644 --- a/perllib/FixMyStreet/DB/Result/Token.pm +++ b/perllib/FixMyStreet/DB/Result/Token.pm @@ -34,8 +34,6 @@ __PACKAGE__->set_primary_key("scope", "token"); # use mySociety::DBHandle qw(dbh); use mySociety::AuthToken; -use IO::String; -use RABX; =head1 NAME @@ -54,26 +52,9 @@ ms_current_timestamp. =cut -__PACKAGE__->filter_column( - data => { - filter_from_storage => sub { - my $self = shift; - my $ser = shift; - return undef unless defined $ser; - utf8::encode($ser) if utf8::is_utf8($ser); - my $h = new IO::String($ser); - return RABX::wire_rd($h); - }, - filter_to_storage => sub { - my $self = shift; - my $data = shift; - my $ser = ''; - my $h = new IO::String($ser); - RABX::wire_wr( $data, $h ); - return $ser; - }, - } -); +__PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn"); +__PACKAGE__->rabx_column('data'); + sub new { my ( $class, $attrs ) = @_; diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm index 481b654c9..523382670 100644 --- a/perllib/FixMyStreet/DB/Result/User.pm +++ b/perllib/FixMyStreet/DB/Result/User.pm @@ -58,10 +58,10 @@ __PACKAGE__->belongs_to( "FixMyStreet::DB::Result::Body", { id => "from_body" }, { - is_deferrable => 1, + is_deferrable => 0, join_type => "LEFT", - on_delete => "CASCADE", - on_update => "CASCADE", + on_delete => "NO ACTION", + on_update => "NO ACTION", }, ); __PACKAGE__->has_many( @@ -72,8 +72,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-12-14 09:23:59 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:aw374WQraL5ysOvUmUIU3w +# Created by DBIx::Class::Schema::Loader v0.07035 @ 2013-09-10 17:11:54 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jRAtXRLRNozCmthAg9p0dA __PACKAGE__->add_columns( "password" => { diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm index 07848d782..b00daab40 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm @@ -259,10 +259,14 @@ sub send_reports { } $cobrand->set_lang_and_domain($row->lang, 1); - if ( $row->is_from_abuser ) { + if ( $row->is_from_abuser) { $row->update( { state => 'hidden' } ); debug_print("hiding because its sender is flagged as an abuser", $row->id) if $debug_mode; next; + } elsif ( $row->title =~ /app store test/i ) { + $row->update( { state => 'hidden' } ); + debug_print("hiding because it is an app store test message", $row->id) if $debug_mode; + next; } # Template variables for the email @@ -464,7 +468,8 @@ sub send_reports { send_fail_count => { '>', 0 } } ); while (my $row = $unsent->next) { - $sending_errors .= "* http://www.fixmystreet.com/report/" . $row->id . ", failed " + my $base_url = mySociety::Config::get('BASE_URL'); + $sending_errors .= "* " . $base_url . "/report/" . $row->id . ", failed " . $row->send_fail_count . " times, last at " . $row->send_fail_timestamp . ", reason " . $row->send_fail_reason . "\n"; } diff --git a/perllib/FixMyStreet/Map/OSM/MapQuest.pm b/perllib/FixMyStreet/Map/OSM/MapQuest.pm index 4751679f5..ff314a4da 100644 --- a/perllib/FixMyStreet/Map/OSM/MapQuest.pm +++ b/perllib/FixMyStreet/Map/OSM/MapQuest.pm @@ -28,7 +28,7 @@ sub map_tiles { } sub base_tile_url { - return 'mqcdn.com/tiles/1.0.0/osm/'; + return 'mqcdn.com/tiles/1.0.0/map/'; } 1; diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm index e91c6a1d6..be8f004a5 100644 --- a/perllib/FixMyStreet/TestMech.pm +++ b/perllib/FixMyStreet/TestMech.pm @@ -87,8 +87,8 @@ sub log_in_ok { my $user = $mech->create_user_ok($email); - # store the old password and then change it - my $old_password = $user->password; + # remember the old password and then change it to a known one + my $old_password = $user->password || ''; $user->update( { password => 'secret' } ); # log in @@ -99,7 +99,19 @@ sub log_in_ok { $mech->logged_in_ok; # restore the password (if there was one) - $user->update( { password => $old_password } ) if $old_password; + if ($old_password) { + + # Use store_column and then make_column_dirty to bypass the filters that + # would hash the password, otherwise the password required ito log in + # would be the hash of the previous one. + $user->store_column("password", $old_password); + $user->make_column_dirty("password"); + $user->update(); + + # Belt and braces, check that the password has been correctly saved. + die "password not correctly restored after log_in_ok" + if $user->password ne $old_password; + } return $user; } @@ -296,7 +308,7 @@ sub extract_location { $meta = $mech->extract_problem_meta; -Returns the problem meta information ( submitted by, at etc ) from a +Returns the problem meta information ( submitted by, at etc ) from a problem report page =cut diff --git a/perllib/Open311/PopulateServiceList.pm b/perllib/Open311/PopulateServiceList.pm index 7990abfbf..c5fc4a506 100644 --- a/perllib/Open311/PopulateServiceList.pm +++ b/perllib/Open311/PopulateServiceList.pm @@ -42,8 +42,9 @@ sub process_body { my $list = $open311->get_service_list; unless ( $list ) { my $id = $self->_current_body->id; + my $mapit_url = mySociety::Config::get('MAPIT_URL'); my $areas = join( ",", keys %{$self->_current_body->areas} ); - warn "Body $id for areas $areas - http://mapit.mysociety.org/areas/$areas.html - did not return a service list\n" + warn "Body $id for areas $areas - $mapit_url/areas/$areas.html - did not return a service list\n" if $self->verbose >= 1; return; } diff --git a/perllib/Template/Document.pm b/perllib/Template/Document.pm new file mode 100644 index 000000000..8fc66deea --- /dev/null +++ b/perllib/Template/Document.pm @@ -0,0 +1,539 @@ +##============================================================= -*-Perl-*- +# +# Template::Document +# +# DESCRIPTION +# Module defining a class of objects which encapsulate compiled +# templates, storing additional block definitions and metadata +# as well as the compiled Perl sub-routine representing the main +# template content. +# +# AUTHOR +# Andy Wardley <abw@wardley.org> +# +# COPYRIGHT +# Copyright (C) 1996-2007 Andy Wardley. All Rights Reserved. +# +# This module is free software; you can redistribute it and/or +# modify it under the same terms as Perl itself. +# +#============================================================================ + +package Template::Document; + +use strict; +use warnings; +use base 'Template::Base'; +use Template::Constants; + +our $VERSION = 2.79; +our $DEBUG = 0 unless defined $DEBUG; +our $ERROR = ''; +our ($COMPERR, $AUTOLOAD, $UNICODE); + +BEGIN { + # UNICODE is supported in versions of Perl from 5.008 onwards + if ($UNICODE = $] > 5.007 ? 1 : 0) { + if ($] > 5.008) { + # utf8::is_utf8() available from Perl 5.8.1 onwards + *is_utf8 = \&utf8::is_utf8; + } + elsif ($] == 5.008) { + # use Encode::is_utf8() for Perl 5.8.0 + require Encode; + *is_utf8 = \&Encode::is_utf8; + } + } +} + + +#======================================================================== +# ----- PUBLIC METHODS ----- +#======================================================================== + +#------------------------------------------------------------------------ +# new(\%document) +# +# Creates a new self-contained Template::Document object which +# encapsulates a compiled Perl sub-routine, $block, any additional +# BLOCKs defined within the document ($defblocks, also Perl sub-routines) +# and additional $metadata about the document. +#------------------------------------------------------------------------ + +sub new { + my ($class, $doc) = @_; + my ($block, $defblocks, $variables, $metadata) = @$doc{ qw( BLOCK DEFBLOCKS VARIABLES METADATA ) }; + $defblocks ||= { }; + $metadata ||= { }; + + # evaluate Perl code in $block to create sub-routine reference if necessary + unless (ref $block) { + local $SIG{__WARN__} = \&catch_warnings; + $COMPERR = ''; + + # DON'T LOOK NOW! - blindly untainting can make you go blind! + $block =~ /(.*)/s; + $block = $1; + + $block = eval $block; + return $class->error($@) + unless defined $block; + } + + # same for any additional BLOCK definitions + @$defblocks{ keys %$defblocks } = + # MORE BLIND UNTAINTING - turn away if you're squeamish + map { + ref($_) + ? $_ + : ( /(.*)/s && eval($1) or return $class->error($@) ) + } values %$defblocks; + + bless { + %$metadata, + _BLOCK => $block, + _DEFBLOCKS => $defblocks, + _VARIABLES => $variables, + _HOT => 0, + }, $class; +} + + +#------------------------------------------------------------------------ +# block() +# +# Returns a reference to the internal sub-routine reference, _BLOCK, +# that constitutes the main document template. +#------------------------------------------------------------------------ + +sub block { + return $_[0]->{ _BLOCK }; +} + + +#------------------------------------------------------------------------ +# blocks() +# +# Returns a reference to a hash array containing any BLOCK definitions +# from the template. The hash keys are the BLOCK nameand the values +# are references to Template::Document objects. Returns 0 (# an empty hash) +# if no blocks are defined. +#------------------------------------------------------------------------ + +sub blocks { + return $_[0]->{ _DEFBLOCKS }; +} + + +#----------------------------------------------------------------------- +# variables() +# +# Returns a reference to a hash of variables used in the template. +# This requires the TRACE_VARS option to be enabled. +#----------------------------------------------------------------------- + +sub variables { + return $_[0]->{ _VARIABLES }; +} + +#------------------------------------------------------------------------ +# process($context) +# +# Process the document in a particular context. Checks for recursion, +# registers the document with the context via visit(), processes itself, +# and then unwinds with a large gin and tonic. +#------------------------------------------------------------------------ + +sub process { + my ($self, $context) = @_; + my $defblocks = $self->{ _DEFBLOCKS }; + my $output; + + + # check we're not already visiting this template + return $context->throw(Template::Constants::ERROR_FILE, + "recursion into '$self->{ name }'") + if $self->{ _HOT } && ! $context->{ RECURSION }; ## RETURN ## + + $context->visit($self, $defblocks); + + $self->{ _HOT } = 1; + eval { + my $block = $self->{ _BLOCK }; + $output = &$block($context); + }; + $self->{ _HOT } = 0; + + $context->leave(); + + die $context->catch($@) + if $@; + + return $output; +} + + +#------------------------------------------------------------------------ +# AUTOLOAD +# +# Provides pseudo-methods for read-only access to various internal +# members. +#------------------------------------------------------------------------ + +sub AUTOLOAD { + my $self = shift; + my $method = $AUTOLOAD; + + $method =~ s/.*:://; + return if $method eq 'DESTROY'; +# my ($pkg, $file, $line) = caller(); +# print STDERR "called $self->AUTOLOAD($method) from $file line $line\n"; + return $self->{ $method }; +} + + +#======================================================================== +# ----- PRIVATE METHODS ----- +#======================================================================== + + +#------------------------------------------------------------------------ +# _dump() +# +# Debug method which returns a string representing the internal state +# of the object. +#------------------------------------------------------------------------ + +sub _dump { + my $self = shift; + my $dblks; + my $output = "$self : $self->{ name }\n"; + + $output .= "BLOCK: $self->{ _BLOCK }\nDEFBLOCKS:\n"; + + if ($dblks = $self->{ _DEFBLOCKS }) { + foreach my $b (keys %$dblks) { + $output .= " $b: $dblks->{ $b }\n"; + } + } + + return $output; +} + + +#======================================================================== +# ----- CLASS METHODS ----- +#======================================================================== + +#------------------------------------------------------------------------ +# as_perl($content) +# +# This method expects a reference to a hash passed as the first argument +# containing 3 items: +# METADATA # a hash of template metadata +# BLOCK # string containing Perl sub definition for main block +# DEFBLOCKS # hash containing further subs for addional BLOCK defs +# It returns a string containing Perl code which, when evaluated and +# executed, will instantiate a new Template::Document object with the +# above data. On error, it returns undef with an appropriate error +# message set in $ERROR. +#------------------------------------------------------------------------ + +sub as_perl { + my ($class, $content) = @_; + my ($block, $defblocks, $metadata) = @$content{ qw( BLOCK DEFBLOCKS METADATA ) }; + + #$block =~ s/\n(?!#line)/\n /g; + $block =~ s/\s+$//; + + $defblocks = join('', map { + my $code = $defblocks->{ $_ }; + # $code =~ s/\n(?!#line)/\n /g; + $code =~ s/\s*$//; + " '$_' => $code,\n"; + } keys %$defblocks); + $defblocks =~ s/\s+$//; + + $metadata = join('', map { + my $x = $metadata->{ $_ }; + $x =~ s/(['\\])/\\$1/g; + " '$_' => '$x',\n"; + } keys %$metadata); + $metadata =~ s/\s+$//; + + return <<EOF +#------------------------------------------------------------------------ +# Compiled template generated by the Template Toolkit version $Template::VERSION +#------------------------------------------------------------------------ + +$class->new({ + METADATA => { +$metadata + }, + BLOCK => $block, + DEFBLOCKS => { +$defblocks + }, +}); +EOF +} + + +#------------------------------------------------------------------------ +# write_perl_file($filename, \%content) +# +# This method calls as_perl() to generate the Perl code to represent a +# compiled template with the content passed as the second argument. +# It then writes this to the file denoted by the first argument. +# +# Returns 1 on success. On error, sets the $ERROR package variable +# to contain an error message and returns undef. +#------------------------------------------------------------------------ + +sub write_perl_file { + my ($class, $file, $content) = @_; + my ($fh, $tmpfile); + + return $class->error("invalid filename: $file") + unless $file =~ /^(.+)$/s; + + eval { + require File::Temp; + require File::Basename; + ($fh, $tmpfile) = File::Temp::tempfile( + DIR => File::Basename::dirname($file) + ); + my $perlcode = $class->as_perl($content) || die $!; + + if ($UNICODE && is_utf8($perlcode)) { + $perlcode = "use utf8;\n\n$perlcode"; + binmode $fh, ":utf8"; + } + print $fh $perlcode; + close($fh); + }; + return $class->error($@) if $@; + return rename($tmpfile, $file) + || $class->error($!); +} + + +#------------------------------------------------------------------------ +# catch_warnings($msg) +# +# Installed as +#------------------------------------------------------------------------ + +sub catch_warnings { + $COMPERR .= join('', @_); +} + + +1; + +__END__ + +=head1 NAME + +Template::Document - Compiled template document object + +=head1 SYNOPSIS + + use Template::Document; + + $doc = Template::Document->new({ + BLOCK => sub { # some perl code; return $some_text }, + DEFBLOCKS => { + header => sub { # more perl code; return $some_text }, + footer => sub { # blah blah blah; return $some_text }, + }, + METADATA => { + author => 'Andy Wardley', + version => 3.14, + } + }) || die $Template::Document::ERROR; + + print $doc->process($context); + +=head1 DESCRIPTION + +This module defines an object class whose instances represent compiled +template documents. The L<Template::Parser> module creates a +C<Template::Document> instance to encapsulate a template as it is compiled +into Perl code. + +The constructor method, L<new()>, expects a reference to a hash array +containing the C<BLOCK>, C<DEFBLOCKS> and C<METADATA> items. + +The C<BLOCK> item should contain a reference to a Perl subroutine or a textual +representation of Perl code, as generated by the L<Template::Parser> module. +This is then evaluated into a subroutine reference using C<eval()>. + +The C<DEFLOCKS> item should reference a hash array containing further named +C<BLOCK>s which may be defined in the template. The keys represent C<BLOCK> +names and the values should be subroutine references or text strings of Perl +code as per the main C<BLOCK> item. + +The C<METADATA> item should reference a hash array of metadata items relevant +to the document. + +The L<process()> method can then be called on the instantiated +C<Template::Document> object, passing a reference to a L<Template::Context> +object as the first parameter. This will install any locally defined blocks +(C<DEFBLOCKS>) in the C<BLOCKS> cache in the context (via a call to +L<visit()|Template::Context#visit()>) so that they may be subsequently +resolved by the context. The main C<BLOCK> subroutine is then executed, +passing the context reference on as a parameter. The text returned from the +template subroutine is then returned by the L<process()> method, after calling +the context L<leave()|Template::Context#leave()> method to permit cleanup and +de-registration of named C<BLOCKS> previously installed. + +An C<AUTOLOAD> method provides access to the C<METADATA> items for the +document. The L<Template::Service> module installs a reference to the main +C<Template::Document> object in the stash as the C<template> variable. This allows +metadata items to be accessed from within templates, including C<PRE_PROCESS> +templates. + +header: + + <html> + <head> + <title>[% template.title %] + </head> + ... + +C<Template::Document> objects are usually created by the L<Template::Parser> +but can be manually instantiated or sub-classed to provide custom +template components. + +=head1 METHODS + +=head2 new(\%config) + +Constructor method which accept a reference to a hash array containing the +structure as shown in this example: + + $doc = Template::Document->new({ + BLOCK => sub { # some perl code; return $some_text }, + DEFBLOCKS => { + header => sub { # more perl code; return $some_text }, + footer => sub { # blah blah blah; return $some_text }, + }, + METADATA => { + author => 'Andy Wardley', + version => 3.14, + } + }) || die $Template::Document::ERROR; + +C<BLOCK> and C<DEFBLOCKS> items may be expressed as references to Perl subroutines +or as text strings containing Perl subroutine definitions, as is generated +by the L<Template::Parser> module. These are evaluated into subroutine references +using C<eval()>. + +Returns a new C<Template::Document> object or C<undef> on error. The +L<error()|Template::Base#error()> class method can be called, or the C<$ERROR> +package variable inspected to retrieve the relevant error message. + +=head2 process($context) + +Main processing routine for the compiled template document. A reference to a +L<Template::Context> object should be passed as the first parameter. The +method installs any locally defined blocks via a call to the context +L<visit()|Template::Context#visit()> method, processes its own template, +(passing the context reference as a parameter) and then calls +L<leave()|Template::Context#leave()> in the context to allow cleanup. + + print $doc->process($context); + +Returns a text string representing the generated output for the template. +Errors are thrown via C<die()>. + +=head2 block() + +Returns a reference to the main C<BLOCK> subroutine. + +=head2 blocks() + +Returns a reference to the hash array of named C<DEFBLOCKS> subroutines. + +=head2 variables() + +Returns a reference to a hash of variables used in the template. +This requires the L<TRACE_VARS|Template::Manual::Config#TRACE_VARS> +option to be enabled. + +=head2 AUTOLOAD + +An autoload method returns C<METADATA> items. + + print $doc->author(); + +=head1 CLASS METHODS + +These methods are used internally. + +=head2 as_perl($content) + +This method generate a Perl representation of the template. + + my $perl = Template::Document->as_perl({ + BLOCK => $main_block, + DEFBLOCKS => { + foo => $foo_block, + bar => $bar_block, + }, + METADATA => { + name => 'my_template', + } + }); + +=head2 write_perl_file(\%config) + +This method is used to write compiled Perl templates to disk. If the +C<COMPILE_EXT> option (to indicate a file extension for saving compiled +templates) then the L<Template::Parser> module calls this subroutine before +calling the L<new()> constructor. At this stage, the parser has a +representation of the template as text strings containing Perl code. We can +write that to a file, enclosed in a small wrapper which will allow us to +susequently C<require()> the file and have Perl parse and compile it into a +C<Template::Document>. Thus we have persistence of compiled templates. + +=head1 INTERNAL FUNCTIONS + +=head2 catch_warnings() + +This is a simple handler used to catch any errors that arise when the +compiled Perl template is first evaluated (that is, evaluated by Perl to +create a template subroutine at compile, rather than the template being +processed at runtime). + +=head2 is_utf8() + +This is mapped to C<utf8::is_utf8> for versions of Perl that have it (> 5.008) +or to C<Encode::is_utf8> for Perl 5.008. Earlier versions of Perl are not +supported. + +=head1 AUTHOR + +Andy Wardley E<lt>abw@wardley.orgE<gt> L<http://wardley.org/> + +=head1 COPYRIGHT + +Copyright (C) 1996-2012 Andy Wardley. All Rights Reserved. + +This module is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. + +=head1 SEE ALSO + +L<Template>, L<Template::Parser> + +=cut + +# Local Variables: +# mode: perl +# perl-indent-level: 4 +# indent-tabs-mode: nil +# End: +# +# vim: expandtab shiftwidth=4: diff --git a/t/app/controller/about.t b/t/app/controller/about.t index 4e49cdac9..ed28eb584 100644 --- a/t/app/controller/about.t +++ b/t/app/controller/about.t @@ -24,7 +24,7 @@ SKIP: { # 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 ::\s+Adrodd am Eiddo Gwag}); + $mech->content_like(qr{Amdanom ni ::\s+Rhoi gwybod am eiddo gwag}); $mech->content_contains('html lang="cy"'); } diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t index 43d90c0ba..23240c3b9 100644 --- a/t/app/controller/alert_new.t +++ b/t/app/controller/alert_new.t @@ -3,6 +3,7 @@ use warnings; use Test::More; use FixMyStreet::TestMech; +use FixMyStreet::App; my $mech = FixMyStreet::TestMech->new; @@ -362,6 +363,8 @@ subtest "Test normal alert signups and that alerts are sent" => sub { my $dt = DateTime->now()->add( days => 2); + my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser; + my $report_time = '2011-03-01 12:00:00'; my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( { postcode => 'EH1 1BB', @@ -374,9 +377,9 @@ subtest "Test normal alert signups and that alerts are sent" => sub { name => $user1->name, anonymous => 0, state => 'fixed - user', - confirmed => $dt, - lastupdate => $dt, - whensent => $dt->clone->add( minutes => 5 ), + confirmed => $dt_parser->format_datetime($dt), + lastupdate => $dt_parser->format_datetime($dt), + whensent => $dt_parser->format_datetime($dt->clone->add( minutes => 5 )), lang => 'en-gb', service => '', cobrand => 'default', @@ -514,6 +517,8 @@ for my $test ( my $alert_user1 = FixMyStreet::App->model('DB::Alert')->create( $alert_params ); ok $alert_user1, "alert created"; + my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser; + my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( { postcode => 'EH1 1BB', bodies_str => '2651', @@ -525,9 +530,9 @@ for my $test ( name => $user2->name, anonymous => 0, state => 'confirmed', - confirmed => $r_dt, - lastupdate => $r_dt, - whensent => $r_dt->clone->add( minutes => 5 ), + confirmed => $dt_parser->format_datetime($r_dt), + lastupdate => $dt_parser->format_datetime($r_dt), + whensent => $dt_parser->format_datetime($r_dt->clone->add( minutes => 5 )), lang => 'en-gb', service => '', cobrand => 'default', @@ -573,6 +578,8 @@ subtest 'check new updates alerts for non public reports only go to report owner my $dt = DateTime->now->add( minutes => -30 ); my $r_dt = $dt->clone->add( minutes => 20 ); + my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser; + my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( { postcode => 'EH1 1BB', bodies_str => '2651', @@ -584,9 +591,9 @@ subtest 'check new updates alerts for non public reports only go to report owner name => $user2->name, anonymous => 0, state => 'confirmed', - confirmed => $r_dt, - lastupdate => $r_dt, - whensent => $r_dt->clone->add( minutes => 5 ), + confirmed => $dt_parser->format_datetime($r_dt), + lastupdate => $dt_parser->format_datetime($r_dt), + whensent => $dt_parser->format_datetime($r_dt->clone->add( minutes => 5 )), lang => 'en-gb', service => '', cobrand => 'default', diff --git a/t/app/controller/report_display.t b/t/app/controller/report_display.t index 7904b6736..62a5b3667 100644 --- a/t/app/controller/report_display.t +++ b/t/app/controller/report_display.t @@ -100,7 +100,7 @@ subtest "Zurich unconfirmeds are 200" => sub { if ( !FixMyStreet::Cobrand->exists('zurich') ) { plan skip_all => 'Skipping Zurich test without Zurich cobrand'; } - $mech->host( 'zurich.fixmystreet.com' ); + $mech->host( 'zurich.example.com' ); ok $report->update( { state => 'unconfirmed' } ), 'unconfirm report'; $mech->get_ok("/report/$report_id"); $mech->content_contains( 'Überprüfung ausstehend' ); @@ -403,7 +403,7 @@ subtest "Zurich banners are displayed correctly" => sub { if ( !FixMyStreet::Cobrand->exists('zurich') ) { plan skip_all => 'Skipping Zurich test without Zurich cobrand'; } - $mech->host( 'zurich.fixmystreet.com' ); + $mech->host( 'zurich.example.com' ); for my $test ( { diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t index eb686b44e..e25764c4b 100644 --- a/t/app/controller/report_import.t +++ b/t/app/controller/report_import.t @@ -3,6 +3,7 @@ use warnings; use Test::More; use FixMyStreet::TestMech; +use FixMyStreet::App; use Web::Scraper; use Path::Class; @@ -12,6 +13,10 @@ $mech->get_ok('/import'); my $sample_file = file(__FILE__)->parent->file("sample.jpg")->stringify; ok -e $sample_file, "sample file $sample_file exists"; +# disable info logs for this test run +FixMyStreet::App->log->disable('info'); +END { FixMyStreet::App->log->enable('info'); } + # submit an empty report to import - check we get all errors subtest "Test creating bad partial entries" => sub { diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 8e129a41c..d1f246e95 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -5,9 +5,14 @@ use Test::More; use utf8; use FixMyStreet::TestMech; +use FixMyStreet::App; use Web::Scraper; use Path::Class; +# disable info logs for this test run +FixMyStreet::App->log->disable('info'); +END { FixMyStreet::App->log->enable('info'); } + my $mech = FixMyStreet::TestMech->new; $mech->get_ok('/report/new'); diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t index 22d2d1f97..ed26d58d5 100644 --- a/t/app/controller/report_new_open311.t +++ b/t/app/controller/report_new_open311.t @@ -3,8 +3,13 @@ use warnings; use Test::More; use FixMyStreet::TestMech; +use FixMyStreet::App; use Web::Scraper; +# disable info logs for this test run +FixMyStreet::App->log->disable('info'); +END { FixMyStreet::App->log->enable('info'); } + my $mech = FixMyStreet::TestMech->new; my $body = $mech->create_body_ok(2651, 'City of Edinburgh Council'); diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index c99a54743..3356867bb 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -537,6 +537,7 @@ for my $test ( state => 'internal referral', }, state => 'internal referral', + meta => "an internal referral", }, { desc => 'from authority user marks report as not responsible', @@ -562,7 +563,7 @@ for my $test ( state => 'duplicate', }, state => 'duplicate', - meta => 'duplicate report', + meta => 'a duplicate report', }, { desc => 'from authority user marks report as internal referral', @@ -575,7 +576,7 @@ for my $test ( state => 'internal referral', }, state => 'internal referral', - meta => 'internal referral', + meta => 'an internal referral', }, { desc => 'from authority user marks report sent to two councils as fixed', diff --git a/t/app/controller/rss.t b/t/app/controller/rss.t index f04a17151..ec6a01b50 100644 --- a/t/app/controller/rss.t +++ b/t/app/controller/rss.t @@ -3,6 +3,7 @@ use warnings; use Test::More; use FixMyStreet::TestMech; +use FixMyStreet::App; my $mech = FixMyStreet::TestMech->new; @@ -15,6 +16,8 @@ my $dt = DateTime->new( my $user1 = FixMyStreet::App->model('DB::User') ->find_or_create( { email => 'reporter-rss@example.com', name => 'Reporter User' } ); +my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser; + my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( { postcode => 'eh1 1BB', bodies_str => '2651', @@ -26,9 +29,9 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( { name => $user1->name, anonymous => 0, state => 'confirmed', - confirmed => $dt, - lastupdate => $dt, - whensent => $dt->clone->add( minutes => 5 ), + confirmed => $dt_parser->format_datetime($dt), + lastupdate => $dt_parser->format_datetime($dt), + whensent => $dt_parser->format_datetime($dt->clone->add( minutes => 5 )), lang => 'en-gb', service => '', cobrand => 'default', diff --git a/t/app/model/problem.t b/t/app/model/problem.t index 7daa653fc..9138c11a8 100644 --- a/t/app/model/problem.t +++ b/t/app/model/problem.t @@ -9,6 +9,7 @@ use FixMyStreet; use FixMyStreet::App; use FixMyStreet::TestMech; use mySociety::Locale; +use Sub::Override; mySociety::Locale::gettext_domain('FixMyStreet'); @@ -583,9 +584,10 @@ foreach my $test ( { } subtest 'check can turn on report sent email alerts' => sub { - eval 'use Test::MockModule; 1' or - plan skip_all => 'Skipping tests that rely on Test::MockModule'; - + my $send_confirmation_mail_override = Sub::Override->new( + "FixMyStreet::Cobrand::Default::report_sent_confirmation_email", + sub { return 1; } + ); $mech->clear_emails_ok; FixMyStreet::App->model('DB::Problem')->search( @@ -606,9 +608,6 @@ subtest 'check can turn on report sent email alerts' => sub { send_fail_count => 0, } ); - my $m = new Test::MockModule( - 'FixMyStreet::Cobrand::FixMyStreet' ); - $m->mock( report_sent_confirmation_email => 1 ); FixMyStreet::App->model('DB::Problem')->send_reports(); $mech->email_count_is( 2 ); @@ -628,8 +627,88 @@ subtest 'check can turn on report sent email alerts' => sub { $email = $emails[1]; like $email->header('Subject'), qr/Problem Report Sent/, 'report sent email title correct'; like $email->body, qr/Your report about/, 'report sent body correct'; + + $send_confirmation_mail_override->restore(); +}; + + +subtest 'check iOS app store test reports not sent' => sub { + $mech->clear_emails_ok; + + FixMyStreet::App->model('DB::Problem')->search( + { + whensent => undef + } + )->update( { whensent => \'ms_current_timestamp()' } ); + + $problem->discard_changes; + $problem->update( { + bodies_str => 2651, + title => 'App store test', + state => 'confirmed', + confirmed => \'ms_current_timestamp()', + whensent => undef, + category => 'potholes', + send_fail_count => 0, + } ); + + FixMyStreet::App->model('DB::Problem')->send_reports(); + + $mech->email_count_is( 0 ); + + $problem->discard_changes(); + is $problem->state, 'hidden', 'iOS test reports are hidden automatically'; + is $problem->whensent, undef, 'iOS test reports are not sent'; }; +subtest 'check reports from abuser not sent' => sub { + $mech->clear_emails_ok; + + FixMyStreet::App->model('DB::Problem')->search( + { + whensent => undef + } + )->update( { whensent => \'ms_current_timestamp()' } ); + + $problem->discard_changes; + $problem->update( { + bodies_str => 2651, + title => 'Report', + state => 'confirmed', + confirmed => \'ms_current_timestamp()', + whensent => undef, + category => 'potholes', + send_fail_count => 0, + } ); + + FixMyStreet::App->model('DB::Problem')->send_reports(); + + $mech->email_count_is( 1 ); + + $problem->discard_changes(); + ok $problem->whensent, 'Report has been sent'; + + $problem->update( { + state => 'confirmed', + confirmed => \'ms_current_timestamp()', + whensent => undef, + } ); + + my $abuse = FixMyStreet::App->model('DB::Abuse')->create( { email => $problem->user->email } ); + + $mech->clear_emails_ok; + FixMyStreet::App->model('DB::Problem')->send_reports(); + + $mech->email_count_is( 0 ); + + $problem->discard_changes(); + is $problem->state, 'hidden', 'reports from abuse user are hidden automatically'; + is $problem->whensent, undef, 'reports from abuse user are not sent'; + + ok $abuse->delete(), 'user removed from abuse table'; +}; + + $problem->comments->delete; $problem->delete; $mech->delete_user( $user ); diff --git a/t/app/model/questionnaire.t b/t/app/model/questionnaire.t index 86af51c42..be5b433c1 100644 --- a/t/app/model/questionnaire.t +++ b/t/app/model/questionnaire.t @@ -32,8 +32,6 @@ my $problem = FixMyStreet::App->model('DB::Problem')->create( } ); -diag $problem->id; - my $mech = FixMyStreet::TestMech->new; for my $test ( diff --git a/t/app/model/rabx_column.t b/t/app/model/rabx_column.t new file mode 100644 index 000000000..607d578ce --- /dev/null +++ b/t/app/model/rabx_column.t @@ -0,0 +1,23 @@ +use strict; +use warnings; + +use Test::More; + +use_ok "FixMyStreet::DB::RABXColumn"; + +# Test that the class names are correctly normalised +my @tests = ( + ["FixMyStreet::DB::Result::Token", "Token"], + ["FixMyStreet::App::Model::DB::Token", "Token"], +); + +foreach my $test (@tests) { + my ($input, $expected) = @$test; + is( + FixMyStreet::DB::RABXColumn::_get_class_identifier($input), + $expected, + "$input -> $expected" + ); +} + +done_testing(); diff --git a/t/app/model/token.t b/t/app/model/token.t index 12945975e..637477fa3 100644 --- a/t/app/model/token.t +++ b/t/app/model/token.t @@ -3,7 +3,7 @@ use strict; use warnings; -use Test::More tests => 45; +use Test::More; use FixMyStreet; use FixMyStreet::App; @@ -94,3 +94,47 @@ foreach my $test_data_name ( sort keys %tests ) { undef, "token gone with m::AT"; } + + + +# Test that the inflation and deflation works as expected +{ + my $token = + $token_rs->create( { scope => 'testing', data => {} } ); + END { $token->delete() }; + + # Add in temporary check to test that the data is updated as expected. + is_deeply($token->data, {}, "data is empty"); + + # store something in it + $token->update({ data => { foo => 'bar' } }); + $token->discard_changes(); + is_deeply($token->data, { foo => 'bar' }, "data has content"); + + # change the hash stored + $token->update({ data => { baz => 'bundy' } }); + $token->discard_changes(); + is_deeply($token->data, { baz => 'bundy' }, "data has new content"); + + # change the hashref in place + { + my $data = $token->data; + $data->{baz} = 'new'; + $token->data( $data ); + $token->update(); + $token->discard_changes(); + is_deeply($token->data, { baz => 'new' }, "data has been updated"); + } + + # change the hashref in place + { + my $data = $token->data; + $data->{baz} = 'new'; + $token->update({ data => $data }); + $token->discard_changes(); + is_deeply($token->data, { baz => 'new' }, "data has been updated"); + } + +} + +done_testing(); diff --git a/t/cobrand/fixmybarangay.t b/t/cobrand/fixmybarangay.t index c0823eac4..2d9276dc0 100644 --- a/t/cobrand/fixmybarangay.t +++ b/t/cobrand/fixmybarangay.t @@ -80,7 +80,11 @@ $mech->get_ok( '/report/' . $dps_report->id ); $mech->email_count_is(0); -FixMyStreet::App->model('DB::Problem')->send_reports('fixmybarangay'); +FixMyStreet::override_config { + SEND_REPORTS_ON_STAGING => 1, +}, sub { + FixMyStreet::App->model('DB::Problem')->send_reports('fixmybarangay'); +}; # Check BGY one sent by email my $email = $mech->get_email; diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t index 5d7ff8672..0876be582 100644 --- a/t/cobrand/zurich.t +++ b/t/cobrand/zurich.t @@ -1,5 +1,5 @@ # TODO -# Overdue alerts +# Overdue alerts use strict; use warnings; @@ -9,11 +9,38 @@ use Test::More; plan skip_all => 'Skipping Zurich test without Zurich cobrand' unless FixMyStreet::Cobrand->exists('zurich'); +# To run this test ensure that you have the following in general.yml: +# +# BASE_URL: 'http://zurich.127.0.0.1.xip.io' +# +# ALLOWED_COBRANDS: +# - zurich +# +# Check that you have the required locale installed - the following +# should return a line with de_CH.utf8 in. If not install that locale. +# +# locale -a | grep de_CH +# +# To generate the translations use: +# +# commonlib/bin/gettext-makemo FixMyStreet + +use FixMyStreet; + +# This is a helper method that will send the reports but with the config +# correctly set - notably SEND_REPORTS_ON_STAGING needs to be true. +sub send_reports_for_zurich { + FixMyStreet::override_config { SEND_REPORTS_ON_STAGING => 1 }, sub { + # Actually send the report + FixMyStreet::App->model('DB::Problem')->send_reports('zurich'); + }; +} + use FixMyStreet::TestMech; my $mech = FixMyStreet::TestMech->new; # Front page test -ok $mech->host("zurich.fixmystreet.com"), "change host to Zurich"; +ok $mech->host("zurich.example.com"), "change host to Zurich"; $mech->get_ok('/'); $mech->content_like( qr/zurich/i ); @@ -65,6 +92,48 @@ $mech->content_contains( 'report_edit/' . $report->id ); $mech->content_contains( DateTime->now->strftime("%d.%m.%Y") ); $mech->content_contains( 'Erfasst' ); + +subtest "changing of categories" => sub { + # create a few categories (which are actually contacts) + foreach my $name ( qw/Cat1 Cat2/ ) { + FixMyStreet::App->model('DB::Contact')->find_or_create({ + body => $division, + category => $name, + email => "$name\@example.org", + confirmed => 1, + deleted => 0, + editor => "editor", + whenedited => DateTime->now(), + note => "note for $name", + }); + } + + # put report into known category + my $original_category = $report->category; + $report->update({ category => 'Cat1' }); + is( $report->category, "Cat1", "Category set to Cat1" ); + + # get the latest comment + my $comments_rs = $report->comments->search({},{ order_by => { -desc => "created" } }); + ok ( !$comments_rs->first, "There are no comments yet" ); + + # change the category via the web interface + $mech->get_ok( '/admin/report_edit/' . $report->id ); + $mech->submit_form_ok( { with_fields => { category => 'Cat2' } } ); + + # check changes correctly saved + $report->discard_changes(); + is( $report->category, "Cat2", "Category changed to Cat2 as expected" ); + + # Check that a new comment has been created. + my $new_comment = $comments_rs->first(); + is( $new_comment->text, "Weitergeleitet von Cat1 an Cat2", "category change comment created" ); + + # restore report to original state. + $report->update({category => $original_category }); +}; + + $mech->get_ok( '/admin/report_edit/' . $report->id ); $mech->content_contains( 'Unbestätigt' ); # Unconfirmed email $mech->submit_form_ok( { with_fields => { state => 'confirmed' } } ); @@ -82,8 +151,10 @@ $mech->content_contains('photo/' . $report->id . '.jpeg'); # Internal notes $mech->get_ok( '/admin/report_edit/' . $report->id ); -$mech->submit_form_ok( { with_fields => { internal_notes => 'Some internal notes.' } } ); -$mech->content_contains( 'Some internal notes' ); +$mech->submit_form_ok( { with_fields => { new_internal_note => 'Initial internal note.' } } ); +$mech->submit_form_ok( { with_fields => { new_internal_note => 'Another internal note.' } } ); +$mech->content_contains( 'Initial internal note.' ); +$mech->content_contains( 'Another internal note.' ); # Original description $mech->submit_form_ok( { with_fields => { detail => 'Edited details text.' } } ); @@ -97,7 +168,7 @@ $mech->get_ok( '/report/' . $report->id ); $mech->content_contains('In Bearbeitung'); $mech->content_contains('Test Test'); -FixMyStreet::App->model('DB::Problem')->send_reports('zurich'); +send_reports_for_zurich(); my $email = $mech->get_email; like $email->header('Subject'), qr/Neue Meldung/, 'subject looks okay'; like $email->header('To'), qr/subdivision\@example.org/, 'to line looks correct'; @@ -106,6 +177,7 @@ $mech->clear_emails_ok; $mech->log_out_ok; $user = $mech->log_in_ok( 'sdm1@example.org') ; +$user->update({ from_body => undef }); $mech->get_ok( '/admin' ); is $mech->uri->path, '/my', "got sent to /my"; $user->from_body( 3 ); @@ -119,7 +191,7 @@ $mech->content_contains( DateTime->now->strftime("%d.%m.%Y") ); $mech->content_contains( 'In Bearbeitung' ); $mech->get_ok( '/admin/report_edit/' . $report->id ); -$mech->content_contains( 'Some internal notes' ); +$mech->content_contains( 'Initial internal note' ); $mech->submit_form_ok( { with_fields => { status_update => 'This is an update.' } } ); is $mech->uri->path, '/admin/report_edit/' . $report->id, "still on edit page"; @@ -132,7 +204,7 @@ $mech->get_ok( '/report/' . $report->id ); $mech->content_contains('In Bearbeitung'); $mech->content_contains('Test Test'); -FixMyStreet::App->model('DB::Problem')->send_reports('zurich'); +send_reports_for_zurich(); $email = $mech->get_email; like $email->header('Subject'), qr/Feedback/, 'subject looks okay'; like $email->header('To'), qr/division\@example.org/, 'to line looks correct'; @@ -210,8 +282,8 @@ $mech->submit_form_ok( { with_fields => { body_external => 4 } } ); $mech->get_ok( '/report/' . $report->id ); $mech->content_contains('Beantwortet'); $mech->content_contains('Third Test'); -$mech->content_contains('Weitergeleitet an: External Body'); -FixMyStreet::App->model('DB::Problem')->send_reports('zurich'); +$mech->content_contains('Wir haben Ihr Anliegen an External Body weitergeleitet'); +send_reports_for_zurich(); $email = $mech->get_email; like $email->header('Subject'), qr/Weitergeleitete Meldung/, 'subject looks okay'; like $email->header('To'), qr/external_body\@example.org/, 'to line looks correct'; @@ -229,14 +301,74 @@ $mech->submit_form_ok( { with_fields => { body_external => 4, third_personal => $mech->get_ok( '/report/' . $report->id ); $mech->content_contains('Beantwortet'); $mech->content_contains('Third Test'); -$mech->content_contains('Weitergeleitet an: External Body'); -FixMyStreet::App->model('DB::Problem')->send_reports('zurich'); +$mech->content_contains('Wir haben Ihr Anliegen an External Body weitergeleitet'); +send_reports_for_zurich(); $email = $mech->get_email; like $email->header('Subject'), qr/Weitergeleitete Meldung/, 'subject looks okay'; like $email->header('To'), qr/external_body\@example.org/, 'to line looks correct'; like $email->body, qr/External Body/, 'body has right name'; like $email->body, qr/test\@example.com/, 'body does contain email address'; $mech->clear_emails_ok; +$mech->log_out_ok; + +subtest "only superuser can edit bodies" => sub { + $user = $mech->log_in_ok( 'dm1@example.org' ); + $mech->get( '/admin/body/' . $zurich->id ); + is $mech->res->code, 404, "only superuser should be able to edit bodies"; + $mech->log_out_ok; +}; + +subtest "only superuser can see 'Add body' form" => sub { + $user = $mech->log_in_ok( 'dm1@example.org' ); + $mech->get_ok( '/admin/bodies' ); + $mech->content_lacks( '<form method="post" action="bodies"' ); + $mech->log_out_ok; +}; + +subtest "phone number is mandatory" => sub { + FixMyStreet::override_config { + MAPIT_TYPES => [ 'O08' ], + MAPIT_URL => 'http://global.mapit.mysociety.org/', + }, sub { + $user = $mech->log_in_ok( 'dm1@example.org' ); + $mech->get_ok( '/report/new?lat=47.381817&lon=8.529156' ); + $mech->submit_form( with_fields => { phone => "" } ); + $mech->content_contains( 'Diese Information wird benötigt' ); + $mech->log_out_ok; + }; +}; + +subtest "problems can't be assigned to deleted bodies" => sub { + $user = $mech->log_in_ok( 'dm1@example.org' ); + $user->from_body( 1 ); + $user->update; + $report->state( 'confirmed' ); + $report->update; + $mech->get_ok( '/admin/body/' . $external_body->id ); + $mech->submit_form_ok( { with_fields => { deleted => 1 } } ); + $mech->get_ok( '/admin/report_edit/' . $report->id ); + $mech->content_lacks( $external_body->name ); + $user->from_body( 2 ); + $user->update; + $mech->log_out_ok; +}; + +subtest "hidden report email are only sent when requested" => sub { + $user = $mech->log_in_ok( 'dm1@example.org') ; + $extra = $report->extra; + $extra->{email_confirmed} = 1; + $report->extra ( { %$extra } ); + $report->update; + $mech->get_ok( '/admin/report_edit/' . $report->id ); + $mech->submit_form_ok( { with_fields => { state => 'hidden', send_rejected_email => 1 } } ); + $mech->email_count_is(1); + $mech->clear_emails_ok; + $mech->get_ok( '/admin/report_edit/' . $report->id ); + $mech->submit_form_ok( { with_fields => { state => 'hidden', send_rejected_email => undef } } ); + $mech->email_count_is(0); + $mech->clear_emails_ok; + $mech->log_out_ok; +}; $mech->delete_problems_for_body( 2 ); $mech->delete_user( 'dm1@example.org' ); diff --git a/templates/web/default/admin/bodies.html b/templates/web/default/admin/bodies.html index a1555cac9..c0824521e 100644 --- a/templates/web/default/admin/bodies.html +++ b/templates/web/default/admin/bodies.html @@ -2,49 +2,72 @@ [% INCLUDE 'admin/edit-league.html' %] -<table cellspacing="0" cellpadding="2" border="1"> - <tr> - <th>[% loc('Name') %]</th> +[% IF bodies.size == 0 %] + <p class="fms-admin-info"> + [% loc('Currently no bodies have been created.') %] + <br> + [% loc('You need to add bodies (such as councils or departments) so that you can then add + the categories of problems they can handle (such as potholes or streetlights) and the + contacts (such as an email address) to which reports are sent.') %] + </p> +[% ELSE %] + <table cellspacing="0" cellpadding="2" border="1"> + <tr> + <th>[% loc('Name') %]</th> + [% IF c.cobrand.moniker == 'zurich' %] + <th>[% loc('Email') %]</th> + <th>[% loc('Deleted') %]</th> + [% ELSE %] + <th>[% loc('Category') %]</th> + [% END %] + </tr> + [%- FOREACH body IN bodies %] + [%- SET id = body.id %] + [% NEXT IF c.cobrand.moniker == 'zurich' AND admin_type == 'dm' AND (body.parent OR body.bodies) %] + <tr[% IF c.cobrand.moniker == 'zurich' AND body.deleted %] class="muted"[% END %]> + <td> + [% IF c.cobrand.moniker == 'zurich' %] + [% FILTER repeat(4*body.api_key) %] [% END %] + [% IF admin_type == 'super' %] + <a href="[% c.uri_for( 'body', id ) %]">[% body.name %]</a> + [% ELSE %] + [% body.name %] + [% END %] + [% ELSE %] [%# not Zurich: all bodies should be links %] + <a href="[% c.uri_for( 'body', id ) %]">[% body.name %]</a> + [%- ', ' _ body.parent.name IF body.parent -%] + [% END %] + </td> [% IF c.cobrand.moniker == 'zurich' %] - <th>[% loc('Email') %]</th> + <td>[% body.endpoint %]</td> + <td>[% IF body.deleted %]Yes[% END %]</td> [% ELSE %] - <th>[% loc('Category') %]</th> - [% END %] - </tr> -[%- FOREACH body IN bodies %] - [%- SET id = body.id %] - [% NEXT IF c.cobrand.moniker == 'zurich' AND admin_type == 'dm' AND (body.parent OR body.bodies) %] - <tr> - <td> - [% IF c.cobrand.moniker == 'zurich' %] - [% FILTER repeat(4*body.api_key) %] [% END %] - [% END %] - <a href="[% c.uri_for( 'body', id ) %]">[% body.name %]</a> - [% IF c.cobrand.moniker != 'zurich' %] - [%- ', ' _ body.parent.name IF body.parent -%] + <td> + [% IF counts.$id %] + [% tprintf( loc('%d addresses'), counts.$id.c) IF c.cobrand.moniker != 'emptyhomes' %] + [% IF counts.$id.deleted %] + (1+ deleted) + [% ELSIF counts.$id.confirmed != counts.$id.c %] + (some unconfirmed) + [% END %] + [% ELSE %] + no categories [% END %] - </td> - [% IF c.cobrand.moniker == 'zurich' %] - <td>[% body.endpoint %]</td> - [% ELSE %] - <td> - [% IF counts.$id %] - [% tprintf( loc('%d addresses'), counts.$id.c) IF c.cobrand.moniker != 'emptyhomes' %] - [% IF counts.$id.deleted %] - (1+ deleted) - [% ELSIF counts.$id.confirmed != counts.$id.c %] - (some unconfirmed) - [% END %] - [% ELSE %] - no categories - [% END %] - </td> - [% END %] - </tr> -[%- END %] -</table> + </td> + [% END %] + </tr> + [%- END %] + </table> +[% END %] -<h2>[% loc('Add body') %]</h2> -[% INCLUDE 'admin/body-form.html', body='' %] +[% IF c.cobrand.moniker == 'zurich' %] + [% IF admin_type == 'super' %] + <h2>[% loc('Add body') %]</h2> + [% INCLUDE 'admin/body-form.html', body='' %] + [% END %] +[% ELSE %] + <h2>[% loc('Add body') %]</h2> + [% INCLUDE 'admin/body-form.html', body='' %] +[% END %] [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index 039d83ae2..de30a5a17 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -1,10 +1,32 @@ <form method="post" action="[% body ? c.uri_for('body', body.id) : c.uri_for('bodies') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> - + <div class="fms-admin-info"> + [% loc( + "Add a <strong>body</strong> for each administrative body, such as a council or department + to which problem reports can be sent. You can add one or more contacts (for different + categories of problem) to each body." + ) %] + </div> + <div class="admin-hint"> + <p> + [% loc( + "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>) + and may be displayed publically." + ) %] + </p> + </div> <p> <label for="name">[% loc('Name') %]</label> <input type="text" name="name" id="name" value="[% body.name %]" size="50"> </p> + <div class="admin-hint"> + <p> + [% loc( + "Identify a <strong>parent</strong> if this body is itself part of another body. + For basic installations, you don't need to join bodies in this way." + ) %] + </p> + </div> <p> <label for="parent">[% loc('Parent') %]</label> <select name="parent" id="parent"> @@ -15,6 +37,24 @@ </select> </p> + [% IF areas.size == 0 AND c.config.MAPIT_URL AND (NOT c.config.MAPIT_TYPES OR c.config.MAPIT_TYPES.size==O) %] + <p class="fms-admin-warning"> + [% tprintf( loc( + '<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br> + This is probably why "area covered" is empty (below).<br> + Maybe add some <code>MAPIT_TYPES</code> to your config file?'), c.config.MAPIT_URL) + %] + </p> + [% END %] + + <div class="admin-hint"> + <p> + [% loc( + "This body will only be sent reports for problems that are located in the <strong>area covered</strong>. + A body will not receive any reports unless it covers at least one area." + ) %] + </p> + </div> <p> <label for="area_ids">[% loc('Area covered') %]</label> <select name="area_ids" id="area_ids" multiple> @@ -26,6 +66,14 @@ </select> </p> + <div class="admin-hint"> + <p> + [% loc( + "The <strong>send method</strong> determines how problem reports will be sent to the body. + If you leave this blank, <strong>send method defaults to email</strong>." + ) %] + </p> + </div> <p> <label for="send_method">Send Method</label> <select name="send_method" id="send_method"> @@ -36,46 +84,127 @@ </select> </p> + <div class="admin-open311-only"> + <p class="fms-admin-info"> + [% loc( + "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br> + <strong>You don't need to set them if the Send Method is email.</strong>. + For more information on Open311, see + <a href='http://www.mysociety.org/2013/01/17/open311-explained//'>this article</a>. + " + ) %] + </p> + + <div class="admin-hint"> + <p> + [% loc( + "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to + when sending reports to this body." + ) %] + </p> + </div> <p> <label for="endpoint">[% loc('Endpoint') %]</label> <input type="text" name="endpoint" id="endpoint" value="[% body.endpoint %]" size="50"> </p> + <div class="admin-hint"> + <p> + [% loc( + "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more + than one. If the body is running its own endpoint, you can usually leave this blank." + ) %] + </p> + </div> <p> <label for="jurisdiction">Open311 Jurisdiction</label> <input type="text" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction %]" size="50"> </p> + <div class="admin-hint"> + <p> + [% loc( + "Some endpoints require an <strong>API key</strong> to indicate that the reports are being + sent from your FixMyStreet installation." + ) %] + </p> + </div> <p> <label for="api_key">Open311 API Key</label> <input type="text" name="api_key" id="api_key" value="[% body.api_key %]" size="25"> </p> + <div class="admin-hint"> + <p> + [% loc( + "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive + updates to existing reports. If you're not sure, it probably does not, so leave this unchecked. + For more information, see + <a href='http://www.mysociety.org/2013/02/20/open311-extended/'>this article</a>." + ) %] + </p> + </div> <p> <input type="checkbox" id="send_comments" name="send_comments"[% ' checked' IF body.send_comments %]> - <label for="send_comments" class="inline">Use Open311 comment sending extension</label> + <label for="send_comments" class="inline">Use Open311 update-sending extension</label> </p> + <div class="admin-hint"> + <p> + [% loc( + "If you've enabled Open311 update-sending above, you must identify which + FixMyStreet <strong>user</strong> will be attributed as the creator of those updates + when they are shown on the site. Enter the ID (number) of that user." + ) %] + </p> + </div> <p> <label for"comment_user_id">User ID to attribute fetched comments to</label> <input type="text" name="comment_user_id" value="[% body.comment_user_id %]"> </p> + <div class="admin-hint"> + <p> + [% loc( + "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> + if you do <strong>not</strong> want that user to be notified whenever these updates are created." + ) %] + </p> + </div> <p> <input type="checkbox" id="suppress_alerts" name="suppress_alerts"[% ' checked' IF body.suppress_alerts %]> <label for="suppress_alerts" class="inline">Do not send email alerts on fetched comments to problem creator</label> </p> + <div class="admin-hint"> + <p> + [% loc( + "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in + its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed. + Check that your cobrand supports this feature before switching it on." + ) %] + </p> + </div> <p> - <input type="checkbox" id="can_be_devolved" name="can_be_devolved"[% ' checked' IF body.can_be_devolved %]> - <label for="can_be_devolved" class="inline">Endpoint lookup can be devolved to contacts</label> + <input type="checkbox" id="send_extended_statuses" name="send_extended_statuses"[% ' checked' IF conf.send_extended_statuses %]> + <label for="send_extended_statuses" class="inline">Send extended Open311 statuses with service request updates</label> </p> - + </div> + + <div class="admin-hint"> + <p> + [% loc( + "Enable this <strong>can be devolved</strong> setting if one or more contacts have a + different endpoint (and send method) from the body's. For example, if reports for some categories of + problem must be emailed, while others can be sent over Open311." + ) %] + </p> + </div> <p> - <label for="send_extended_statuses">Send extended open311 statuses with service request updates</label>: - <input type="checkbox" id="send_extended_statuses" name="send_extended_statuses"[% ' checked' IF conf.send_extended_statuses %]> + <input type="checkbox" id="can_be_devolved" name="can_be_devolved"[% ' checked' IF body.can_be_devolved %]> + <label for="can_be_devolved" class="inline">Send method or endpoints can be devolved to contacts (i.e, can be different from the body's)</label> </p> - + <p> <input type="hidden" name="posted" value="body"> <input type="hidden" name="token" value="[% token %]"> diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 120a07da9..9cb9125a6 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -11,9 +11,9 @@ <a href="[% c.uri_for_email( '/around', { pc => example_pc } ) %]">[% tprintf( loc('Example postcode %s'), example_pc ) | html %]</a> | [% END %] [% IF c.cobrand.moniker == 'emptyhomes' %] -<a href="[% c.uri_for( 'reports', search => 'body:' _ body_id ) %]">[% loc('List all reported problems' ) %]</a> +<a href="[% c.uri_for( 'reports', search => 'body:' _ body_id ) %]">[% loc('List all reported problems' ) %]</a> | [% ELSE %] -<a href="[% c.uri_for_email( '/reports/' _ body_id ) %]">[% loc('List all reported problems' ) %]</a> +<a href="[% c.uri_for_email( '/reports/' _ body_id ) %]">[% loc('List all reported problems' ) %]</a> | [% END %] <a href="[% c.uri_for( 'body', body_id, { text => 1 } ) %]">[% loc('Text only version') %]</a> </p> @@ -28,6 +28,14 @@ <p class="error">Do not give these out except to people at the council.</p> [% END %] +[% IF live_contacts == 0 %] + <p class="fms-admin-warning"> + [% loc("This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>.") %] + <br> + [% loc("Add a contact using the form below.") %] + </p> +[% END %] + <form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <table cellspacing="0" cellpadding="2" border="1"> @@ -44,11 +52,11 @@ <th>[% loc('Confirm') %]</th> </tr> [% WHILE ( contact = contacts.next ) %] - <tr> - <td><a href="[% c.uri_for( 'body_edit', body_id, contact.category ) %]">[% contact.category %]</a></td> + <tr [% IF contact.deleted %]class="is-deleted"[% END %]> + <td class="contact-category"><a href="[% c.uri_for( 'body_edit', body_id, contact.category ) %]">[% contact.category %]</a></td> <td>[% contact.email | html %]</td> <td>[% IF contact.confirmed %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> - <td>[% IF contact.deleted %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> + <td>[% IF contact.deleted %]<strong>[% loc('Yes') %]</strong>[% ELSE %][% loc('No') %][% END %]</td> <td>[% IF body.can_be_devolved && contact.send_method %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> <td>[% contact.editor %]</td> <td>[% contact.note | html %]</td> @@ -66,32 +74,90 @@ </p> </form> + <h2>[% loc('Add new category') %]</h2> + <p class="fms-admin-info"> + [% loc("Each contact for the body has a category, which is displayed to the public. + Different categories <strong>can have the same contact</strong> (email address). + This means you can add many categories even if you only have one contact for the body. + ") %] + </p> <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 + to the body too. These will appear in the drop-down menu on the report-a-problem page.') %] + <br> + [% loc("If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in + the menu. Make sure you use the same category name in the bodies if you want this to happen.") %] + </p> + </div> <p> <strong>[% loc('Category:') %] </strong><input type="text" name="category" size="30"> </p> [% END %] + <div class="admin-hint"> + <p> + [% loc("The <strong>email address</strong> is the destination to which reports about this category will be sent. + Other categories for this body may have the same email address.") %] + </p> + [% IF (body.send_method AND body.send_method != 'Email') OR body.can_be_devolved %] + <p> + [% loc("If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here.") %] + </p> + [% END %] + </div> + <p> - <strong>[% loc('Email:') %] </strong><input type="text" name="email" size="30"> + <strong>[% loc('Email address:') %] </strong><input type="text" name="email" size="30"> </p> + <div class="admin-hint"> + <p> + [% loc("Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct. + If you are not sure of the origin or validity of the contact, leave this unchecked.") %] + </p> + </div> <p> <input type="checkbox" name="confirmed" value="1" id="confirmed"> <label for="confirmed" class="inline">[% loc('Confirmed') %]</label> + </p> + <div class="admin-hint"> + <p> + [% loc("Check <strong>deleted</strong> to remove the category from use. + It will not appear as an available category in the drop-down menu on the report-a-problem page.") %] + </p> + </div> + <p> <input type="checkbox" name="deleted" value="1" id="deleted"> <label for="deleted" class="inline">[% loc('Deleted') %]</label> </p> + <div class="admin-hint"> + <p> + [% loc("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.") %] + </p> + </div> <p> <strong>[% loc('Note:') %] </strong> <textarea name="note" rows="3" cols="40"></textarea> </p> + <div class="admin-hint"> + <p> + [% loc("Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>. + <br> + Normally, categories are not private. + <br> + This is suitable for issues that you want to allow users to report to the body, but for which there is no public + interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin + at a specific address.") %] + </p> + </div> <p> <input type="checkbox" name="non_public" value="1" id="non_public"> <label for="non_public" class="inline">[% loc('Private') %]</label> diff --git a/templates/web/default/admin/edit-league.html b/templates/web/default/admin/edit-league.html index 6bf71537e..4f31eeb2e 100644 --- a/templates/web/default/admin/edit-league.html +++ b/templates/web/default/admin/edit-league.html @@ -1,3 +1,10 @@ +<div class="admin-hint"> + <p> + [% loc( + "The diligency prize league table shows editors' activity (who's been editing the most records)." + ) %] + </p> +</div> <h2>[% loc('Diligency prize league table') %]</h2> [% IF edit_activity.count %] <ul> diff --git a/templates/web/default/admin/flagged.html b/templates/web/default/admin/flagged.html index fc8b1fae1..518d1b14e 100644 --- a/templates/web/default/admin/flagged.html +++ b/templates/web/default/admin/flagged.html @@ -1,6 +1,11 @@ -[% INCLUDE 'admin/header.html' title=loc('Search Reports') %] +[% INCLUDE 'admin/header.html' title=loc('Flagged reports and users') %] [% PROCESS 'admin/report_blocks.html' %] +<p class="fms-admin-info"> + [% loc("You can flag any report or user by editing them, and they will be listed on this page. + For example, this can useful if you want to keep an eye on a user who has posted inappropriate + reports in the past.") %] +</p> <h2>[% loc( 'Problems' ) %]</h2> [% IF problems.size > 0 %] @@ -16,29 +21,41 @@ [% INCLUDE 'admin/problem_row.html' %] </table> [% ELSE %] -<p> -[% loc('No flagged problems found') %] -</p> + <p class="fms-admin-warning"> + [% loc('No flagged problems found.') %] + </p> [% END %] <h2>[% loc( 'Users' ) %]</h2> -[% IF users%] +<p class="fms-admin-info"> + [% loc("Flagged users are not restricted in any way. This is just a list of users that have been marked for attention.") %] +</p> + +[% IF users.size %] <table cellspacing="0" cellpadding="2" border="1"> <tr> <th>[% loc('Name') %]</th> <th>[% loc('Email') %]</th> + <th>[% loc('In abuse table?') %]</th> + <th> </th> </tr> -[% WHILE ( user = users.next ) -%] - <tr> + [%- FOREACH user IN users %] + <tr [% IF user.flagged == 2 %]class="is-deleted"[% END %]> <td>[% user.name | html %]</td> <td>[% user.email | html %]</td> - <td><a href="[% c.uri_for( 'reports', search => user.email ) %]">list content</a></td> + <td> + [% IF user.flagged == 2 %] <strong>[% loc('Yes') %]</strong> [% ELSE %] [% END %] + </td> + <td> + <a href="[% c.uri_for( 'reports', search => user.email ) %]">list content</a> + [% IF user.id %] | <a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('edit user') %]</a>[% END %] + </td> </tr> -[%- END %] + [%- END %] </table> [%- ELSE %] -<p> -[% loc('No flagged users found') %] +<p class="fms-admin-warning"> + [% loc('No flagged users found.') %] </p> [%- END %] diff --git a/templates/web/default/admin/header.html b/templates/web/default/admin/header.html index 6282bf383..9f3503e20 100644 --- a/templates/web/default/admin/header.html +++ b/templates/web/default/admin/header.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin' %] +[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin show-admin-notes' %] <style type="text/css"> dt { clear: left; float: left; font-weight: bold; } dd { margin-left: 8em; } diff --git a/templates/web/default/admin/index.html b/templates/web/default/admin/index.html index 2c5ee55db..5415222ab 100644 --- a/templates/web/default/admin/index.html +++ b/templates/web/default/admin/index.html @@ -1,5 +1,13 @@ [% INCLUDE 'admin/header.html' title=loc('Summary') -%] +[% IF total_bodies == 0 %] + <p class="fms-admin-info"> + [% loc('Currently no bodies have been created.') %] + <br> + [% tprintf( loc('You need to <a href="%s">add some bodies</a> (such as councils or departments) before any reports can be sent.'), c.uri_for('bodies')) %] + </p> +[% END %] + [%- BLOCK states -%] <h2>[% title %]</h2> diff --git a/templates/web/default/admin/reports.html b/templates/web/default/admin/reports.html index d57b2f53e..7267dd11d 100644 --- a/templates/web/default/admin/reports.html +++ b/templates/web/default/admin/reports.html @@ -20,6 +20,12 @@ [% INCLUDE 'pagination.html', admin = 1, param = 'p' IF pager %] +[% ELSIF searched %] + +<div class="fms-admin-warning"> + [% loc("Searching found no reports.") %] +</div> + [% END %] [% INCLUDE 'admin/list_updates.html' %] diff --git a/templates/web/default/admin/user-form.html b/templates/web/default/admin/user-form.html index 9c60ec940..489752d8c 100644 --- a/templates/web/default/admin/user-form.html +++ b/templates/web/default/admin/user-form.html @@ -2,16 +2,50 @@ <input type="hidden" name="token" value="[% token %]" > <input type="hidden" name="submit" value="1" > <ul class="no-bullets"> - <li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% user.name | html %]'></li> + <li> + <div class="admin-hint"> + <p> + [% loc( + "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>. + Names are not necessarily unique.") + %] + </p> + </div> + [% loc('Name:') %] <input type='text' name='name' id='name' value='[% user.name | html %]'> + </li> <li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% user.email | html %]'></li> - <li>[% loc('Body:') %] <select id='body' name='body'> + <li> + <div class="admin-hint"> + <p> + [% loc( + "Normal (public) users should not be associated with any <strong>body</strong>.<br> + Authorised staff users can be associated with the body they represent.<br> + Depending on the implementation, staff users may have access to the dashboard (summary of + activity across their body), the ability to hide reports or set special report statuses.") + %] + </p> + </div> + [% loc('Body:') %] <select id='body' name='body'> <option value=''>[% loc('No body') %]</option> [% FOR body IN bodies %] <option value="[% body.id %]"[% ' selected' IF body.id == user.from_body.id %]>[% body.name %]</option> [% END %] + </li> </select> [% IF c.cobrand.moniker != 'zurich' %] - <li>[% loc('Flagged:') %] <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]></li> + <li> + <div class="admin-hint"> + <p> + [% loc("Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>.") %] + <br> + [% tprintf(loc("Flagged users are listed on the <a href='%s'>flagged</a> page."), c.uri_for( 'flagged' )) %] + <br> + [% loc("You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create.") %] + </p> + </div> + + [% loc('Flagged:') %] <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]> + </li> [% END %] </ul> <input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" > diff --git a/templates/web/default/admin/users.html b/templates/web/default/admin/users.html index 70833ff85..db97c7d59 100644 --- a/templates/web/default/admin/users.html +++ b/templates/web/default/admin/users.html @@ -1,6 +1,9 @@ [% INCLUDE 'admin/header.html' title=loc('Search Users') %] [% PROCESS 'admin/report_blocks.html' %] +<div class="fms-admin-info"> + [% loc("User search finds matches in users' names and email addresses.") %] +</div> <form method="get" action="[% c.uri_for('users') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search" size="30" id="search" value="[% searched | html %]"> </form> @@ -30,12 +33,17 @@ [%- END -%] </table> +[% ELSIF searched %] + +<div class="fms-admin-warning"> + [% loc("Searching found no users.") %] +</div> + [% END %] [% IF NOT searched %] <h2>[% loc('Add user') %]</h2> [% INCLUDE 'admin/user-form.html', user = '' %] - [% END %] [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index 378265655..2c93a866c 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -6,13 +6,17 @@ <script type="text/javascript" src="/js/validation_rules.js?[% Math.int( date.now / 3600 ) %]"></script> <script type="text/javascript" src="/js/translation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script> -<script type="text/javascript" src="/jslib/jquery-1.7.2.min.js"></script> +<script type="text/javascript" src="[% start %]/jslib/jquery-1.7.2.min.js"></script> <script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script> <script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script> <script type="text/javascript" src="[% version('/js/fixmystreet.js') %]"></script> <script type="text/javascript" src="[% version(js_override || '/js/fixmystreet-old-box.js') %]"></script> +[% IF admin %] +<script type="text/javascript" src="[% version(start _ '/js/fixmystreet-admin.js') %]"></script> +[% END %] + [% map_js %] [% IF category_extras_json && category_extras_json != '{}' %] diff --git a/templates/web/default/js/translation_strings.html b/templates/web/default/js/translation_strings.html index a0cfc02c9..8f834a81c 100644 --- a/templates/web/default/js/translation_strings.html +++ b/templates/web/default/js/translation_strings.html @@ -15,6 +15,9 @@ required: '[% loc('Please enter your email') | replace("'", "\\'") %]', email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' }, + phone: { + required: '[% loc('Please enter your phone number') | replace("'", "\\'") %]' + }, fms_extra_title: '[% loc('Please enter your title') | replace("'", "\\'") %]', first_name: '[% loc('Please enter your first name') | replace("'", "\\'") %]', last_name: '[% loc('Please enter your second name') | replace("'", "\\'") %]', @@ -36,5 +39,7 @@ ok: '[% loc('OK') | replace("'", "\\'") %]', map: '[% loc('MAP') | replace("'", "\\'") %]', + permalink: '[% loc('Permalink') | replace("'", "\\'") %]', + report_problem_heading: '[% loc('Click map to report a problem') | replace("'", "\\'") %]' }; diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 83f746d56..9134c34f8 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -23,21 +23,42 @@ [%- ELSE %] [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_dt( update.confirmed ) ) | html -%] [%- END -%] + [%- update_state = '' %] - [%- IF update.mark_fixed %][% update_state = ", " _ loc( 'marked as fixed' ) %][% END %] - [%- IF update.mark_open %][% update_state = ", " _ loc( 'reopened' ) %][% END %] + [%- 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 %] [%- IF c.cobrand.moniker == 'bromley' OR problem.bodies_str == '2482' %] - [%- SET state = loc('no further action') IF update.problem_state == 'unable to fix' %] - [%- SET state = loc('third party responsibility') IF update.problem_state == 'not responsible' %] + [%- update_state = 'marked as no further action' IF state == 'unable to fix' %] + [%- update_state = 'marked as third party responsibility' IF state == 'not responsible' %] [%- END %] - [%- IF update.problem_state == 'confirmed' AND global.last_state != '' %] - [%- update_state = ", " _ loc('reopened') %] - [%- ELSIF update.problem_state != 'confirmed' %] - [%- update_state = ", " _ tprintf(loc( 'marked as %s' ), state ) %] + [%- END %] + [%- IF !update_state && update.problem_state %] + [%- IF state == 'confirmed' AND global.last_state != '' %] + [%- update_state = loc( 'reopened' ) %] + [%- ELSIF state == 'investigating' %] + [%- update_state = loc( 'marked as investigating' ) %] + [%- ELSIF state == 'planned' %] + [%- update_state = loc( 'marked as planned' ) %] + [%- ELSIF state == 'in progress' %] + [%- update_state = loc( 'marked as in progress' ) %] + [%- ELSIF state == 'action scheduled' %] + [%- update_state = loc( 'marked as action scheduled' ) %] + [%- ELSIF state == 'closed' %] + [%- update_state = loc( 'marked as closed' ) %] + [%- ELSIF state == 'fixed' %] + [%- update_state = loc( 'marked as fixed' ) %] + [%- ELSIF state == 'unable to fix' %] + [%- update_state = loc( 'marked as unable to fix' ) %] + [%- ELSIF state == 'not responsible' %] + [%- update_state = loc( "marked as not the council's responsibility" ) %] + [%- ELSIF state == 'duplicate' %] + [%- update_state = loc( 'marked as a duplicate report' ) %] + [%- ELSIF state == 'internal referral' %] + [%- update_state = loc( 'marked as an internal referral' ) %] [%- END %] [%- END %] - [%- update_state IF update_state != global.last_state %] + [%- ", " _ update_state IF update_state != global.last_state %] [%- global.last_state = update_state %] [% END %] diff --git a/templates/web/fixmindelo/faq/faq-pt-cv.html b/templates/web/fixmindelo/faq/faq-pt-cv.html new file mode 100644 index 000000000..cae17ebc6 --- /dev/null +++ b/templates/web/fixmindelo/faq/faq-pt-cv.html @@ -0,0 +1,121 @@ +[% 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">Practical Questions</a></li> + <li><a href="#organisation">Organisation Questions</a></li> + <li><a href="/privacy">Privacy and cookies</a></li> + <li><a href="/contact">Contact FixMyStreet</a></li> + </ul> + </aside> +</div> + +<h1><a name="faq"></a>Frequently Asked Questions</h1> + <dl> + <dt>O que é FixMyStreet?</dt> + <dd>FixMyStreet é um site para ajudar a informar as pessoas, ver ou discutir os problemas locais que encontrarem no seu conselho local, e basta localizá-los o mapa. Foi lançado no início de fevereiro de 2007.</dd> + + <dt>Como faço para entrar em contato com FixMyStreet?</dt> + <dd>Aqui está a nossa <a href="/contact">página de contato</a>.</dd> + + <dt>Que tipo de problemas que devo relatar com FixMyStreet?</dt> + <dd>FixMyStreet é principalmente para relatar coisas que <strong>estao quebradas, sujas, danificadas ou despejadas, abandonadas e precisam de conserto, limpeza e correção</strong>, tais como: + + + <ul><li>Veículos abandonados + <li>Animais na rua + <li>Grafites nas paredes + <li>Lixo ou entulho + <li>Iluminaçao deficiente, armaduras e candeeiros, quebrados, armarios partidos + <li>Postes quebrados, arvores caidas, + <li>Buracos na rua, nos passeios, jardins, calçadas + <li>Predios abandonados, pardeeiros, + <li>Lajes, varandas, em perigo + <li>Vazamentos de agua, tubagens + <li>Cabos, fios de electricidade em mau estado, caixas e portinholas, + <li>Placas de sinalizaçao, letreiros luminosos, de ruas, espaços, em mau estado + <li>Sinais de transito + </ul> + </dd> + + <dt>O que não é para ser relatado no FixMyStreet?</dt> + <dd> + FixMyStreet não é uma forma de entrar em contato com o seu conselho para todas as questões - por favor use FixMyStreet apenas para problemas como o acima. Nós muitas vezes recebemos relatórios de problemas que não dizem respeito ao Fix – directamente - e de rotas através de serviços de limpeza ou rodovias e assim usando FixMyStreet para outros assuntos pode resultar em um atraso do seu relatório de chegar ao departamento certo. Você vai precisar de contactar o seu município diretamente para problemas, tais como: + + <ul> + <li>Comportamento Anti-social + <li>Qualquer problema de urgência ou emergência + <li>A poluição sonora ou cachorros latindo + <li>Fogos e fumaça / poluição cheiro + <li>Falta recipientes para lixo ou reciclagem de caixas ou perdeu coleções de lixo + <li>Propostas para redutores de velocidade / CCTV / travessias de pedestres / novos layouts de estrada / etc + <li>Queixar-se sobre os seus vizinhos + <li>Reclamando do conselho + <li>Joy passeios, consumo de drogas, crueldade animal, ou outra atividade criminosa + </ul> + <p>Conselhos costumam ter linhas diretas para esses tipos de questões. Contacte-os directamente atravez do seu site.</p> + </dd> + + <dt>Como faço para usar o site?</dt> + <dd>Depois de inserir um código postal ou localização, zona ou lugar, é apresentado com um mapa dessa área, zona ou local.Você pode ver os problemas já relatados nesta área, ou denunciar, relatar os problemas do seu propio local, simplesmente clicando no mapa no local do problema.</dd> + + <dt>Como são resolvidos os problemas?</dt> + <dd>Eles são relatados ao conselho, do departamento responsavel, por e-mail. O conselho pode, então, resolver o problema da maneira que normalmente faria. O Conselho encaminhara para cada sector ou departamento os relatorios dos problemas a que dizem respeito. Alternativamente, você pode discutir o problema no site com os outros, e, em seguida, juntos pressionar o conselho para corrigi-lo, saber a posiçao e andamento do relatorio ou sendo possivel tentar corrigir os problemas em entre ajuda com pessoas da comunidade.O Conselho dará tambem sempre uma resposta quanto possivel sobre o problema.</dd> + + <dt>O FixMyStreet é grátis?</dt> + <dd>O site é livre para usar, sim. FixMyStreet é gerido por uma instituição sem fins lucrativos, mas se aceitam doaçoes livres. É só enviar. + </dd> + + <dt>Posso usar FixMyStreet no meu celular?</dt> + <dd> + <p> O site FixMyStreet deve funcionar em seu telefone móvel, adaptando-se ao tamanho da tela automaticamente. Estamos a preparar uma versão atualizada de um aplicativo para utilizaçao futura. + </dd> + + </dl> + + <h2><a name="practical"></a>Perguntas práticas</h2> + <dl> + <dt>Eu sou de um conselho, onde enviar os relatorios?</dt> + <dd> + Você pode deixar um relatório de ensaio no site ou entrar em contato conosco para saber o andamento e posiçao dos seus relatorios e seu acompanhamento. Contacte-nos também para atualizar o endereço ou endereços que usamos. + </dt> + <dt>Eu sou de um conselho, podemos ter FixMyStreet em nosso site?</dt> + <dd> + Sim, você pode! Nós oferecemos marca, as versões do FixMyStreet para sites locais do conselho hospedado. <a href="http://www.mysociety.org/for-councils/fixmystreet/">Detalhes completos</a>. + </dd> + <dt>Voces removem conteudo ilegal, descriminatorio ou sem conteudo de fix?</dt> + <dd>FixMyStreet não é responsável pelo conteúdo e precisão do material enviado por seus usuários. Reservamo-nos o direito de editar ou remover quaisquer problemas ou atualizações que consideramos ser impróprio ao ser informado por um usuário do site.</dd> + + <dt>Por que não posso diminuir o zoom mais no mapa de referência?</dt> + <dd>Queremos manter FixMyStreet focado localmente, de modo restringir a capacidade de mover-se radicalmente entre as áreas. O mapa em seus relatórios permitirá que você veja todos os relatórios que você fez, onde quer que estejam. Se você é do conselho, em seguida, a versão do relatório enviado por email do problema também contém a estrada, zona, lugar, mais próximo e código postal para o pino no mapa. + </dd> + + <dt>Porque não é divulgado muito o FixMyStreet, apesar da sua importancia?</dt> + <dd>Como uma pequena instituição sem fins lucrativos nóssimplesmente não temos um orçamento de publicidade, e por isso temos sempre confiado na palavra da boca para divulgar o site. Contamos consigo para essa divulgaçao. + </dd> + </dl> + + <h2><a name="organisation"></a>Organização Perguntas</h2> + <dl> + <dt>Quem construiu FixMyStreet?</dt> + <dd> + Este site foi construído por <a href="http://www.mysociety.org/">mySociety</a>, em conjunto com a <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. mySociety é o projeto de uma instituição sem fins lucrativos que cresceu fora da comunidade de voluntários que construíram sites como <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. A principal missão da mySociety é a construção de projetos de Internet que dão às pessoas benefícios simples e tangíveis nos aspectos cívicos e comunidade onde vivem ou residem. Nosso primeiro projeto foi <a href="http://www.writetothem.com/">WriteToThem</a>, onde você pode escrever a qualquer um de seus representantes eleitos, de forma gratuita. A fundaçao é chamado UK Citizens Online Democracy e é o número 1076346 caridade. mySociety pode ser contactado pelo e-mail <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, ou por correio para mySociety, 483 Green Lanes, London, N13 4BS, Reino Unido. + </dd> + <dt>Você precisa de alguma ajuda com o projeto?</dt> + <dd>Sim, nós podemos usar a ajuda em todos os tipos de formas, técnicas ou não-técnicas. Por favor, consulte a nossa <a +href="http://www.mysociety.org/helpus/">página se envolver</a>. + </dd> + + <dt>Eu gostaria de um site como este para o meu próprio local / onde está o "código fonte" a este site?</dt> + <dd> +O software por trás deste site é de código aberto e disponível para você, principalmente sob a licença GNU Affero software GPL. Você pode <a href="http://github.com/mysociety/fixmystreet">baixar o código fonte</a> e nos ajudar a desenvolvê-lo. Você está convidado a usá-lo em seus próprios projetos, mas você também deve disponibilizar o código-fonte para tais projetos. <a href="http://www.fiksgatami.no/">Fiksgatami</a> é um exemplo de página de código a ser utilizado numa versão norueguesa deste local. + </dd> + + <dt>As pessoas constroem coisas, e não organizações. Quem realmente construiu?</dt> + <dd> + Matthew Somerville e Francis Irving escreveu o site, Chris Lightfoot escreveu o tileserver e mapa de corte, Richard Papa criou nossos pins, Deborah Kerr mantém as coisas up-to-date e faz suporte ao usuário, Ayesha Garrett projetou nossos cartazes e Tom Steinberg construi tudo. Agradecemos também a Yahoo! para as bibliotecas JavaScript BSD-licenciados, toda a comunidade de software livre (este projeto foi trazido a você por Perl, PostgreSQL, eo número 161,290) e <a href="http://www.bytemark.co.uk/">Bytemark</a> (que gentilmente acolheu todos os nossos servidores). Deixe-nos saber se nos esquecemeos de mencionar alguem. Nos contacte para o efeito. + </dd> + </dl> +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/around/_updates.html b/templates/web/fixmystreet/around/_updates.html index 75327c935..458983e8f 100755 --- a/templates/web/fixmystreet/around/_updates.html +++ b/templates/web/fixmystreet/around/_updates.html @@ -1,5 +1,5 @@ <div class="shadow-wrap"> <ul id="key-tools" class="singleton"> - <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">Get updates</a></li> + <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/auth/general.html b/templates/web/fixmystreet/auth/general.html index 7fa2b57fe..b9d02c18b 100644 --- a/templates/web/fixmystreet/auth/general.html +++ b/templates/web/fixmystreet/auth/general.html @@ -50,7 +50,7 @@ <h5>[% loc('<strong>No</strong> let me sign in by email') %]</h5> <div class="general-sidebar-notes"> - <p>Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.</p> + <p>[% loc('Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> </div> <label for="name">[% loc('Name') %]</label> diff --git a/templates/web/zurich/admin/body-form.html b/templates/web/zurich/admin/body-form.html index 5ae8eb8a6..4e570a058 100644 --- a/templates/web/zurich/admin/body-form.html +++ b/templates/web/zurich/admin/body-form.html @@ -10,7 +10,6 @@ <input type="text" name="endpoint" id="email" value="[% body.endpoint %]" size="50"> </p> -[% IF admin_type == 'super' %] <p> <label for="parent">[% loc('Parent') %]</label> <select name="parent" id="parent"> @@ -31,7 +30,11 @@ [% END %] </select> </p> -[% END %] + + <p> + <label for="deleted">[% loc('Flag as deleted') %]</label> + <input type="checkbox" name="deleted" id="deleted" value="1"[% ' checked' IF body.deleted %] /> + </p> <input type="hidden" name="send_method" value="Email"> <input type="hidden" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction %]"> diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html index be146f0e1..281b1de23 100644 --- a/templates/web/zurich/admin/header.html +++ b/templates/web/zurich/admin/header.html @@ -14,6 +14,7 @@ %] <style type="text/css"> .adminhidden { color: #666666; } + .admininternal { background-color: #eeeeff; } .active { background-color: #ffffee; cursor: pointer; } .error { color: red; } .overdue { background-color: #ffcccc; } diff --git a/templates/web/zurich/admin/index-dm.html b/templates/web/zurich/admin/index-dm.html index 530e72c59..e0b62d5d2 100644 --- a/templates/web/zurich/admin/index-dm.html +++ b/templates/web/zurich/admin/index-dm.html @@ -26,6 +26,7 @@ [% IF include_subdiv %] <th>[% loc('Subdivision/Body') %]</th> [% END %] + <th>[% loc('Photo') %]</th> <th class='edit'>*</th> </tr> <tr class="filter-row"> diff --git a/templates/web/zurich/admin/index-sdm.html b/templates/web/zurich/admin/index-sdm.html index 76593ead0..707bb2d9d 100644 --- a/templates/web/zurich/admin/index-sdm.html +++ b/templates/web/zurich/admin/index-sdm.html @@ -21,6 +21,7 @@ [% FOREACH col IN [ [ 'category', loc('Category') ], [ 'created', loc('Submitted') ], [ 'lastupdate', loc('Updated') ], [ 'state', loc('Status') ] ] %] <th><a href="[% INCLUDE sort_link choice = col.0 %]#[% hash %]">[% col.1 %] [% INCLUDE sort_arrow choice = col.0 %]</a></th> [% END %] + <th>[% loc('Photo') %]</th> [% IF NOT no_edit %] <th class='edit'>*</th> [% END %] diff --git a/templates/web/zurich/admin/list_updates.html b/templates/web/zurich/admin/list_updates.html index c475d839e..80029462b 100644 --- a/templates/web/zurich/admin/list_updates.html +++ b/templates/web/zurich/admin/list_updates.html @@ -5,12 +5,14 @@ <tr> <th>[% loc('ID') %]</th> <th>[% loc('Created') %]</th> + <th>[% loc('User') %]</th> <th>[% loc('Text') %]</th> </tr> [% FOREACH update IN updates -%] - <tr[% ' class="adminhidden"' IF update.state == 'hidden' || update.problem.state == 'hidden' %]> - <td>[%- update.id %]</td> + <tr class="[% 'adminhidden' IF update.state == 'hidden' || update.problem.state == 'hidden' %] [% 'admininternal' IF update.extra.is_internal_note %]"> + <td>[% update.id %]</td> <td>[% PROCESS format_date this_date=update.created %] [% update.created.hms %]</td> + <td><a href="mailto:[% update.user.email %]">[% update.user.name || update.user.email %]</a></td> <td>[% update.text | html %]</td> </tr> [% END -%] diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html index 8b1a30cb0..71b64839a 100644 --- a/templates/web/zurich/admin/problem_row.html +++ b/templates/web/zurich/admin/problem_row.html @@ -32,6 +32,12 @@ </td> [% END %] + <td> + [% IF problem.photo %] + <img class="img" height="60" width="90" src="[% c.cobrand.base_url %]/photo/[% problem.photo %].temp.jpeg" alt=""> + [% END %] + </td> + [% IF NOT no_edit %] <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td> [% END %] diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index fcdb03602..599c60b77 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -22,6 +22,9 @@ <ul class="no-bullets"> <li><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li> + +<li><a href="http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=UP&Search=Koord&West=[% problem.local_coords.1 %]&Nord=[% problem.local_coords.0 %]&B=300" target="_blank">Standort in AV-Online anzeigen</a></li> + <li><span class="mock-label">[% loc('Details:') %]</span> [% problem.detail | html %] [% IF problem.extra.original_detail %] <br>[% @@ -52,8 +55,8 @@ <li><span class="mock-label">[% loc('State:') %]</span> [% states.${problem.state} %]</li> -<li><label for="internal_notes">[% loc('Internal notes:') %]</label> -<textarea name='internal_notes' id='internal_notes' cols=60 rows=5>[% problem.extra.internal_notes | html %]</textarea></li> +<li><label for="new_internal_note">[% loc('New internal note:') %]</label> +<textarea name='new_internal_note' id='new_internal_note' cols=60 rows=5></textarea></li> <li><label for="status_update">[% loc('New update:') %]</label> <textarea name='status_update' id='status_update' cols=60 rows=5></textarea></li> diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index 5c5b1f7b1..cd399f23b 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -1,4 +1,5 @@ [% + PROCESS "report/photo-js.html"; PROCESS "maps/zurich.html"; INCLUDE 'admin/header.html' title = tprintf(loc('Editing problem %d'), problem.id ), @@ -21,6 +22,8 @@ <ul class="no-bullets"> <li><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li> +<li><a href="http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=UP&Search=Koord&West=[% problem.local_coords.1 %]&Nord=[% problem.local_coords.0 %]&B=300" target="_blank">Standort in AV-Online anzeigen</a></li> + [% IF problem.state == 'fixed - council' OR problem.state == 'closed' %] <li><span class="mock-label">[% loc('Details:') %]</span> [% problem.detail | html %] [% IF problem.extra.original_detail %] @@ -62,7 +65,13 @@ [% IF problem.photo %] -<li><img alt="" src="[% c.cobrand.base_url %]/photo/[% problem.photo %].temp.jpeg"> +<li> +[% photo = problem.get_photo_params %] +<div class="update-img"> + <a href="[% c.cobrand.base_url %]/photo/[% problem.photo %].fulltemp.jpeg" rel="fancy"> + <img alt="Photo of this report" src="[% c.cobrand.base_url %]/photo/[% problem.photo %].temp.jpeg"> + <span>zoom</span></a> +</div> <br> <input type="submit" name="rotate_photo" value="[% loc('Rotate Left') %]"> <input type="submit" name="rotate_photo" value="[% loc('Rotate Right') %]"> @@ -72,8 +81,8 @@ [% END %] </ul> -<p><label for="internal_notes">[% loc('Internal notes:') %]</label> -<textarea name='internal_notes' id='internal_notes' cols=60 rows=5>[% problem.extra.internal_notes | html %]</textarea></p> +<p><label for="new_internal_note">[% loc('New internal note:') %]</label> +<textarea name='new_internal_note' id='new_internal_note' cols=60 rows=5>[% new_internal_note | html %]</textarea></p> <p><span class="mock-label">[% loc('State:') %]</span> <select name="state" id="state"> <option value="">--</option> @@ -94,6 +103,24 @@ [% END %] </select></p> +<p id="automatic-reply"> + <span class="mock-label">automatische Antwort</span> + <input type="checkbox" name="send_rejected_email" id="send_rejected_email" value="1" checked="checked" /> +</p> + +<script type="text/javascript"> +$(function(){ + // Show or hide the automatic reply field + $('#state').change(function(){ + if ($(this).val() === 'hidden') { + $('#automatic-reply').show(); + } else { + $('#automatic-reply').hide(); + } + }).change(); +}); +</script> + [% IF problem.state == 'unconfirmed' OR problem.state == 'confirmed' %] <ul class="no-bullets"> @@ -127,7 +154,7 @@ <select name="body_external" id="body_external"> <option value="">--</option> [% FOR body IN bodies %] - [% NEXT IF body.parent OR body.bodies %] + [% NEXT IF body.parent OR body.bodies OR body.deleted %] <option value="[% body.id %]"[% IF body.id == problem.bodies_str %] selected[% END %]>[% body.name %]</option> [% END %] </select> diff --git a/templates/web/zurich/admin/reports.html b/templates/web/zurich/admin/reports.html index b0bc733c4..68f98c44a 100644 --- a/templates/web/zurich/admin/reports.html +++ b/templates/web/zurich/admin/reports.html @@ -13,6 +13,7 @@ [% FOREACH col IN [ [ 'category', loc('Category') ], [ 'created', loc('Submitted') ], [ 'lastupdate', loc('Updated') ], [ 'state', loc('Status') ] ] %] <th><a href="[% INCLUDE sort_link choice = col.0 %]">[% col.1 %] [% INCLUDE sort_arrow choice = col.0 %]</a></th> [% END %] + <th>[% loc('Photo') %]</th> <th class='edit'>*</th> </tr> [% INCLUDE 'admin/problem_row.html' %] diff --git a/templates/web/zurich/js/validation_rules.html b/templates/web/zurich/js/validation_rules.html new file mode 100644 index 000000000..d98bc1118 --- /dev/null +++ b/templates/web/zurich/js/validation_rules.html @@ -0,0 +1,8 @@ + validation_rules = { + title: { required: true }, + detail: { required: true }, + email: { required: true }, + update: { required: true }, + phone: { required: true }, + rznvy: { required: true } + }; 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 1cecf036d..076536601 100644 --- a/templates/web/zurich/report/new/fill_in_details_form.html +++ b/templates/web/zurich/report/new/fill_in_details_form.html @@ -103,7 +103,10 @@ [% END %] <input type="text" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> - <label for="form_phone">[% loc('Phone number (optional)') %]</label> + <label for="form_phone">[% loc('Phone number') %]</label> + [% IF field_errors.phone %] + <p class='form-error'>[% field_errors.phone %]</p> + [% END %] <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> <div class="form-txt-submit-box"> diff --git a/templates/web/zurich/report/photo-js.html b/templates/web/zurich/report/photo-js.html new file mode 100644 index 000000000..05588d085 --- /dev/null +++ b/templates/web/zurich/report/photo-js.html @@ -0,0 +1,6 @@ +[% extra_css = BLOCK %] + <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> +[% END %] +[% extra_js = BLOCK %] + <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> +[% END %] diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 5c914e3a8..d4dfdf99f 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -373,7 +373,7 @@ $.fn.drawer = function(id, ajax) { //add permalink on desktop, force hide on mobile if (cobrand != 'zurich') { - $('#sub_map_links').append('<a href="#" id="map_permalink">Permalink</a>'); + $('#sub_map_links').append('<a href="#" id="map_permalink">' + translation_strings.permalink + '</a>'); } if($('.mobile').length){ diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 07f944ffa..126e44685 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1032,11 +1032,92 @@ $button_bg_col: #a1a1a1; // also search bar (tables) border: none; padding: 3px 0.5em; } + tr.is-deleted { + background-color: #ffdddd; + td.contact-category { + text-decoration: line-through; + } + } + } + .no-bullets { + margin-left: 0; + > li { + list-style: none; + } + } + .fms-admin-warning, .fms-admin-info, .admin-hint { + display: none; // don't display admin-notes unless .show-admin-notes class is present + } + &.show-admin-notes { + .fms-admin-warning, .fms-admin-info, .admin-hint { + display: block; + } + .fms-admin-warning, .fms-admin-info { + padding: 1em; + font-size: 90%; + border-style: solid; + border-width: 1px; + border-left-width: 1em; + margin-bottom: 1em; + } + .fms-admin-warning { + border-color: #f99; + background-color: #ffe1e1; + } + .fms-admin-info { + border-color: #9f9; + background-color: #e1ffe1; + } + .admin-open311-only { + border:1px solid #666; + padding:1em; + margin: 1em 0; + } + .admin-hint { + font-size: 80%; // little question marks are small + cursor: pointer; + display: block; + float:left; + overflow: hidden; + padding: 0.2em; + margin-right: 0.666em; + text-align: center; + color: #fff; + font-weight: bold; + background-color: #f93; + -moz-border-radius: 0.333em; + -webkit-border-radius: 0.333em; + border-radius: 0.333em; + p { + display:none; + } + &:before { content: "?" } + &.admin-hint-show { + font-size: 90%; + text-align: left; + display: block; + float:none; + margin:1em 0; + &:before { content: "" } + background-color: inherit !important; + p { + font-weight: normal; + display: block; + background-color: #ff9; + color: #000; + border-style: solid; + border-width: 1px; + border-left-width: 1em; + border-color: #f93; + padding:1em; + margin: 0; + } + } } + } } - /* MEDIA QUERIES */ @media only screen and (min-width: 48em) and (max-width: 61em) { .container { diff --git a/web/cobrands/zurich/_zurich.scss b/web/cobrands/zurich/_zurich.scss index c9eb7a080..f9ea29d9a 100644 --- a/web/cobrands/zurich/_zurich.scss +++ b/web/cobrands/zurich/_zurich.scss @@ -35,3 +35,7 @@ body.frontpage #zurich-footer-wrapper { #zurich-footer a:hover { color: #3c3c3c; } + +.muted, .muted a { + color: #aaa; +} diff --git a/web/js/fixmystreet-admin.js b/web/js/fixmystreet-admin.js new file mode 100644 index 000000000..1aabf8349 --- /dev/null +++ b/web/js/fixmystreet-admin.js @@ -0,0 +1,61 @@ +$(function(){ + // available for admin pages + + // hide the open311_only section and reveal it only when send_method is relevant + var $open311_only = $('.admin-open311-only'); + + function hide_or_show_open311(hide_fast) { + var send_method = $('#send_method').val(); + var show_open311 = false; + if ($('#endpoint').val()) { + show_open311 = true; // always show the form if there is an endpoint value + } else if (send_method && send_method.toLowerCase() != 'email') { + show_open311 = true; + } + if (show_open311) { + $open311_only.slideDown(); + } else { + if (hide_fast) { + $open311_only.hide(); + } else { + $open311_only.slideUp(); + } + } + } + + if ($open311_only) { + $('#send_method').on('change', hide_or_show_open311); + hide_or_show_open311(true); + } + + if ($('body').hasClass("show-admin-notes")) { + + // admin hints: maybe better implemented as tooltips? + $(".admin-hint").on('click', function(){ + if ($(this).hasClass('admin-hint-show')) { + $(this).removeClass('admin-hint-show'); + } else { + $(this).addClass('admin-hint-show'); + } + }); + + // on a body's page, hide/show deleted contact categories + var $table_with_deleted_contacts = $('table tr.is-deleted td.contact-category').closest('table'); + if ($table_with_deleted_contacts.length == 1) { + var $toggle_deleted_btn = $("<input type='submit' class='btn' value='Hide deleted contacts' id='toggle-deleted-contacts-btn' style='margin:1em 0;'/>"); + $table_with_deleted_contacts.before($toggle_deleted_btn); + $toggle_deleted_btn.on('click', function(e){ + e.preventDefault(); + var $cols = $table_with_deleted_contacts.find('tr.is-deleted'); + if ($cols.first().is(':visible')) { + $cols.hide(); + $(this).prop("value", 'Show deleted contacts'); + } else { + $cols.show(); + $(this).prop("value", 'Hide deleted contacts'); + } + }); + } + } +}); + diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 9b8916946..79c646f7b 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -94,10 +94,10 @@ OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, { */ initialize: function(name, options) { var url = [ - "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", - "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", - "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", - "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png" + "http://otile1.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png", + "http://otile2.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png", + "http://otile3.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png", + "http://otile4.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png" ]; options = OpenLayers.Util.extend({ /* Below line added to OSM's file in order to allow minimum zoom level */ |