diff options
51 files changed, 2429 insertions, 1873 deletions
diff --git a/bin/make_po b/bin/make_po index 76dc4566b..ad1fc1a89 100755 --- a/bin/make_po +++ b/bin/make_po @@ -14,6 +14,7 @@ mkdir("en_GB.UTF-8"); mkdir("en_GB.UTF-8/LC_MESSAGES"); my $pofile = shift; +die "Please supply a filename" unless $pofile; open(MAINPO, "FixMyStreet.po") or die ""; open(EHAPO, ">$pofile.po") or die ""; diff --git a/bin/send-comments b/bin/send-comments index fb81d76e9..fc2ab42bd 100755 --- a/bin/send-comments +++ b/bin/send-comments @@ -49,7 +49,7 @@ while ( my $body = $bodies->next ) { # Oxfordshire (OCC) is special: # we do *receive* service_request_updates (aka comments) for OCC, but we never *send* them, so skip this pass - next if $body->areas->{COUNCIL_ID_OXFORDSHIRE}; + next if $body->areas->{+COUNCIL_ID_OXFORDSHIRE}; my $use_extended = 0; my $comments = FixMyStreet::App->model('DB::Comment')->search( { diff --git a/bin/update-all-reports b/bin/update-all-reports index d0146dd47..e60d7ddef 100755 --- a/bin/update-all-reports +++ b/bin/update-all-reports @@ -69,6 +69,14 @@ while ( my @problem = $problems->next ) { } } +if ( FixMyStreet->config('BASE_URL') =~ /emptyhomes/ ) { + my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('emptyhomes')->new(); + my $stats = $cobrand->old_site_stats; + foreach (keys %$stats) { + $open{$_}{unknown} += $stats->{$_}; + } +} + my $body = JSON->new->utf8(1)->encode( { fixed => \%fixed, open => \%open, diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 5aa306f1b..667f3b57a 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-02-20 20:23+0000\n" +"POT-Creation-Date: 2013-02-13 11:17+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -17,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:355 +#: perllib/FixMyStreet/DB/Result/Problem.pm:649 perllib/FixMyStreet/DB/ResultSet/Problem.pm:355 msgid " and " msgstr "" @@ -57,15 +57,11 @@ msgstr "" msgid "%d supporters" msgstr "" -#: templates/web/default/pagination.html:10 -msgid "%d to %d of %d" -msgstr "" - #: templates/web/default/reports/body.html:0 templates/web/default/reports/body.html:20 msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:685 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "%s ref: %s" msgstr "" @@ -73,7 +69,7 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "%s, reported at %s" msgstr "" @@ -105,11 +101,11 @@ msgstr "" msgid "(alternatively the RSS feed can be customised, within" msgstr "" -#: templates/web/default/around/around_map_list_items.html:12 templates/web/default/around/on_map_list_items.html:9 templates/web/fixmystreet/report/_item.html:22 templates/web/zurich/report/_item.html:21 +#: templates/web/default/around/around_map_list_items.html:12 templates/web/default/around/on_map_list_items.html:9 templates/web/fixmystreet/report/_item.html:20 templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "" -#: templates/web/default/around/around_map_list_items.html:10 templates/web/default/around/on_map_list_items.html:7 templates/web/fixmystreet/report/_item.html:20 templates/web/zurich/report/_item.html:19 +#: templates/web/default/around/around_map_list_items.html:10 templates/web/default/around/on_map_list_items.html:7 templates/web/fixmystreet/report/_item.html:18 templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "" @@ -117,15 +113,15 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/default/reports/_list-entry.html:4 templates/web/fixmystreet/report/_item.html:16 +#: templates/web/default/reports/_list-entry.html:4 templates/web/fixmystreet/report/_item.html:14 msgid "(not sent to council)" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:217 templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/default/report/new/fill_in_details_form.html:217 templates/web/emptyhomes/report/new/fill_in_details_form.html:140 templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "(optional)" msgstr "" -#: templates/web/default/reports/_list-entry.html:2 templates/web/fixmystreet/report/_item.html:15 +#: templates/web/default/reports/_list-entry.html:2 templates/web/fixmystreet/report/_item.html:13 msgid "(sent to both)" msgstr "" @@ -137,11 +133,11 @@ msgstr "" msgid "(we never show your email)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:418 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 perllib/FixMyStreet/App/Controller/Report/New.pm:661 perllib/FixMyStreet/DB/Result/Problem.pm:431 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 perllib/FixMyStreet/DB/Result/Problem.pm:424 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 perllib/FixMyStreet/DB/Result/Problem.pm:437 msgid "-- Pick a property type --" msgstr "" @@ -229,7 +225,7 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/fixmystreet/auth/general.html:50 templates/web/zurich/auth/general.html:49 +#: templates/web/fixmystreet/auth/general.html:50 msgid "<strong>No</strong> let me sign in by email" msgstr "" @@ -249,7 +245,7 @@ msgstr "" msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/default/static/about.html:1 templates/web/default/static/about.html:3 templates/web/emptyhomes/header.html:30 templates/web/emptyhomes/static/about.html:1 templates/web/emptyhomes/static/about.html:3 +#: templates/web/default/static/about.html:1 templates/web/default/static/about.html:3 templates/web/emptyhomes/header.html:34 templates/web/emptyhomes/static/about.html:1 templates/web/emptyhomes/static/about.html:3 msgid "About us" msgstr "" @@ -265,7 +261,7 @@ msgstr "" msgid "Add new category" msgstr "" -#: templates/web/default/admin/users.html:36 +#: templates/web/default/admin/users.html:35 msgid "Add user" msgstr "" @@ -289,15 +285,15 @@ msgstr "" msgid "Alert me to future updates" msgstr "" -#: templates/web/default/reports/index.html:3 templates/web/fixmybarangay/reports/index.html:3 templates/web/zurich/admin/stats.html:5 templates/web/zurich/reports/index.html:15 +#: templates/web/default/reports/index.html:3 templates/web/fixmybarangay/reports/index.html:3 templates/web/zurich/reports/index.html:15 msgid "All Reports" msgstr "" -#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 templates/web/bromley/header.html:77 templates/web/default/footer.html:11 templates/web/emptyhomes/header.html:28 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:60 templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:6 +#: templates/web/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/footer.html:19 templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "" -#: templates/web/default/admin/stats.html:5 templates/web/zurich/admin/stats.html:8 +#: templates/web/default/admin/stats.html:5 msgid "All reports between %s and %s" msgstr "" @@ -313,19 +309,15 @@ msgstr "" msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system." msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:4 templates/web/bromley/report/new/fill_in_details_form.html:6 templates/web/default/report/new/councils_text_all.html:18 templates/web/default/report/new/councils_text_all.html:20 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:13 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:8 +#: 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 "" -#: templates/web/emptyhomes/report/new/councils_text_all.html:2 templates/web/emptyhomes/report/new/councils_text_all.html:4 -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." -msgstr "" - #: templates/web/default/questionnaire/index.html:60 templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/default/admin/flagged.html:15 templates/web/default/admin/list_updates.html:11 templates/web/default/admin/reports.html:17 +#: templates/web/default/admin/flagged.html:15 templates/web/default/admin/list_updates.html:10 templates/web/default/admin/reports.html:18 msgid "Anonymous" msgstr "" @@ -349,19 +341,19 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:111 templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/report_edit.html:109 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:120 +#: templates/web/zurich/admin/report_edit.html:118 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:152 templates/web/zurich/admin/report_edit.html:99 +#: templates/web/zurich/admin/report_edit.html:150 templates/web/zurich/admin/report_edit.html:97 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:97 templates/web/zurich/report/updates.html:11 +#: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -373,7 +365,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 templates/web/zurich/report/_item.html:11 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -389,11 +381,11 @@ 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:1131 perllib/FixMyStreet/Cobrand/Zurich.pm:203 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 perllib/FixMyStreet/Cobrand/Zurich.pm:144 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:63 msgid "Bodies" msgstr "" -#: templates/web/default/admin/reports.html:15 templates/web/default/admin/users.html:14 +#: templates/web/default/admin/reports.html:16 templates/web/default/admin/users.html:14 msgid "Body" msgstr "" @@ -413,7 +405,7 @@ msgstr "" msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 perllib/FixMyStreet/App/Controller/Report/New.pm:666 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/flagged.html:14 templates/web/default/admin/index.html:36 templates/web/default/admin/reports.html:16 templates/web/fixmystreet/report/new/fill_in_details_form.html:74 templates/web/zurich/admin/body.html:13 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:49 templates/web/zurich/report/new/fill_in_details_form.html:50 +#: 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/flagged.html:14 templates/web/default/admin/index.html:36 templates/web/default/admin/reports.html:17 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:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:14 templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "" @@ -421,7 +413,7 @@ 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:33 templates/web/default/report/new/fill_in_details_form.html:67 templates/web/zurich/admin/body.html:36 templates/web/zurich/admin/report_edit-sdm.html:39 templates/web/zurich/admin/report_edit.html:110 +#: templates/web/default/admin/body.html:75 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:33 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:29 templates/web/zurich/admin/report_edit.html:108 msgid "Category:" msgstr "" @@ -437,11 +429,11 @@ msgstr "" msgid "Click map to report a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:28 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:87 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/stats.html:30 templates/web/zurich/report/banner.html:13 +#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:28 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:85 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:778 +#: perllib/FixMyStreet/DB/Result/Problem.pm:791 msgid "Closed by council" msgstr "" @@ -457,11 +449,11 @@ 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:30 templates/web/zurich/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:17 templates/web/zurich/admin/report_edit-sdm.html:22 templates/web/zurich/admin/report_edit.html:43 msgid "Co-ordinates:" msgstr "" -#: templates/web/default/admin/flagged.html:16 templates/web/default/admin/list_updates.html:14 templates/web/default/admin/reports.html:18 +#: templates/web/default/admin/flagged.html:16 templates/web/default/admin/list_updates.html:13 templates/web/default/admin/reports.html:19 msgid "Cobrand" msgstr "" @@ -497,7 +489,7 @@ msgstr "" msgid "Confirmation" msgstr "" -#: 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:39 +#: 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 msgid "Confirmed" msgstr "" @@ -525,7 +517,7 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1264 perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 perllib/FixMyStreet/App/Controller/Admin.pm:1252 msgid "Could not find user" msgstr "" @@ -533,7 +525,7 @@ msgstr "" msgid "Could not look up location" msgstr "" -#: templates/web/default/admin/flagged.html:13 templates/web/default/admin/list_updates.html:13 +#: templates/web/default/admin/flagged.html:13 templates/web/default/admin/list_updates.html:12 msgid "Council" msgstr "" @@ -545,7 +537,7 @@ msgstr "" msgid "Council:" msgstr "" -#: templates/web/default/admin/stats.html:12 templates/web/default/admin/stats.html:32 templates/web/zurich/admin/stats.html:44 templates/web/zurich/admin/stats.html:49 +#: templates/web/default/admin/stats.html:12 templates/web/default/admin/stats.html:32 msgid "Count" msgstr "" @@ -557,11 +549,11 @@ msgstr "" msgid "Create category" msgstr "" -#: templates/web/default/admin/flagged.html:17 templates/web/default/admin/list_updates.html:10 templates/web/default/admin/reports.html:19 templates/web/zurich/admin/list_updates.html:7 +#: templates/web/default/admin/flagged.html:17 templates/web/default/admin/list_updates.html:9 templates/web/default/admin/reports.html:20 templates/web/zurich/admin/list_updates.html:6 msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:41 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:44 templates/web/zurich/admin/report_edit.html:58 templates/web/zurich/admin/update_edit.html:29 +#: templates/web/default/admin/report_edit.html:41 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:34 templates/web/zurich/admin/report_edit.html:55 templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -573,15 +565,11 @@ msgstr "" msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:34 -msgid "Dealt with by subdivision within 5 working days" -msgstr "" - #: 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 "" -#: templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:21 templates/web/zurich/admin/index-sdm.html:19 templates/web/zurich/admin/reports.html:13 msgid "Description" msgstr "" @@ -589,7 +577,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/zurich/admin/report_edit-sdm.html:22 templates/web/zurich/admin/report_edit.html:22 templates/web/zurich/admin/report_edit.html:32 +#: 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:14 templates/web/zurich/admin/report_edit.html:22 templates/web/zurich/admin/report_edit.html:32 msgid "Details:" msgstr "" @@ -617,7 +605,7 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 templates/web/default/admin/problem_row.html:31 templates/web/default/admin/users.html:28 templates/web/zurich/admin/problem_row.html:38 +#: templates/web/default/admin/list_updates.html:35 templates/web/default/admin/problem_row.html:31 templates/web/default/admin/users.html:28 templates/web/zurich/admin/problem_row.html:35 msgid "Edit" msgstr "" @@ -625,7 +613,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.html:1 templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" msgstr "" @@ -641,15 +629,15 @@ msgstr "" msgid "Editor" msgstr "" -#: 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:12 templates/web/default/admin/flagged.html:35 templates/web/default/admin/list_updates.html:9 templates/web/default/admin/reports.html:14 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 +#: 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:12 templates/web/default/admin/flagged.html:35 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/reports.html:15 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 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1240 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1237 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 msgid "Email already in abuse list" msgstr "" @@ -661,7 +649,7 @@ 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:39 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:41 templates/web/zurich/admin/report_edit.html:54 +#: templates/web/default/admin/body.html:80 templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html:39 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:31 templates/web/zurich/admin/report_edit.html:51 msgid "Email:" msgstr "" @@ -669,15 +657,15 @@ msgstr "" msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty office or other commercial" msgstr "" @@ -685,11 +673,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -729,7 +717,7 @@ msgstr "" msgid "Enter a new password:" msgstr "" -#: templates/web/bromley/report/display.html:150 templates/web/bromley/report/new/fill_in_details_form.html:189 templates/web/fixmystreet/auth/general.html:61 templates/web/fixmystreet/report/new/fill_in_details_form.html:211 templates/web/fixmystreet/report/update-form.html:122 templates/web/zurich/auth/general.html:63 +#: 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 msgid "Enter a password" msgstr "" @@ -822,7 +810,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 templates/web/default/admin/users.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" @@ -870,7 +858,7 @@ msgstr "" msgid "Give me an RSS feed" msgstr "" -#: templates/web/default/alert/index.html:34 templates/web/default/around/postcode_form.html:8 templates/web/fixmystreet/around/postcode_form.html:21 templates/web/seesomething/around/postcode_form.html:10 templates/web/zurich/admin/stats.html:26 +#: templates/web/default/alert/index.html:34 templates/web/default/around/postcode_form.html:8 templates/web/fixmystreet/around/postcode_form.html:21 templates/web/seesomething/around/postcode_form.html:10 msgid "Go" msgstr "" @@ -878,7 +866,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/default/admin/index.html:24 +#: templates/web/default/admin/index.html:24 templates/web/zurich/admin/index.html:11 msgid "Graph of problem creation by status over time" msgstr "" @@ -894,7 +882,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 templates/web/bromley/header.html:81 templates/web/default/footer.html:15 templates/web/emptyhomes/header.html:29 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:64 templates/web/reading/footer.html:10 templates/web/seesomething/footer.html:13 templates/web/stevenage/footer.html:47 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:8 +#: 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/footer.html:21 templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "" @@ -902,11 +890,11 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 templates/web/bromley/header.html:99 templates/web/fixmybarangay/header.html:66 templates/web/fixmystreet/header.html:50 templates/web/oxfordshire/header.html:47 templates/web/oxfordshire/header.html:81 templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11 +#: 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 "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:29 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:78 templates/web/zurich/admin/report_edit.html:82 templates/web/zurich/admin/stats.html:31 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:29 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:76 templates/web/zurich/admin/report_edit.html:80 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" @@ -934,7 +922,7 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:699 +#: perllib/FixMyStreet/App/Controller/Admin.pm:671 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -950,7 +938,7 @@ msgstr "" msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" msgstr "" -#: 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 +#: templates/web/default/admin/flagged.html:9 templates/web/default/admin/list_updates.html:5 templates/web/default/admin/reports.html:12 templates/web/zurich/admin/index-dm.html:20 templates/web/zurich/admin/index-sdm.html:18 templates/web/zurich/admin/list_updates.html:5 templates/web/zurich/admin/reports.html:12 msgid "ID" msgstr "" @@ -1001,7 +989,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:28 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:91 templates/web/zurich/report/banner.html:15 +#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:28 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:89 templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" @@ -1009,7 +997,7 @@ msgstr "" msgid "Incident Category" msgstr "" -#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:128 msgid "Include reporter personal details" msgstr "" @@ -1021,7 +1009,7 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:53 templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:71 msgid "Internal notes:" msgstr "" @@ -1029,7 +1017,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 msgid "Invalid end date" msgstr "" @@ -1037,7 +1025,7 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1001 msgid "Invalid start date" msgstr "" @@ -1049,7 +1037,7 @@ msgstr "" 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 "" -#: 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 +#: 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 msgid "Keep me signed in on this computer" msgstr "" @@ -1073,7 +1061,7 @@ msgstr "" msgid "List all reported problems" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:69 templates/web/default/report/new/fill_in_details_form.html:68 templates/web/fixmystreet/report/new/fill_in_details_form.html:75 templates/web/seesomething/report/new/fill_in_details_form.html:25 templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/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 "" @@ -1085,7 +1073,7 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23 templates/web/bromley/header.html:79 templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8 templates/web/fiksgatami/nn/footer.html:8 templates/web/fixmybarangay/footer.html:22 templates/web/fixmystreet/footer.html:50 templates/web/oxfordshire/footer.html:25 templates/web/oxfordshire/header.html:62 templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45 +#: 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 "" @@ -1113,10 +1101,6 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/zurich/admin/stats.html:33 -msgid "Moderated by division within one working day" -msgstr "" - #: templates/web/default/admin/stats.html:11 msgid "Month" msgstr "" @@ -1125,7 +1109,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:34 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:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/reports.html:14 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/report/new/fill_in_details_form.html:100 msgid "Name" msgstr "" @@ -1133,7 +1117,7 @@ msgstr "" msgid "Name (optional)" msgstr "" -#: templates/web/default/admin/report_edit.html:38 templates/web/default/admin/update_edit.html:26 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:53 templates/web/zurich/admin/stats.html:40 +#: templates/web/default/admin/report_edit.html:38 templates/web/default/admin/update_edit.html:26 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:30 templates/web/zurich/admin/report_edit.html:50 msgid "Name:" msgstr "" @@ -1157,7 +1141,7 @@ msgstr "" 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:266 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1239,7 +1223,7 @@ msgstr "" msgid "New state" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:46 msgid "New update:" msgstr "" @@ -1247,11 +1231,7 @@ msgstr "" msgid "New!" msgstr "" -#: templates/web/default/pagination.html:13 -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:21 templates/web/default/admin/report_edit.html:36 templates/web/default/admin/report_edit.html:49 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:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:21 templates/web/default/admin/report_edit.html:36 templates/web/default/admin/report_edit.html:49 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 msgid "No" msgstr "" @@ -1263,7 +1243,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:414 msgid "No council selected" msgstr "" @@ -1279,7 +1259,7 @@ msgstr "" msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:52 msgid "No further updates" msgstr "" @@ -1303,7 +1283,7 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:24 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:57 +#: templates/web/default/admin/report_edit.html:24 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit.html:54 msgid "None" msgstr "" @@ -1311,7 +1291,7 @@ msgstr "" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:10 msgid "Not for my subdivision" msgstr "" @@ -1391,7 +1371,7 @@ msgstr "" msgid "Older problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:71 templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:26 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:78 templates/web/zurich/admin/report_edit.html:80 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 +#: templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:26 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:76 templates/web/zurich/admin/report_edit.html:78 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 msgid "Open" msgstr "" @@ -1419,7 +1399,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:1042 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:343 perllib/FixMyStreet/DB/ResultSet/Problem.pm:356 +#: 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:591 perllib/FixMyStreet/DB/Result/Problem.pm:601 perllib/FixMyStreet/DB/Result/Problem.pm:611 perllib/FixMyStreet/DB/Result/Problem.pm:623 perllib/FixMyStreet/DB/ResultSet/Problem.pm:343 perllib/FixMyStreet/DB/ResultSet/Problem.pm:356 msgid "Other" msgstr "" @@ -1427,7 +1407,7 @@ msgstr "" msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." msgstr "" -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:11 msgid "Owner" msgstr "" @@ -1443,7 +1423,7 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/bromley/report/display.html:147 templates/web/bromley/report/new/fill_in_details_form.html:186 templates/web/fixmystreet/auth/general.html:59 templates/web/fixmystreet/report/new/fill_in_details_form.html:208 templates/web/fixmystreet/report/update-form.html:119 templates/web/zurich/auth/general.html:32 templates/web/zurich/auth/general.html:61 +#: 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 msgid "Password (optional)" msgstr "" @@ -1455,15 +1435,15 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:265 templates/web/default/admin/report_edit.html:40 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:57 templates/web/zurich/admin/stats.html:38 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:265 templates/web/default/admin/report_edit.html:40 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:33 templates/web/zurich/admin/report_edit.html:54 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:36 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/report/new/fill_in_details_form.html:68 msgid "Photo" msgstr "" -#: templates/web/default/questionnaire/index.html:99 templates/web/default/report/new/fill_in_details_form.html:102 templates/web/default/report/update-form.html:62 templates/web/fixmystreet/questionnaire/index.html:90 +#: 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 "" @@ -1475,7 +1455,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:27 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:78 templates/web/zurich/admin/report_edit.html:81 +#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:27 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:76 templates/web/zurich/admin/report_edit.html:79 msgid "Planned" msgstr "" @@ -1495,15 +1475,15 @@ msgstr "" msgid "Please check your email" msgstr "" -#: templates/web/default/auth/general.html:14 templates/web/default/auth/general.html:8 templates/web/fixmystreet/auth/general.html:15 templates/web/fixmystreet/auth/general.html:9 templates/web/seesomething/auth/general.html:15 templates/web/seesomething/auth/general.html:9 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:9 +#: templates/web/default/auth/general.html:14 templates/web/default/auth/general.html:8 templates/web/fixmystreet/auth/general.html:15 templates/web/fixmystreet/auth/general.html:9 templates/web/seesomething/auth/general.html:15 templates/web/seesomething/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:844 perllib/FixMyStreet/App/Controller/Report/New.pm:851 perllib/FixMyStreet/App/Controller/Report/New.pm:870 perllib/FixMyStreet/App/Controller/Report/New.pm:913 perllib/FixMyStreet/DB/Result/Problem.pm:420 templates/web/default/js/translation_strings.html:9 +#: 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:433 templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:439 msgid "Please choose a property type" msgstr "" @@ -1526,15 +1506,15 @@ msgid "" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -#: templates/web/oxfordshire/report/new/notes.html:6 -msgid "Please do not be abusive — abusing your council devalues the service for all users." +#: 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 "" -#: templates/web/default/report/new/notes.html:7 templates/web/fixmystreet/report/new/notes.html:7 -msgid "Please do not be abusive — abusing your council devalues the service for all users." +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 +msgid "Please do not give address or personal information in this section." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 templates/web/default/js/translation_strings.html:2 +#: perllib/FixMyStreet/DB/Result/Comment.pm:147 templates/web/default/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -1542,7 +1522,7 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:395 templates/web/default/js/translation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:408 templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" @@ -1554,11 +1534,11 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:398 templates/web/default/js/translation_strings.html:4 templates/web/seesomething/js/translation_strings.html:2 +#: perllib/FixMyStreet/DB/Result/Problem.pm:411 templates/web/default/js/translation_strings.html:4 templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:96 perllib/FixMyStreet/DB/Result/User.pm:112 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 templates/web/default/js/translation_strings.html:11 templates/web/default/js/translation_strings.html:15 templates/web/fixmystreet/auth/general.html:14 templates/web/fixmystreet/auth/general.html:9 templates/web/seesomething/auth/general.html:14 templates/web/seesomething/auth/general.html:9 templates/web/seesomething/js/translation_strings.html:9 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8 +#: perllib/FixMyStreet/App/Controller/Contact.pm:96 perllib/FixMyStreet/DB/Result/User.pm:112 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 templates/web/default/js/translation_strings.html:11 templates/web/default/js/translation_strings.html:15 templates/web/fixmystreet/auth/general.html:14 templates/web/fixmystreet/auth/general.html:9 templates/web/seesomething/auth/general.html:14 templates/web/seesomething/auth/general.html:9 templates/web/seesomething/js/translation_strings.html:9 msgid "Please enter your email" msgstr "" @@ -1570,11 +1550,11 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 templates/web/default/js/translation_strings.html:7 templates/web/seesomething/js/translation_strings.html:4 +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 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 "" -#: 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 +#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:144 perllib/FixMyStreet/DB/Result/Problem.pm:419 perllib/FixMyStreet/DB/Result/User.pm:108 templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1623,7 +1603,7 @@ msgstr "" msgid "Please fill in details of the problem." msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:28 templates/web/default/report/new/fill_in_details_form.html:27 templates/web/fixmystreet/report/new/fill_in_details_form.html:35 templates/web/zurich/report/new/fill_in_details_form.html:20 +#: 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 "" @@ -1643,7 +1623,7 @@ msgstr "" msgid "Please note that updates are not sent to the relevant department. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:23 templates/web/default/report/new/fill_in_details_form.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:26 templates/web/zurich/report/new/fill_in_details_form.html:11 +#: 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 "" @@ -1711,14 +1691,14 @@ msgstr "" msgid "Posted by %s at %s" msgstr "" -#: templates/web/default/pagination.html:7 -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:51 msgid "Private" msgstr "" +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:108 +msgid "Private information (not shown on site)" +msgstr "" + #: templates/web/default/maps/openlayers.html:85 msgid "Problem" msgstr "" @@ -1735,11 +1715,11 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/default/admin/index.html:28 templates/web/zurich/admin/index.html:9 +#: templates/web/default/admin/index.html:28 templates/web/zurich/admin/index.html:15 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:916 +#: perllib/FixMyStreet/App/Controller/Admin.pm:878 msgid "Problem marked as open." msgstr "" @@ -1791,7 +1771,11 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 +msgid "Property address:" +msgstr "" + +#: templates/web/default/report/new/category.html:8 msgid "Property type:" msgstr "" @@ -1815,15 +1799,19 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 templates/web/zurich/admin/report_edit.html:170 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:44 +msgid "Public information (shown on site)" +msgstr "" + +#: templates/web/zurich/admin/report_edit.html:160 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:69 templates/web/zurich/admin/stats.html:37 +#: templates/web/zurich/admin/report_edit.html:67 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Publish the response" msgstr "" @@ -1919,15 +1907,15 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:61 templates/web/default/admin/update_edit.html:51 templates/web/zurich/admin/update_edit.html:35 +#: templates/web/default/admin/report_edit.html:62 templates/web/default/admin/update_edit.html:51 templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/emptyhomes/header.html:10 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "" -#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 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 +#: 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 "" @@ -1959,7 +1947,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:606 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "" @@ -1967,23 +1955,23 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 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:629 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/DB/Result/Problem.pm:614 msgid "Reported by %s in the %s category by %s at %s" msgstr "" @@ -1991,23 +1979,23 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:602 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported in the %s category by %s at %s" msgstr "" -#: 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/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 +#: 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 "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 perllib/FixMyStreet/Cobrand/Zurich.pm:196 templates/web/seesomething/admin/stats.html:1 templates/web/zurich/header.html:60 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 perllib/FixMyStreet/Cobrand/Zurich.pm:137 templates/web/seesomething/admin/stats.html:1 templates/web/zurich/header.html:59 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:432 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" @@ -2039,11 +2027,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 perllib/FixMyStreet/App/Controller/Admin.pm:1342 templates/web/default/admin/report_edit.html:57 templates/web/zurich/admin/report_edit.html:65 +#: templates/web/default/admin/report_edit.html:58 templates/web/zurich/admin/report_edit.html:63 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 templates/web/default/admin/report_edit.html:58 templates/web/zurich/admin/report_edit.html:66 +#: templates/web/default/admin/report_edit.html:59 templates/web/zurich/admin/report_edit.html:64 msgid "Rotate Right" msgstr "" @@ -2059,7 +2047,7 @@ msgstr "" msgid "Search Users" msgstr "" -#: templates/web/zurich/header.html:77 +#: templates/web/zurich/header.html:73 msgid "Search reports" msgstr "" @@ -2079,7 +2067,7 @@ msgstr "" msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:711 msgid "Sent to %s %s later" msgstr "" @@ -2087,7 +2075,7 @@ msgstr "" msgid "Sent:" msgstr "" -#: templates/web/default/admin/report_edit.html:45 templates/web/zurich/admin/stats.html:44 +#: templates/web/default/admin/report_edit.html:45 msgid "Service:" msgstr "" @@ -2124,7 +2112,7 @@ msgstr "" msgid "Show pins" msgstr "" -#: templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 templates/web/fixmybarangay/header.html:70 templates/web/fixmystreet/auth/general.html:3 templates/web/fixmystreet/auth/general.html:42 templates/web/fixmystreet/auth/general.html:62 templates/web/fixmystreet/header.html:54 templates/web/oxfordshire/header.html:85 templates/web/seesomething/auth/general.html:3 templates/web/seesomething/auth/general.html:39 templates/web/stevenage/header.html:101 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 +#: templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 templates/web/fixmybarangay/header.html:70 templates/web/fixmystreet/auth/general.html:3 templates/web/fixmystreet/auth/general.html:42 templates/web/fixmystreet/auth/general.html:62 templates/web/fixmystreet/header.html: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 msgid "Sign in" msgstr "" @@ -2132,15 +2120,15 @@ msgstr "" msgid "Sign in by email" msgstr "" -#: templates/web/default/auth/general.html:1 templates/web/fixmystreet/auth/general.html:1 templates/web/seesomething/auth/general.html:1 templates/web/zurich/auth/general.html:1 +#: templates/web/default/auth/general.html:1 templates/web/fixmystreet/auth/general.html:1 templates/web/seesomething/auth/general.html:1 msgid "Sign in or create an account" msgstr "" -#: templates/web/bromley/auth/sign_out.html:1 templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:30 templates/web/emptyhomes/header.html:42 templates/web/fiksgatami/header.html:22 templates/web/fiksgatami/nn/header.html:22 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:33 templates/web/seesomething/auth/sign_out.html:1 templates/web/zurich/auth/sign_out.html:1 +#: templates/web/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 "" -#: templates/web/default/header.html:29 templates/web/emptyhomes/header.html:41 templates/web/fiksgatami/header.html:21 templates/web/fiksgatami/nn/header.html:21 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:32 +#: templates/web/default/header.html:29 templates/web/emptyhomes/header.html:45 templates/web/fiksgatami/header.html:21 templates/web/fiksgatami/nn/header.html:21 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:32 msgid "Signed in as %s" msgstr "" @@ -2188,19 +2176,19 @@ msgstr "" msgid "Start month:" msgstr "" -#: templates/web/bromley/report/display.html:78 templates/web/default/admin/flagged.html:18 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/reports.html:20 templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/bromley/report/display.html:78 templates/web/default/admin/flagged.html:18 templates/web/default/admin/list_updates.html:6 templates/web/default/admin/reports.html:21 templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "" -#: templates/web/default/admin/report_edit.html:25 templates/web/default/admin/update_edit.html:21 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:51 templates/web/zurich/admin/report_edit.html:76 templates/web/zurich/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:25 templates/web/default/admin/update_edit.html:21 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:41 templates/web/zurich/admin/report_edit.html:74 templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 perllib/FixMyStreet/Cobrand/Zurich.pm:211 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:1097 templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "" -#: templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-sdm.html:23 templates/web/zurich/admin/reports.html:17 msgid "Status" msgstr "" @@ -2220,15 +2208,15 @@ msgstr "" 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/zurich/admin/report_edit.html:31 +#: 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:31 msgid "Subject:" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:140 templates/web/bromley/report/new/fill_in_details_form.html:190 templates/web/bromley/report/new/fill_in_details_form.html:204 templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 templates/web/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 +#: 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 "" -#: templates/web/default/admin/report_edit.html:64 templates/web/default/admin/update_edit.html:54 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:61 templates/web/zurich/admin/report_edit.html:180 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/default/admin/report_edit.html:65 templates/web/default/admin/update_edit.html:54 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:51 templates/web/zurich/admin/report_edit.html:172 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2236,7 +2224,7 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 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:78 templates/web/zurich/admin/report_edit.html:79 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 +#: 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:76 templates/web/zurich/admin/report_edit.html:77 templates/web/zurich/admin/reports.html:15 templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "" @@ -2252,7 +2240,7 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 perllib/FixMyStreet/Cobrand/Zurich.pm:195 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:1090 perllib/FixMyStreet/Cobrand/Zurich.pm:136 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/header.html:56 msgid "Summary" msgstr "" @@ -2260,7 +2248,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1094 msgid "Survey" msgstr "" @@ -2268,7 +2256,7 @@ msgstr "" msgid "Survey Results" msgstr "" -#: templates/web/default/admin/list_updates.html:15 templates/web/zurich/admin/list_updates.html:8 +#: templates/web/default/admin/list_updates.html:14 templates/web/zurich/admin/list_updates.html:7 msgid "Text" msgstr "" @@ -2324,7 +2312,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:123 +#: perllib/FixMyStreet/App/Controller/Location.pm:121 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2332,7 +2320,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:670 +#: perllib/FixMyStreet/App/Controller/Admin.pm:642 msgid "That problem will now be resent." msgstr "" @@ -2463,7 +2451,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:749 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: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 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 "" @@ -2495,7 +2483,7 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:890 perllib/FixMyStreet/Cobrand/UK.pm:58 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "" @@ -2531,7 +2519,7 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:65 templates/web/zurich/report/_main.html:14 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -2555,11 +2543,11 @@ msgstr "" msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" -#: templates/web/default/admin/flagged.html:10 templates/web/default/admin/reports.html:12 +#: templates/web/default/admin/flagged.html:10 templates/web/default/admin/reports.html:13 msgid "Title" msgstr "" @@ -2591,7 +2579,7 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:42 templates/web/zurich/admin/report_edit.html:55 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:32 templates/web/zurich/admin/report_edit.html:52 templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -2659,19 +2647,19 @@ msgstr "" msgid "Update:" msgstr "" -#: templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:24 templates/web/zurich/admin/index-sdm.html:22 templates/web/zurich/admin/reports.html:16 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:762 perllib/FixMyStreet/App/Controller/Admin.pm:906 perllib/FixMyStreet/App/Controller/Admin.pm:959 perllib/FixMyStreet/App/Controller/Admin.pm:998 perllib/FixMyStreet/Cobrand/Zurich.pm:422 perllib/FixMyStreet/Cobrand/Zurich.pm:486 +#: perllib/FixMyStreet/App/Controller/Admin.pm:734 perllib/FixMyStreet/App/Controller/Admin.pm:868 perllib/FixMyStreet/App/Controller/Admin.pm:919 perllib/FixMyStreet/App/Controller/Admin.pm:958 perllib/FixMyStreet/Cobrand/Zurich.pm:326 perllib/FixMyStreet/Cobrand/Zurich.pm:381 msgid "Updated!" msgstr "" -#: templates/web/default/admin/list_updates.html:2 templates/web/default/report/update.html:3 templates/web/fixmystreet/report/update.html:3 templates/web/zurich/admin/list_updates.html:2 templates/web/zurich/report/updates.html:2 +#: templates/web/default/admin/list_updates.html:1 templates/web/default/report/update.html:3 templates/web/fixmystreet/report/update.html:3 templates/web/zurich/admin/list_updates.html:1 templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:150 +#: perllib/FixMyStreet/DB/Result/Comment.pm:152 msgid "Updates are limited to 2000 characters in length. Please shorten your update" msgstr "" @@ -2683,15 +2671,15 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1296 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1256 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1268 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1228 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 perllib/FixMyStreet/Cobrand/Zurich.pm:210 templates/web/default/admin/flagged.html:30 templates/web/zurich/header.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1095 perllib/FixMyStreet/Cobrand/Zurich.pm:151 templates/web/default/admin/flagged.html:30 templates/web/zurich/header.html:68 msgid "Users" msgstr "" @@ -2699,7 +2687,7 @@ msgstr "" 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:21 templates/web/zurich/admin/report_edit.html:19 templates/web/zurich/admin/update_edit.html:10 +#: templates/web/default/admin/report_edit.html:12 templates/web/default/admin/update_edit.html:12 templates/web/zurich/admin/report_edit-sdm.html:13 templates/web/zurich/admin/report_edit.html:19 templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "" @@ -2771,11 +2759,11 @@ msgstr "" msgid "When edited" msgstr "" -#: templates/web/default/admin/flagged.html:19 templates/web/default/admin/reports.html:21 +#: templates/web/default/admin/flagged.html:19 templates/web/default/admin/reports.html:22 msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 msgid "Whole block of empty flats" msgstr "" @@ -2803,7 +2791,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:21 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:49 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:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:21 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:49 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 msgid "Yes" msgstr "" @@ -2835,7 +2823,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/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/fixmystreet/questionnaire/index.html:87 templates/web/fixmystreet/report/new/fill_in_details_form.html:99 templates/web/seesomething/report/new/fill_in_details_form.html:59 templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/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 "" @@ -2847,7 +2835,7 @@ msgstr "" msgid "You have been signed out" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:25 templates/web/default/report/new/fill_in_details_form.html:7 templates/web/fixmystreet/report/new/fill_in_details_form.html:28 templates/web/zurich/report/new/fill_in_details_form.html:13 +#: 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 "" @@ -2875,7 +2863,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:756 perllib/FixMyStreet/App/Controller/Report/Update.pm:140 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -2899,7 +2887,7 @@ msgstr "" msgid "Your email (optional)" msgstr "" -#: templates/web/bromley/report/display.html:132 templates/web/fixmystreet/auth/general.html:26 templates/web/fixmystreet/report/update-form.html:80 templates/web/seesomething/auth/general.html:26 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:56 +#: 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 msgid "Your email address" msgstr "" @@ -2907,7 +2895,7 @@ msgstr "" msgid "Your email address:" msgstr "" -#: templates/web/default/alert/_list.html:92 templates/web/default/report/new/fill_in_details_form.html:124 templates/web/default/report/update-form.html:81 templates/web/fixmybarangay/alert/_list.html:37 +#: 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 "" @@ -2923,15 +2911,15 @@ 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: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/report/new/fill_in_details_form.html:104 msgid "Your name" msgstr "" -#: templates/web/default/auth/general.html:59 templates/web/default/contact/index.html:68 templates/web/default/report/new/fill_in_details_form.html:203 templates/web/default/report/update-form.html:151 +#: templates/web/default/auth/general.html:59 templates/web/default/contact/index.html:68 templates/web/default/report/new/fill_in_details_form.html:203 templates/web/default/report/update-form.html:151 templates/web/emptyhomes/report/new/fill_in_details_form.html:124 msgid "Your name:" msgstr "" -#: templates/web/bromley/report/display.html:162 templates/web/bromley/report/new/fill_in_details_form.html:203 templates/web/fixmystreet/auth/general.html:41 templates/web/fixmystreet/report/new/fill_in_details_form.html:166 templates/web/fixmystreet/report/update-form.html:94 templates/web/seesomething/auth/general.html:30 templates/web/zurich/auth/general.html:34 +#: templates/web/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 msgid "Your password" msgstr "" @@ -2951,7 +2939,7 @@ msgstr "" msgid "Your report has been created and will shortly be sent." msgstr "" -#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19 templates/web/bromley/header.html:75 templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6 templates/web/fiksgatami/nn/footer.html:6 templates/web/fixmystreet/footer.html:46 templates/web/oxfordshire/footer.html:21 templates/web/oxfordshire/header.html:58 templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41 +#: 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 "" @@ -2971,15 +2959,15 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:37 templates/web/zurich/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit.html:48 msgid "didn't use map" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 +#: perllib/FixMyStreet/DB/Result/Comment.pm:197 msgid "duplicate report" msgstr "" @@ -2991,11 +2979,7 @@ msgstr "" msgid "from %d different users" msgstr "" -#: templates/web/fixmystreet/report/_item.html:12 templates/web/zurich/report/_item.html:16 -msgid "last updated %s" -msgstr "" - -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:268 msgid "less than a minute" msgstr "" @@ -3015,7 +2999,7 @@ msgstr "" msgid "no further action" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 +#: perllib/FixMyStreet/DB/Result/Comment.pm:195 msgid "not the council's responsibility" msgstr "" @@ -3027,7 +3011,7 @@ 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:24 templates/web/zurich/admin/report_edit-sdm.html:26 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit-sdm.html:35 templates/web/zurich/admin/report_edit.html:24 templates/web/zurich/admin/report_edit.html:26 templates/web/zurich/admin/report_edit.html:35 templates/web/zurich/admin/report_edit.html:37 templates/web/zurich/admin/report_edit.html:47 templates/web/zurich/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/zurich/admin/report_edit-sdm.html:16 templates/web/zurich/admin/report_edit-sdm.html:18 templates/web/zurich/admin/report_edit-sdm.html:23 templates/web/zurich/admin/report_edit-sdm.html:25 templates/web/zurich/admin/report_edit.html:24 templates/web/zurich/admin/report_edit.html:26 templates/web/zurich/admin/report_edit.html:35 templates/web/zurich/admin/report_edit.html:37 templates/web/zurich/admin/report_edit.html:44 templates/web/zurich/admin/report_edit.html:46 msgid "originally entered: “%s”" msgstr "" @@ -3039,11 +3023,11 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 templates/web/bromley/header.html:65 templates/web/fixmybarangay/header.html:67 templates/web/fixmystreet/header.html:51 templates/web/oxfordshire/header.html:48 templates/web/oxfordshire/header.html:82 templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12 +#: 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 "" -#: 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/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:9 +#: 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 "" @@ -3055,11 +3039,11 @@ msgstr "" msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:240 msgid "today" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:37 templates/web/zurich/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit.html:48 msgid "used map" msgstr "" @@ -3082,14 +3066,14 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:287 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:289 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -3110,7 +3094,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:283 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -3138,7 +3122,7 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:285 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 1147e490b..f9b98d01a 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-02-20 20:23+0000\n" +"POT-Creation-Date: 2013-02-13 11:17+0000\n" "PO-Revision-Date: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" @@ -20,7 +20,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/Result/Problem.pm:649 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:355 msgid " and " msgstr "" @@ -74,16 +74,12 @@ msgstr "" msgid "%d supporters" msgstr "" -#: templates/web/default/pagination.html:10 -msgid "%d to %d of %d" -msgstr "" - #: templates/web/default/reports/body.html:0 #: templates/web/default/reports/body.html:20 msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:685 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "%s ref: %s" msgstr "" @@ -91,7 +87,7 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 #, fuzzy msgid "%s, reported at %s" msgstr "Adroddwyd am %s gan %s am %s" @@ -141,15 +137,15 @@ msgstr "(fel arall, gellir addasu'r porthiant RSS yn bersonol, o fewn" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:22 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:20 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/fixmystreet/report/_item.html:18 +#: templates/web/zurich/report/_item.html:17 msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" @@ -159,18 +155,19 @@ msgid " " msgstr " " #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:16 +#: templates/web/fixmystreet/report/_item.html:14 #, fuzzy msgid "(not sent to council)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" #: 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 "(dewisol)" #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:15 +#: templates/web/fixmystreet/report/_item.html:13 #, fuzzy msgid "(sent to both)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -184,15 +181,15 @@ msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" msgid "(we never show your email)" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 -#: perllib/FixMyStreet/DB/Result/Problem.pm:418 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/DB/Result/Problem.pm:431 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 -#: perllib/FixMyStreet/DB/Result/Problem.pm:424 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:437 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -379,7 +376,6 @@ msgid "<strong>No</strong> Let me confirm my update by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" #: templates/web/fixmystreet/auth/general.html:50 -#: templates/web/zurich/auth/general.html:49 #, fuzzy msgid "<strong>No</strong> let me sign in by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -411,7 +407,7 @@ msgstr "Adrodd am eiddo gwag a gweld y rhain" #: templates/web/default/static/about.html:1 #: templates/web/default/static/about.html:3 -#: templates/web/emptyhomes/header.html:30 +#: templates/web/emptyhomes/header.html:34 #: templates/web/emptyhomes/static/about.html:1 #: templates/web/emptyhomes/static/about.html:3 msgid "About us" @@ -437,7 +433,7 @@ msgstr "" msgid "Add new category" msgstr "" -#: templates/web/default/admin/users.html:36 +#: templates/web/default/admin/users.html:35 msgid "Add user" msgstr "" @@ -465,7 +461,6 @@ msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" #: 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 #, fuzzy msgid "All Reports" @@ -473,16 +468,15 @@ msgstr "Adroddiadau" #: 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:28 +#: 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:60 +#: 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 #, fuzzy @@ -490,7 +484,6 @@ msgid "All reports" msgstr "Adroddiadau" #: templates/web/default/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 #, fuzzy msgid "All reports between %s and %s" msgstr "Adroddwyd am %s gan %s am %s" @@ -530,24 +523,16 @@ msgstr "" #: 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 "" -#: templates/web/emptyhomes/report/new/councils_text_all.html:2 -#: templates/web/emptyhomes/report/new/councils_text_all.html:4 -#, 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." -msgstr "" -"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>" -"%s</strong>.\n" -"Ar y safle, byddwn yn dangos pwnc a manylion yr eiddo gwag,\n" -"ynghyd â'ch enw os ydych yn rhoi caniatâd i ni." - #: templates/web/default/questionnaire/index.html:60 #: templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this empty property as returned to use." @@ -556,8 +541,8 @@ msgstr "" "ddefnyddio." #: templates/web/default/admin/flagged.html:15 -#: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/reports.html:17 +#: templates/web/default/admin/list_updates.html:10 +#: templates/web/default/admin/reports.html:18 msgid "Anonymous" msgstr "Di-enw" @@ -589,21 +574,19 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:111 -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/report_edit.html:109 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:120 +#: templates/web/zurich/admin/report_edit.html:118 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:152 -#: templates/web/zurich/admin/report_edit.html:99 +#: templates/web/zurich/admin/report_edit.html:150 +#: templates/web/zurich/admin/report_edit.html:97 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:97 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -619,8 +602,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -639,14 +622,14 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:203 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/header.html:64 +#: templates/web/zurich/header.html:63 msgid "Bodies" msgstr "" -#: templates/web/default/admin/reports.html:15 +#: templates/web/default/admin/reports.html:16 #: templates/web/default/admin/users.html:14 msgid "Body" msgstr "" @@ -674,20 +657,20 @@ msgstr "" "<small>Os na allwch weld y map, <a href='%s' rel='nofollow'>ewch heibio\n" " i'r cam hwn</a>.</small>" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 #: 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/flagged.html:14 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/reports.html:17 +#: 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:49 +#: templates/web/zurich/admin/index-dm.html:22 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/admin/reports.html:14 #: templates/web/zurich/report/new/fill_in_details_form.html:50 #, fuzzy msgid "Category" @@ -701,9 +684,10 @@ msgstr "" #: templates/web/default/admin/body_edit.html:23 #: templates/web/default/admin/report_edit.html:33 #: 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:39 -#: templates/web/zurich/admin/report_edit.html:110 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit.html:108 msgid "Category:" msgstr "Categori:" @@ -724,7 +708,6 @@ msgstr "" msgid "Click map to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:28 #: templates/web/default/dashboard/index.html:142 @@ -733,14 +716,13 @@ msgstr "Sut i roi gwybod am eiddo gwag" #: 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:85 #: templates/web/zurich/admin/report_edit.html:87 -#: templates/web/zurich/admin/report_edit.html:89 -#: templates/web/zurich/admin/stats.html:30 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:778 +#: perllib/FixMyStreet/DB/Result/Problem.pm:791 #, fuzzy msgid "Closed by council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -760,14 +742,14 @@ 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/zurich/admin/report_edit-sdm.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:22 #: templates/web/zurich/admin/report_edit.html:43 msgid "Co-ordinates:" msgstr "" #: templates/web/default/admin/flagged.html:16 -#: templates/web/default/admin/list_updates.html:14 -#: templates/web/default/admin/reports.html:18 +#: templates/web/default/admin/list_updates.html:13 +#: templates/web/default/admin/reports.html:19 msgid "Cobrand" msgstr "" @@ -825,7 +807,6 @@ msgstr "Cadarnhau" #: 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:39 #, fuzzy msgid "Confirmed" msgstr "Cadarnhau" @@ -867,8 +848,8 @@ msgstr "Cysylltwch â Ni" msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1264 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1252 msgid "Could not find user" msgstr "" @@ -877,7 +858,7 @@ msgid "Could not look up location" msgstr "" #: templates/web/default/admin/flagged.html:13 -#: templates/web/default/admin/list_updates.html:13 +#: templates/web/default/admin/list_updates.html:12 #, fuzzy msgid "Council" msgstr "cyngor" @@ -895,8 +876,6 @@ msgstr "cyngor" #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:44 -#: templates/web/zurich/admin/stats.html:49 #, fuzzy msgid "Count" msgstr "Cysylltu" @@ -913,16 +892,16 @@ msgid "Create category" msgstr "Categori:" #: templates/web/default/admin/flagged.html:17 -#: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/reports.html:19 -#: templates/web/zurich/admin/list_updates.html:7 +#: templates/web/default/admin/list_updates.html:9 +#: templates/web/default/admin/reports.html:20 +#: templates/web/zurich/admin/list_updates.html:6 msgid "Created" msgstr "" #: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit-sdm.html:34 +#: templates/web/zurich/admin/report_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -936,10 +915,6 @@ msgstr "" msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:34 -msgid "Dealt with by subdivision within 5 working days" -msgstr "" - #: templates/web/default/admin/body.html:38 #: templates/web/default/admin/body.html:88 #: templates/web/default/admin/body_edit.html:37 @@ -947,9 +922,9 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/zurich/admin/index-dm.html:22 -#: templates/web/zurich/admin/index-sdm.html:20 -#: templates/web/zurich/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:21 +#: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/reports.html:13 msgid "Description" msgstr "" @@ -964,7 +939,8 @@ msgstr "Manylion:" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 -#: templates/web/zurich/admin/report_edit-sdm.html:22 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:14 #: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/report_edit.html:32 msgid "Details:" @@ -1005,10 +981,10 @@ msgstr "Ddim yn gwybod" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 +#: templates/web/default/admin/list_updates.html:35 #: templates/web/default/admin/problem_row.html:31 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:38 +#: templates/web/zurich/admin/problem_row.html:35 msgid "Edit" msgstr "" @@ -1019,7 +995,6 @@ 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 #, fuzzy @@ -1047,25 +1022,23 @@ msgstr "" #: templates/web/default/admin/body_edit.html:83 #: templates/web/default/admin/flagged.html:12 #: templates/web/default/admin/flagged.html:35 -#: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/reports.html:14 +#: templates/web/default/admin/list_updates.html:8 +#: templates/web/default/admin/reports.html:15 #: 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 #, fuzzy msgid "Email" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1240 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1237 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 msgid "Email already in abuse list" msgstr "" @@ -1085,8 +1058,8 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" #: 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:41 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:31 +#: templates/web/zurich/admin/report_edit.html:51 msgid "Email:" msgstr "E-bost:" @@ -1095,15 +1068,15 @@ msgstr "E-bost:" msgid "Email: %s" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Empty flat or maisonette" msgstr "Fflat neu fflat deulawr gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Empty house or bungalow" msgstr "Tŷ neu fyngalo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty office or other commercial" msgstr "Swyddfa wag neu fan masnachol gwag arall" @@ -1111,11 +1084,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:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty pub or bar" msgstr "Tafarn neu far gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." @@ -1174,7 +1147,6 @@ msgstr "Ychwanegwch neges" #: 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 #, fuzzy msgid "Enter a password" msgstr "Ychwanegwch neges" @@ -1327,7 +1299,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" @@ -1402,7 +1374,6 @@ msgstr "Rhowch borthiant RSS i mi" #: templates/web/default/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 #: templates/web/seesomething/around/postcode_form.html:10 -#: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "Ewch" @@ -1412,6 +1383,7 @@ msgid "Going to send questionnaire?" msgstr "Anfon yr holiadur" #: templates/web/default/admin/index.html:24 +#: templates/web/zurich/admin/index.html:11 msgid "Graph of empty property creation by status over time" msgstr "" @@ -1436,13 +1408,13 @@ msgstr "" #: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 #: templates/web/bromley/header.html:81 templates/web/default/footer.html:15 -#: templates/web/emptyhomes/header.html:29 +#: 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:64 +#: 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/footer.html:21 @@ -1460,8 +1432,8 @@ msgstr "" #: 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/oxfordshire/header.html:81 #: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" @@ -1471,9 +1443,8 @@ msgstr "" #: 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:78 -#: templates/web/zurich/admin/report_edit.html:82 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:80 #: templates/web/zurich/admin/update_edit.html:18 #, fuzzy msgid "Hidden" @@ -1503,7 +1474,7 @@ msgstr "Sut i roi gwybod am eiddo gwag" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:699 +#: perllib/FixMyStreet/App/Controller/Admin.pm:671 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1530,12 +1501,12 @@ msgstr "" "URL o neges e-bost, gwnewch yn siwr eich bod wedi'i gopïo'n union.\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 +#: templates/web/default/admin/list_updates.html:5 +#: templates/web/default/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:20 +#: templates/web/zurich/admin/index-sdm.html:18 +#: templates/web/zurich/admin/list_updates.html:5 +#: templates/web/zurich/admin/reports.html:12 msgid "ID" msgstr "" @@ -1625,13 +1596,12 @@ msgid "" "present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:28 #: 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:91 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" @@ -1641,7 +1611,7 @@ msgstr "" msgid "Incident Category" msgstr "Categori:" -#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:128 #, fuzzy msgid "Include reporter personal details" msgstr "Cofnodwch fanylion" @@ -1655,8 +1625,8 @@ msgstr "Cynnwys hen adroddiadau" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:53 -#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:71 msgid "Internal notes:" msgstr "" @@ -1664,7 +1634,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 #, fuzzy msgid "Invalid end date" msgstr "Rhowch ddiweddariad" @@ -1673,7 +1643,7 @@ msgstr "Rhowch ddiweddariad" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1001 msgid "Invalid start date" msgstr "" @@ -1724,7 +1694,6 @@ msgstr "" #: 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 "" @@ -1757,6 +1726,7 @@ msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" #: 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 @@ -1795,7 +1765,7 @@ msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" #: templates/web/fixmybarangay/footer.html:22 #: templates/web/fixmystreet/footer.html:50 #: templates/web/oxfordshire/footer.html:25 -#: templates/web/oxfordshire/header.html:62 +#: templates/web/oxfordshire/header.html:71 #: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45 msgid "Get local reports" msgstr "Gweld adroddiadau lleol" @@ -1828,10 +1798,6 @@ msgstr "Neges:" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/zurich/admin/stats.html:33 -msgid "Moderated by division within one working day" -msgstr "" - #: templates/web/default/admin/stats.html:11 #, fuzzy msgid "Month" @@ -1845,8 +1811,8 @@ msgstr "Mwy o eiddo gwag cyfagos" #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 -#: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/reports.html:13 +#: templates/web/default/admin/list_updates.html:7 +#: templates/web/default/admin/reports.html:14 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 @@ -1858,7 +1824,6 @@ msgstr "Mwy o eiddo gwag cyfagos" #: 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 "Enw" @@ -1871,9 +1836,8 @@ msgstr "(dewisol)" #: templates/web/default/admin/report_edit.html:38 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:53 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/report_edit-sdm.html:30 +#: templates/web/zurich/admin/report_edit.html:50 msgid "Name:" msgstr "Enw:" @@ -1907,7 +1871,7 @@ msgid "" "Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -2010,7 +1974,7 @@ msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com" msgid "New state" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:46 #, fuzzy msgid "New update:" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -2021,17 +1985,13 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "New!" msgstr "Newydd!" -#: templates/web/default/pagination.html:13 -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:30 #: 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:21 #: templates/web/default/admin/report_edit.html:36 #: templates/web/default/admin/report_edit.html:49 @@ -2053,7 +2013,7 @@ msgstr "" msgid "No council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:414 msgid "No council selected" msgstr "Ni ddewiswyd cyngor" @@ -2070,7 +2030,7 @@ msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:52 #, fuzzy msgid "No further updates" msgstr "Adroddiadau" @@ -2098,8 +2058,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:54 #, fuzzy msgid "None" msgstr "Nac ydw" @@ -2113,7 +2073,7 @@ msgstr "Nac ydw" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:10 msgid "Not for my subdivision" msgstr "" @@ -2218,7 +2178,6 @@ msgstr "Wedi'u hadfer i'w defnyddio ers amser" msgid "Older empty property reports" msgstr "Adroddiadau hŷn o eiddo gwag" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:71 #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 @@ -2227,8 +2186,8 @@ msgstr "Adroddiadau hŷn o eiddo gwag" #: 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:76 #: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:80 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2266,13 +2225,13 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1042 -#: 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/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:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:343 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:356 msgid "Other" @@ -2284,7 +2243,7 @@ msgid "" "\">available on GitHub</a>." msgstr "" -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:11 #, fuzzy msgid "Owner" msgstr "Arall" @@ -2309,8 +2268,6 @@ msgstr "" #: templates/web/fixmystreet/auth/general.html:59 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:208 #: templates/web/fixmystreet/report/update-form.html:119 -#: templates/web/zurich/auth/general.html:32 -#: templates/web/zurich/auth/general.html:61 #, fuzzy msgid "Password (optional)" msgstr "(dewisol)" @@ -2332,9 +2289,9 @@ msgstr "(dewisol)" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:265 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:54 msgid "Phone:" msgstr "Rhif ffôn:" @@ -2343,7 +2300,6 @@ 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/stats.html:36 #: templates/web/zurich/report/new/fill_in_details_form.html:68 #, fuzzy msgid "Photo" @@ -2352,6 +2308,7 @@ msgstr "Ffotograff:" #: 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 "Ffotograff:" @@ -2371,8 +2328,8 @@ msgstr "" #: 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:78 -#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:79 msgid "Planned" msgstr "" @@ -2405,22 +2362,20 @@ msgstr "Rhowch eich cyfeiriad e-bost" #: 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 #, fuzzy msgid "Please check your email address is correct" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:844 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:851 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:870 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:913 -#: perllib/FixMyStreet/DB/Result/Problem.pm:420 +#: 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:433 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Dewiswch gategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:439 msgid "Please choose a property type" msgstr "Dewiswch fath o eiddo" @@ -2455,20 +2410,19 @@ msgstr "" "I roi gwybod am eiddo gwag <a href=\"/\">ewch i'r dudalen flaen</a> a " "dilynwch y cyfarwyddiadau." -#: templates/web/oxfordshire/report/new/notes.html:6 -msgid "" -"Please do not be abusive — abusing your council devalues the service " -"for all users." -msgstr "" - #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:7 +#: templates/web/oxfordshire/report/new/notes.html:6 msgid "" "Please do not be abusive — abusing your council devalues the " "service for all users." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 +msgid "Please do not give address or personal information in this section." +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:147 #: templates/web/default/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Ychwanegwch neges" @@ -2480,7 +2434,7 @@ msgid "Please enter a password" msgstr "Ychwanegwch neges" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:395 +#: perllib/FixMyStreet/DB/Result/Problem.pm:408 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" @@ -2498,7 +2452,7 @@ msgstr "Cofnodwch gyfeiriad e-bost dilys" msgid "Please enter a valid email address" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: perllib/FixMyStreet/DB/Result/Problem.pm:411 #: templates/web/default/js/translation_strings.html:4 #: templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" @@ -2515,8 +2469,6 @@ msgstr "Cofnodwch fanylion" #: templates/web/seesomething/auth/general.html:14 #: templates/web/seesomething/auth/general.html:9 #: templates/web/seesomething/js/translation_strings.html:9 -#: templates/web/zurich/auth/general.html:3 -#: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Cofnodwch eich cyfeiriad e-bost" @@ -2533,7 +2485,7 @@ msgstr "Cofnodwch eich cyfeiriad e-bost" msgid "Please enter your first name" msgstr "Cofnodwch eich enw" -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 #: templates/web/default/js/translation_strings.html:7 #: templates/web/seesomething/js/translation_strings.html:4 #, fuzzy @@ -2545,8 +2497,8 @@ msgstr "" "ddangos ar y safle, cliciwch i ddileu'r tic o'r bocs" #: 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/Comment.pm:144 +#: perllib/FixMyStreet/DB/Result/Problem.pm:419 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2628,6 +2580,7 @@ msgstr "Llenwch fanylion yr eiddo gwag isod." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 #: templates/web/zurich/report/new/fill_in_details_form.html:20 #, fuzzy @@ -2662,6 +2615,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "" @@ -2756,16 +2710,16 @@ msgstr "Cofnodwyd gan %s am %s" msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" -#: templates/web/default/pagination.html:7 -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:51 msgid "Private" msgstr "" +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:108 +msgid "Private information (not shown on site)" +msgstr "" + #: templates/web/default/maps/openlayers.html:85 msgid "Empty property" msgstr "Eiddo gwag" @@ -2786,12 +2740,12 @@ msgid "Empty property %s sent to council %s" msgstr "Eiddo gwag yn %s" #: templates/web/default/admin/index.html:28 -#: templates/web/zurich/admin/index.html:9 +#: templates/web/zurich/admin/index.html:15 #, fuzzy msgid "Empty property breakdown by state" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:916 +#: perllib/FixMyStreet/App/Controller/Admin.pm:878 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" @@ -2865,7 +2819,12 @@ msgstr "" "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael " "eu hadfer i'w defnyddio" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 +#, fuzzy +msgid "Property address:" +msgstr "Math o eiddo:" + +#: templates/web/default/report/new/category.html:8 msgid "Property type:" msgstr "Math o eiddo:" @@ -2902,17 +2861,19 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:44 +msgid "Public information (shown on site)" +msgstr "" + +#: templates/web/zurich/admin/report_edit.html:160 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:69 -#: templates/web/zurich/admin/stats.html:37 +#: templates/web/zurich/admin/report_edit.html:67 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Publish the response" msgstr "" @@ -3061,18 +3022,18 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:61 +#: templates/web/default/admin/report_edit.html:62 #: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/emptyhomes/header.html:10 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "Adrodd am Eiddo Gwag" #: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 -#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 +#: 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 @@ -3125,7 +3086,7 @@ msgstr "Adroddiadau" msgid "Reported %s, to %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:606 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -3137,25 +3098,25 @@ msgstr "Adroddwyd yn ddi-enw am %s" msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/DB/Result/Problem.pm:614 msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" @@ -3164,11 +3125,11 @@ msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:602 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" @@ -3177,6 +3138,7 @@ msgstr "Adroddwyd yn y categori %s gan %s am %s" #: 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 @@ -3187,14 +3149,14 @@ 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:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 #: templates/web/seesomething/admin/stats.html:1 -#: templates/web/zurich/header.html:60 +#: templates/web/zurich/header.html:59 msgid "Reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:432 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "" "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" @@ -3231,16 +3193,13 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1342 -#: templates/web/default/admin/report_edit.html:57 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/default/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:63 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 -#: templates/web/default/admin/report_edit.html:58 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/default/admin/report_edit.html:59 +#: templates/web/zurich/admin/report_edit.html:64 msgid "Rotate Right" msgstr "" @@ -3260,7 +3219,7 @@ msgstr "Adroddiadau cryno" msgid "Search Users" msgstr "Adroddiadau cryno" -#: templates/web/zurich/header.html:77 +#: templates/web/zurich/header.html:73 #, fuzzy msgid "Search reports" msgstr "Adroddiadau cryno" @@ -3292,7 +3251,7 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:711 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" @@ -3302,7 +3261,6 @@ msgid "Sent:" msgstr "Pwnc:" #: templates/web/default/admin/report_edit.html:45 -#: templates/web/zurich/admin/stats.html:44 msgid "Service:" msgstr "" @@ -3376,12 +3334,10 @@ msgstr "Dangos pinnau" #: 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:85 +#: 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 "" @@ -3392,14 +3348,13 @@ msgstr "" #: templates/web/default/auth/general.html:1 #: templates/web/fixmystreet/auth/general.html:1 #: templates/web/seesomething/auth/general.html:1 -#: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "" #: templates/web/bromley/auth/sign_out.html:1 #: templates/web/default/auth/sign_out.html:1 #: templates/web/default/header.html:30 -#: templates/web/emptyhomes/header.html:42 +#: 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 @@ -3410,7 +3365,7 @@ msgid "Sign out" msgstr "" #: templates/web/default/header.html:29 -#: templates/web/emptyhomes/header.html:41 +#: 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 @@ -3478,8 +3433,8 @@ msgstr "" #: templates/web/bromley/report/display.html:78 #: templates/web/default/admin/flagged.html:18 -#: templates/web/default/admin/list_updates.html:7 -#: templates/web/default/admin/reports.html:20 +#: templates/web/default/admin/list_updates.html:6 +#: templates/web/default/admin/reports.html:21 #: templates/web/fixmystreet/report/update-form.html:26 #, fuzzy msgid "State" @@ -3488,24 +3443,22 @@ msgstr "Diweddariad:" #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:41 +#: templates/web/zurich/admin/report_edit.html:74 #: templates/web/zurich/admin/update_edit.html:17 #, fuzzy msgid "State:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1097 #: templates/web/default/admin/stats.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 #, fuzzy msgid "Stats" msgstr "Diweddariad:" -#: 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/index-dm.html:25 +#: templates/web/zurich/admin/index-sdm.html:23 +#: templates/web/zurich/admin/reports.html:17 #, fuzzy msgid "Status" msgstr "Diweddariad:" @@ -3534,6 +3487,7 @@ msgstr "Pwnc:" #: 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:31 msgid "Subject:" msgstr "Pwnc:" @@ -3545,6 +3499,7 @@ msgstr "Pwnc:" #: 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 @@ -3553,11 +3508,11 @@ msgstr "Pwnc:" msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:65 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:61 -#: templates/web/zurich/admin/report_edit.html:180 +#: templates/web/zurich/admin/report_edit-sdm.html:51 +#: templates/web/zurich/admin/report_edit.html:172 #: templates/web/zurich/admin/update_edit.html:38 #, fuzzy msgid "Submit changes" @@ -3568,15 +3523,14 @@ msgstr "Anfon" msgid "Submit questionnaire" msgstr "Anfon yr holiadur" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 #: 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:78 -#: templates/web/zurich/admin/report_edit.html:79 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 #, fuzzy msgid "Submitted" @@ -3603,13 +3557,12 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:195 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:136 #: 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 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 #, fuzzy msgid "Summary" msgstr "Adroddiadau cryno" @@ -3624,7 +3577,7 @@ msgstr "Adroddiadau cryno" msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1094 msgid "Survey" msgstr "" @@ -3632,8 +3585,8 @@ msgstr "" msgid "Survey Results" msgstr "" -#: templates/web/default/admin/list_updates.html:15 -#: templates/web/zurich/admin/list_updates.html:8 +#: templates/web/default/admin/list_updates.html:14 +#: templates/web/zurich/admin/list_updates.html:7 msgid "Text" msgstr "" @@ -3745,7 +3698,7 @@ msgstr "" "Nid yw'n ymddangos bod cyngor yn gyfrifol am y lleoliad hwnnw, efallai ei " "fod ar y môr - chwiliwch am fan mwy penodol." -#: perllib/FixMyStreet/App/Controller/Location.pm:123 +#: perllib/FixMyStreet/App/Controller/Location.pm:121 #, fuzzy msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3757,7 +3710,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:670 +#: perllib/FixMyStreet/App/Controller/Admin.pm:642 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" @@ -3976,12 +3929,11 @@ msgstr "" msgid "There was an empty property showing this page. Please try again later." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:749 +#: 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 msgid "" "There was an empty property with your email/password combination. If you " "cannot remember your password, or do not have one, please fill in the ‘" @@ -4028,7 +3980,8 @@ msgid "" "ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:890 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "" @@ -4089,7 +4042,6 @@ msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" 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:65 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4121,13 +4073,13 @@ 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:1133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" #: templates/web/default/admin/flagged.html:10 -#: templates/web/default/admin/reports.html:12 +#: templates/web/default/admin/reports.html:13 msgid "Title" msgstr "" @@ -4182,8 +4134,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:32 +#: templates/web/zurich/admin/report_edit.html:52 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -4271,32 +4223,32 @@ msgstr "Diweddariadau" msgid "Update:" msgstr "Diweddariad:" -#: 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/index-dm.html:24 +#: templates/web/zurich/admin/index-sdm.html:22 +#: templates/web/zurich/admin/reports.html:16 #, fuzzy msgid "Updated" msgstr "Diweddariadau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:762 -#: perllib/FixMyStreet/App/Controller/Admin.pm:906 -#: perllib/FixMyStreet/App/Controller/Admin.pm:959 -#: perllib/FixMyStreet/App/Controller/Admin.pm:998 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:486 +#: perllib/FixMyStreet/App/Controller/Admin.pm:734 +#: perllib/FixMyStreet/App/Controller/Admin.pm:868 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:958 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:326 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:381 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" -#: templates/web/default/admin/list_updates.html:2 +#: templates/web/default/admin/list_updates.html:1 #: 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/admin/list_updates.html:1 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Diweddariadau" -#: perllib/FixMyStreet/DB/Result/Comment.pm:150 +#: perllib/FixMyStreet/DB/Result/Comment.pm:152 msgid "" "Updates are limited to 2000 characters in length. Please shorten your update" msgstr "" @@ -4314,18 +4266,18 @@ 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:1296 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1256 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1268 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1228 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1095 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:151 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:68 msgid "Users" msgstr "" @@ -4337,7 +4289,7 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 -#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit-sdm.html:13 #: templates/web/zurich/admin/report_edit.html:19 #: templates/web/zurich/admin/update_edit.html:10 #, fuzzy @@ -4465,11 +4417,11 @@ msgid "When edited" msgstr "" #: templates/web/default/admin/flagged.html:19 -#: templates/web/default/admin/reports.html:21 +#: templates/web/default/admin/reports.html:22 msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 msgid "Whole block of empty flats" msgstr "Bloc cyfan o fflatiau gwag" @@ -4520,9 +4472,9 @@ msgstr "" #: 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:30 #: 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:21 #: templates/web/default/admin/report_edit.html:35 #: templates/web/default/admin/report_edit.html:49 @@ -4593,6 +4545,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:97 #: templates/web/default/questionnaire/index.html:96 #: templates/web/default/report/new/fill_in_details_form.html:93 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90 #: templates/web/fixmystreet/questionnaire/index.html:87 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:99 #: templates/web/seesomething/report/new/fill_in_details_form.html:59 @@ -4618,6 +4571,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 #: templates/web/zurich/report/new/fill_in_details_form.html:13 #, fuzzy @@ -4662,7 +4616,7 @@ msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." msgid "You have successfully deleted your alert." msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:756 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 #, fuzzy msgid "" @@ -4711,8 +4665,6 @@ msgstr "(dewisol)" #: 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 #, fuzzy msgid "Your email address" msgstr "Eich cyfeiriad e-bost:" @@ -4725,6 +4677,7 @@ msgstr "Eich cyfeiriad e-bost:" #: 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 "Eich cyfeiriad e-bost:" @@ -4755,7 +4708,6 @@ msgstr "Eich enw:" #: 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 #, fuzzy msgid "Your name" @@ -4765,6 +4717,7 @@ msgstr "Eich enw:" #: 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 "Eich enw:" @@ -4774,7 +4727,6 @@ msgstr "Eich enw:" #: 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 #, fuzzy msgid "Your password" msgstr "Adroddiadau" @@ -4807,7 +4759,7 @@ msgstr "" #: templates/web/fiksgatami/nn/footer.html:6 #: templates/web/fixmystreet/footer.html:46 #: templates/web/oxfordshire/footer.html:21 -#: templates/web/oxfordshire/header.html:58 +#: templates/web/oxfordshire/header.html:63 #: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41 #, fuzzy msgid "Your reports" @@ -4831,17 +4783,17 @@ msgstr "" msgid "council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:48 msgid "didn't use map" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 +#: perllib/FixMyStreet/DB/Result/Comment.pm:197 #, fuzzy msgid "duplicate report" msgstr "Categori:" @@ -4857,13 +4809,7 @@ msgstr "" msgid "from %d different users" msgstr "" -#: templates/web/fixmystreet/report/_item.html:12 -#: templates/web/zurich/report/_item.html:16 -#, fuzzy -msgid "last updated %s" -msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" - -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:268 msgid "less than a minute" msgstr "llai na munud" @@ -4886,7 +4832,7 @@ msgstr "" msgid "no further action" msgstr "Adroddiadau" -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 +#: perllib/FixMyStreet/DB/Result/Comment.pm:195 msgid "not the council's responsibility" msgstr "" @@ -4902,16 +4848,16 @@ 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:24 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit-sdm.html:35 +#: templates/web/zurich/admin/report_edit-sdm.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:24 #: templates/web/zurich/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit.html:35 #: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:47 -#: templates/web/zurich/admin/report_edit.html:49 +#: templates/web/zurich/admin/report_edit.html:44 +#: templates/web/zurich/admin/report_edit.html:46 msgid "originally entered: “%s”" msgstr "" @@ -4928,8 +4874,8 @@ msgstr "wedi'i ailagor" #: 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/oxfordshire/header.html:82 #: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12 msgid "sign out" msgstr "" @@ -4938,6 +4884,8 @@ msgstr "" #: 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 #, fuzzy @@ -4954,13 +4902,13 @@ msgstr "" msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:240 msgid "today" msgstr "heddiw" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:48 msgid "used map" msgstr "" @@ -4985,14 +4933,14 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> adroddiad yn ddiweddar" msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:287 #, fuzzy, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "awr" msgstr[1] "awr" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:289 #, fuzzy, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5014,7 +4962,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:283 #, fuzzy, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5046,13 +4994,24 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:285 #, fuzzy, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "diwrnod" msgstr[1] "diwrnod" +#, 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 "" +#~ "Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at " +#~ "<strong>%s</strong>.\n" +#~ "Ar y safle, byddwn yn dangos pwnc a manylion yr eiddo gwag,\n" +#~ "ynghyd â'ch enw os ydych yn rhoi caniatâd i ni." + #~ msgid "Enter a nearby GB postcode, or street name and area" #~ msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index 4b2fd6f76..c1b27ac0a 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-02-20 20:23+0000\n" -"PO-Revision-Date: 2013-02-19 16:27+0100\n" +"POT-Creation-Date: 2013-02-13 11:17+0000\n" +"PO-Revision-Date: 2013-02-04 12:02+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" "Language: \n" @@ -16,7 +16,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/Result/Problem.pm:649 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:355 msgid " and " msgstr "und" @@ -67,16 +67,12 @@ msgstr "" msgid "%d supporters" msgstr "" -#: templates/web/default/pagination.html:10 -msgid "%d to %d of %d" -msgstr "" - #: templates/web/default/reports/body.html:0 #: templates/web/default/reports/body.html:20 msgid "%s - Summary reports" -msgstr "Alle Meldungen" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:685 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "%s ref: %s" msgstr "" @@ -84,7 +80,7 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 #, fuzzy msgid "%s, reported at %s" msgstr "Gemeldet von %s um %s" @@ -128,15 +124,15 @@ msgstr "" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:22 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(erledigt)" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:20 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/fixmystreet/report/_item.html:18 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(gelöst)" @@ -146,17 +142,18 @@ msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:16 +#: templates/web/fixmystreet/report/_item.html:14 msgid "(not sent to council)" msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:217 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:140 #: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "(optional)" msgstr "(optional)" #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:15 +#: templates/web/fixmystreet/report/_item.html:13 msgid "(sent to both)" msgstr "" @@ -168,14 +165,14 @@ 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:636 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 -#: perllib/FixMyStreet/DB/Result/Problem.pm:418 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/DB/Result/Problem.pm:431 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 -#: perllib/FixMyStreet/DB/Result/Problem.pm:424 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:437 msgid "-- Pick a property type --" msgstr "" @@ -288,9 +285,8 @@ msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" #: templates/web/fixmystreet/auth/general.html:50 -#: templates/web/zurich/auth/general.html:49 msgid "<strong>No</strong> let me sign in by email" -msgstr "Registrierung" +msgstr "Erstmalige Anmeldung" #: templates/web/default/auth/general.html:55 msgid "<strong>No</strong>, I do not, let me sign in by email:" @@ -316,7 +312,7 @@ msgstr "Passwort" #: templates/web/default/static/about.html:1 #: templates/web/default/static/about.html:3 -#: templates/web/emptyhomes/header.html:30 +#: templates/web/emptyhomes/header.html:34 #: templates/web/emptyhomes/static/about.html:1 #: templates/web/emptyhomes/static/about.html:3 msgid "About us" @@ -342,7 +338,7 @@ msgstr "Adresse hinzufügen" msgid "Add new category" msgstr "Füge neue Kategorie hinzu" -#: templates/web/default/admin/users.html:36 +#: templates/web/default/admin/users.html:35 msgid "Add user" msgstr "User hinzufügen" @@ -370,32 +366,29 @@ msgstr "" #: templates/web/default/reports/index.html:3 #: templates/web/fixmybarangay/reports/index.html:3 -#: templates/web/zurich/admin/stats.html:5 #: templates/web/zurich/reports/index.html:15 msgid "All Reports" msgstr "Alle Meldungen" #: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 #: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 -#: templates/web/emptyhomes/header.html:28 +#: 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:60 +#: 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 "Alle Meldungen" #: templates/web/default/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 msgid "All reports between %s and %s" -msgstr "Gemeldet von %s bis %s" +msgstr "Gemeldet von %s um %s" #: templates/web/default/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" @@ -422,27 +415,24 @@ msgstr "" #: 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 "" -#: templates/web/emptyhomes/report/new/councils_text_all.html:2 -#: templates/web/emptyhomes/report/new/councils_text_all.html:4 -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." -msgstr "" - #: templates/web/default/questionnaire/index.html:60 #: templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this problem as fixed." msgstr "" #: templates/web/default/admin/flagged.html:15 -#: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/reports.html:17 +#: templates/web/default/admin/list_updates.html:10 +#: templates/web/default/admin/reports.html:18 msgid "Anonymous" msgstr "Anonym" @@ -472,24 +462,22 @@ msgstr "" msgid "Area covered" msgstr "Gebiet" -#: templates/web/zurich/admin/report_edit.html:111 -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/report_edit.html:109 msgid "Assign to different category:" msgstr "Einer anderen Kategorie (DA) zuweisen:" -#: templates/web/zurich/admin/report_edit.html:120 +#: templates/web/zurich/admin/report_edit.html:118 msgid "Assign to external body:" msgstr "Einer externen Stelle zuweisen:" -#: templates/web/zurich/admin/report_edit.html:152 -#: templates/web/zurich/admin/report_edit.html:99 +#: templates/web/zurich/admin/report_edit.html:150 +#: templates/web/zurich/admin/report_edit.html:97 msgid "Assign to subdivision:" msgstr "An Fachbereich zuweisen:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:97 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" -msgstr "An Fachbereich zuweisen: %s" +msgstr "An Fachbereich zuweisen:" #: templates/web/default/open311/index.html:17 msgid "" @@ -502,8 +490,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Überprüfung ausstehend" @@ -521,14 +509,14 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:203 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/header.html:64 +#: templates/web/zurich/header.html:63 msgid "Bodies" msgstr "Externe Adressen" -#: templates/web/default/admin/reports.html:15 +#: templates/web/default/admin/reports.html:16 #: templates/web/default/admin/users.html:14 msgid "Body" msgstr "Organisation" @@ -555,20 +543,20 @@ msgstr "" "Karte nicht sichtbar? <a href='%s' rel='nofollow'>Überspringen Sie " "diesen Schritt</a>" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 #: 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/flagged.html:14 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/reports.html:17 +#: 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:49 +#: templates/web/zurich/admin/index-dm.html:22 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/admin/reports.html:14 #: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategorie" @@ -581,9 +569,10 @@ msgstr "" #: templates/web/default/admin/body_edit.html:23 #: templates/web/default/admin/report_edit.html:33 #: 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:39 -#: templates/web/zurich/admin/report_edit.html:110 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit.html:108 msgid "Category:" msgstr "Kategorie:" @@ -602,7 +591,6 @@ msgstr "Passwort ändern" msgid "Click map to report a problem" msgstr "Mangel lokalisieren" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:28 #: templates/web/default/dashboard/index.html:142 @@ -611,14 +599,13 @@ msgstr "Mangel lokalisieren" #: 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:85 #: templates/web/zurich/admin/report_edit.html:87 -#: templates/web/zurich/admin/report_edit.html:89 -#: templates/web/zurich/admin/stats.html:30 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Erledigt" -#: perllib/FixMyStreet/DB/Result/Problem.pm:778 +#: perllib/FixMyStreet/DB/Result/Problem.pm:791 msgid "Closed by council" msgstr "" @@ -636,14 +623,14 @@ 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:30 +#: templates/web/zurich/admin/report_edit-sdm.html:22 #: templates/web/zurich/admin/report_edit.html:43 msgid "Co-ordinates:" msgstr "Koordinaten:" #: templates/web/default/admin/flagged.html:16 -#: templates/web/default/admin/list_updates.html:14 -#: templates/web/default/admin/reports.html:18 +#: templates/web/default/admin/list_updates.html:13 +#: templates/web/default/admin/reports.html:19 msgid "Cobrand" msgstr "" @@ -698,7 +685,6 @@ msgstr "Bestätigung" #: 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:39 msgid "Confirmed" msgstr "Bestätigt" @@ -736,8 +722,8 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1264 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1252 msgid "Could not find user" msgstr "" @@ -746,7 +732,7 @@ msgid "Could not look up location" msgstr "" #: templates/web/default/admin/flagged.html:13 -#: templates/web/default/admin/list_updates.html:13 +#: templates/web/default/admin/list_updates.html:12 msgid "Council" msgstr "" @@ -762,14 +748,12 @@ msgstr "" #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:44 -#: templates/web/zurich/admin/stats.html:49 msgid "Count" msgstr "" #: templates/web/default/email_sent.html:1 msgid "Create a report" -msgstr "Erfassen Sie eine Meldung" +msgstr "Erfasse eine Meldung" #: templates/web/default/admin/body.html:103 #: templates/web/zurich/admin/body.html:53 @@ -777,16 +761,16 @@ msgid "Create category" msgstr "" #: templates/web/default/admin/flagged.html:17 -#: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/reports.html:19 -#: templates/web/zurich/admin/list_updates.html:7 +#: templates/web/default/admin/list_updates.html:9 +#: templates/web/default/admin/reports.html:20 +#: templates/web/zurich/admin/list_updates.html:6 msgid "Created" msgstr "Erstellt" #: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit-sdm.html:34 +#: templates/web/zurich/admin/report_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Erstellt:" @@ -800,10 +784,6 @@ msgstr "Aktueller Status" msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:34 -msgid "Dealt with by subdivision within 5 working days" -msgstr "" - #: templates/web/default/admin/body.html:38 #: templates/web/default/admin/body.html:88 #: templates/web/default/admin/body_edit.html:37 @@ -811,9 +791,9 @@ msgstr "" msgid "Deleted" msgstr "Gelöscht" -#: templates/web/zurich/admin/index-dm.html:22 -#: templates/web/zurich/admin/index-sdm.html:20 -#: templates/web/zurich/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:21 +#: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/reports.html:13 msgid "Description" msgstr "Beschreibung" @@ -827,7 +807,8 @@ msgstr "Beschreibung" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 -#: templates/web/zurich/admin/report_edit-sdm.html:22 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:14 #: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/report_edit.html:32 msgid "Details:" @@ -866,10 +847,10 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 +#: templates/web/default/admin/list_updates.html:35 #: templates/web/default/admin/problem_row.html:31 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:38 +#: templates/web/zurich/admin/problem_row.html:35 msgid "Edit" msgstr "" @@ -880,7 +861,6 @@ msgstr "Details editieren" #: templates/web/default/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" @@ -905,24 +885,22 @@ msgstr "" #: templates/web/default/admin/body_edit.html:83 #: templates/web/default/admin/flagged.html:12 #: templates/web/default/admin/flagged.html:35 -#: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/reports.html:14 +#: templates/web/default/admin/list_updates.html:8 +#: templates/web/default/admin/reports.html:15 #: 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 "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1240 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1237 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 msgid "Email already in abuse list" msgstr "" @@ -932,7 +910,7 @@ msgstr "" #: templates/web/default/report/display.html:34 msgid "Email me updates" -msgstr "Schicken Sie mir Aktualisierungen" +msgstr "Schicken sie mir Aktualisierungen" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 @@ -942,8 +920,8 @@ msgstr "Schicken Sie mir Aktualisierungen" #: 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:41 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:31 +#: templates/web/zurich/admin/report_edit.html:51 msgid "Email:" msgstr "E-mail:" @@ -952,15 +930,15 @@ msgstr "E-mail:" msgid "Email: %s" msgstr "E-mail:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty office or other commercial" msgstr "" @@ -968,11 +946,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -1024,7 +1002,6 @@ msgstr "" #: templates/web/fixmystreet/auth/general.html:61 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 #: templates/web/fixmystreet/report/update-form.html:122 -#: templates/web/zurich/auth/general.html:63 msgid "Enter a password" msgstr "Ihr Passwort" @@ -1152,7 +1129,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" @@ -1187,7 +1164,7 @@ msgstr "Ihr Passwort" #: templates/web/oxfordshire/faq/faq-en-gb.html:1 #: templates/web/zurich/faq/faq-de-ch.html:1 msgid "Frequently Asked Questions" -msgstr "Hilfe" +msgstr "" #: templates/web/emptyhomes/static/about.html:34 msgid "Further information about our work on empty homes." @@ -1222,7 +1199,6 @@ msgstr "" #: templates/web/default/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 #: templates/web/seesomething/around/postcode_form.html:10 -#: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "Los" @@ -1231,6 +1207,7 @@ msgid "Going to send questionnaire?" msgstr "" #: templates/web/default/admin/index.html:24 +#: templates/web/zurich/admin/index.html:11 msgid "Graph of problem creation by status over time" msgstr "Grafik der Meldungen nach Status und Zeit" @@ -1253,13 +1230,13 @@ msgstr "" #: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 #: templates/web/bromley/header.html:81 templates/web/default/footer.html:15 -#: templates/web/emptyhomes/header.html:29 +#: 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:64 +#: 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/footer.html:21 @@ -1276,8 +1253,8 @@ msgstr "" #: 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/oxfordshire/header.html:81 #: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hallo %s" @@ -1287,9 +1264,8 @@ msgstr "Hallo %s" #: 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:78 -#: templates/web/zurich/admin/report_edit.html:82 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:80 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Unsichtbar" @@ -1312,13 +1288,13 @@ msgstr "" #: templates/web/default/index-steps.html:1 msgid "How to report a problem" -msgstr "Erfassen Sie eine neue Meldung:" +msgstr "Erfasse eine neue Meldung:" #: templates/web/default/js/translation_strings.html:27 msgid "How to send successful reports" msgstr "Anleitung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:699 +#: perllib/FixMyStreet/App/Controller/Admin.pm:671 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1337,17 +1313,17 @@ msgid "" "I'm afraid we couldn't validate that token. If you've copied the URL from an " "email, please check that you copied it exactly.\n" msgstr "" -"Leider konnte ihre URL nicht aufgelöst werden. Falls Sie die URL aus " -"einer Mail kopiert haben, überprüfen Sie bitte ob Sie die gesamte " +"Leider konnte ihre URL nicht aufgelöst werden. Falls sie die URL aus " +"einer Mail kopiert haben, überprüfen sie bitte ob sie die gesamte " "URL kopiert haben.\n" #: 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 +#: templates/web/default/admin/list_updates.html:5 +#: templates/web/default/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:20 +#: templates/web/zurich/admin/index-sdm.html:18 +#: templates/web/zurich/admin/list_updates.html:5 +#: templates/web/zurich/admin/reports.html:12 msgid "ID" msgstr "ID" @@ -1423,13 +1399,12 @@ msgid "" "present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:28 #: 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:91 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In Bearbeitung" @@ -1439,9 +1414,9 @@ msgstr "In Bearbeitung" msgid "Incident Category" msgstr "Kategorie" -#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:128 msgid "Include reporter personal details" -msgstr "Persönliche Angaben des Meldenden mitsenden" +msgstr "Pers&oumol;nliche Angaben des Meldenden mitsenden" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" @@ -1451,8 +1426,8 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:53 -#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:71 msgid "Internal notes:" msgstr "Interne Notizen" @@ -1460,7 +1435,7 @@ msgstr "Interne Notizen" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" @@ -1468,7 +1443,7 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1001 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" @@ -1507,7 +1482,6 @@ msgstr "" #: 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 "Angemeldet bleiben" @@ -1537,6 +1511,7 @@ msgstr "Liste aller Meldungen" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 #: templates/web/seesomething/report/new/fill_in_details_form.html:25 #: templates/web/zurich/report/new/fill_in_details_form.html:51 @@ -1574,7 +1549,7 @@ msgstr "" #: templates/web/fixmybarangay/footer.html:22 #: templates/web/fixmystreet/footer.html:50 #: templates/web/oxfordshire/footer.html:25 -#: templates/web/oxfordshire/header.html:62 +#: templates/web/oxfordshire/header.html:71 #: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45 msgid "Local alerts" msgstr "RSS" @@ -1606,10 +1581,6 @@ msgstr "Nachricht:" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/zurich/admin/stats.html:33 -msgid "Moderated by division within one working day" -msgstr "" - #: templates/web/default/admin/stats.html:11 msgid "Month" msgstr "Monat" @@ -1622,8 +1593,8 @@ msgstr "Meldungen in der Nähe" #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 -#: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/reports.html:13 +#: templates/web/default/admin/list_updates.html:7 +#: templates/web/default/admin/reports.html:14 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 @@ -1635,7 +1606,6 @@ msgstr "Meldungen in der Nähe" #: 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 "Name" @@ -1648,9 +1618,8 @@ msgstr "(optional)" #: templates/web/default/admin/report_edit.html:38 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:53 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/report_edit-sdm.html:30 +#: templates/web/zurich/admin/report_edit.html:50 msgid "Name:" msgstr "Name:" @@ -1684,7 +1653,7 @@ msgid "" "Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1693,7 +1662,7 @@ msgstr "" #: templates/web/default/email_sent.html:3 msgid "Nearly Done! Now check your email..." -msgstr "Fast Fertig! Bitte checken Sie Ihre Mailbox..." +msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." #: templates/web/default/reports/index.html:16 #: templates/web/fixmybarangay/reports/index.html:16 @@ -1771,7 +1740,7 @@ msgstr "" msgid "New state" msgstr "Neuer Status" -#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:46 msgid "New update:" msgstr "Neue Antwort" @@ -1781,17 +1750,13 @@ msgstr "Neue Antwort" msgid "New!" msgstr "Neu!" -#: templates/web/default/pagination.html:13 -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:30 #: 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:21 #: templates/web/default/admin/report_edit.html:36 #: templates/web/default/admin/report_edit.html:49 @@ -1806,13 +1771,13 @@ msgstr "Nein" #: templates/web/default/admin/user-form.html:8 msgid "No body" -msgstr "Keine" +msgstr "" #: templates/web/default/admin/stats.html:85 msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:414 msgid "No council selected" msgstr "" @@ -1828,9 +1793,9 @@ msgstr "" msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:52 msgid "No further updates" -msgstr "Abschliessen" +msgstr "Bearbeitung abschliessen" #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 @@ -1855,8 +1820,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:54 msgid "None" msgstr "Keine" @@ -1869,7 +1834,7 @@ msgstr "Keine" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:10 msgid "Not for my subdivision" msgstr "Anderer Fachbereich zuständig" @@ -1964,7 +1929,6 @@ msgstr "" msgid "Older problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:71 #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 @@ -1973,8 +1937,8 @@ msgstr "" #: 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:76 #: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:80 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2008,13 +1972,13 @@ msgid "" "re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1042 -#: 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/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:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:343 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:356 msgid "Other" @@ -2026,7 +1990,7 @@ msgid "" "\">available on GitHub</a>." msgstr "" -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:11 msgid "Owner" msgstr "Besitzer" @@ -2050,8 +2014,6 @@ msgstr "" #: templates/web/fixmystreet/auth/general.html:59 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:208 #: templates/web/fixmystreet/report/update-form.html:119 -#: templates/web/zurich/auth/general.html:32 -#: templates/web/zurich/auth/general.html:61 msgid "Password (optional)" msgstr "Passwort" @@ -2071,9 +2033,9 @@ msgstr "Telefonnummer (optional)" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:265 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:54 msgid "Phone:" msgstr "Telefonnummer:" @@ -2082,7 +2044,6 @@ 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/stats.html:36 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" msgstr "Foto" @@ -2090,6 +2051,7 @@ 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:" @@ -2109,8 +2071,8 @@ msgstr "Pin auf der Karte absetzen" #: 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:78 -#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:79 msgid "Planned" msgstr "Rückmeldung ausstehend" @@ -2133,7 +2095,7 @@ msgstr "" #: templates/web/default/auth/token.html:17 msgid "Please check your email" -msgstr "Bitte überprüfen Sie ihr E-Mail" +msgstr "Bitte überprüfen sie ihr E-Mail" #: templates/web/default/auth/general.html:14 #: templates/web/default/auth/general.html:8 @@ -2141,21 +2103,19 @@ msgstr "Bitte überprüfen Sie ihr E-Mail" #: templates/web/fixmystreet/auth/general.html:9 #: templates/web/seesomething/auth/general.html:15 #: templates/web/seesomething/auth/general.html:9 -#: templates/web/zurich/auth/general.html:3 -#: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:844 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:851 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:870 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:913 -#: perllib/FixMyStreet/DB/Result/Problem.pm:420 +#: 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:433 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:439 msgid "Please choose a property type" msgstr "" @@ -2183,20 +2143,19 @@ msgid "" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -#: templates/web/oxfordshire/report/new/notes.html:6 -msgid "" -"Please do not be abusive — abusing your council devalues the service " -"for all users." -msgstr "" - #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:7 +#: templates/web/oxfordshire/report/new/notes.html:6 msgid "" "Please do not be abusive — abusing your council devalues the " "service for all users." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 +msgid "Please do not give address or personal information in this section." +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:147 #: templates/web/default/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -2207,7 +2166,7 @@ msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:395 +#: perllib/FixMyStreet/DB/Result/Problem.pm:408 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" @@ -2225,11 +2184,11 @@ msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" -#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: perllib/FixMyStreet/DB/Result/Problem.pm:411 #: templates/web/default/js/translation_strings.html:4 #: templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" -msgstr "Bitte geben Sie einige Details an" +msgstr "Bitte geben Sie einiges Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 #: perllib/FixMyStreet/DB/Result/User.pm:112 @@ -2242,8 +2201,6 @@ msgstr "Bitte geben Sie einige Details an" #: templates/web/seesomething/auth/general.html:14 #: templates/web/seesomething/auth/general.html:9 #: templates/web/seesomething/js/translation_strings.html:9 -#: templates/web/zurich/auth/general.html:3 -#: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Ihre E-Mail Adresse" @@ -2258,7 +2215,7 @@ msgstr "Ihre E-Mail Adresse" msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Namen an" -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 #: templates/web/default/js/translation_strings.html:7 #: templates/web/seesomething/js/translation_strings.html:4 msgid "" @@ -2267,8 +2224,8 @@ msgid "" msgstr "" #: 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/Comment.pm:144 +#: perllib/FixMyStreet/DB/Result/Problem.pm:419 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2321,10 +2278,10 @@ msgid "" "and if possible describe the exact location of\n" "the problem (e.g. if there is a streetlight number or road name)." msgstr "" -"Bitte beschreiben Sie Ihre Meldung weiter unten. Wir können den Mangel " +"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 " +"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." #: templates/web/default/report/new/fill_in_details_text.html:1 @@ -2337,10 +2294,10 @@ msgid "" "description (and a\n" "photo of the problem if you have one), etc." msgstr "" -"Bitte beschreiben Sie Ihre Meldung weiter unten. Wir können den Mangel " +"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 " +"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." #: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 @@ -2351,6 +2308,7 @@ msgstr "Beschreiben Sie den Mangel." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "" @@ -2386,6 +2344,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "" @@ -2473,16 +2432,16 @@ msgstr "" msgid "Posted by %s at %s" msgstr "" -#: templates/web/default/pagination.html:7 -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:51 msgid "Private" msgstr "" +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:108 +msgid "Private information (not shown on site)" +msgstr "" + #: templates/web/default/maps/openlayers.html:85 msgid "Problem" msgstr "Meldung" @@ -2500,11 +2459,11 @@ msgid "Problem %s sent to council %s" msgstr "" #: templates/web/default/admin/index.html:28 -#: templates/web/zurich/admin/index.html:9 +#: templates/web/zurich/admin/index.html:15 msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:916 +#: perllib/FixMyStreet/App/Controller/Admin.pm:878 msgid "Problem marked as open." msgstr "" @@ -2567,7 +2526,12 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 +#, fuzzy +msgid "Property address:" +msgstr "Ihre E-Mail Adresse:" + +#: templates/web/default/report/new/category.html:8 msgid "Property type:" msgstr "" @@ -2603,17 +2567,19 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:44 +msgid "Public information (shown on site)" +msgstr "" + +#: templates/web/zurich/admin/report_edit.html:160 msgid "Public response:" msgstr "Offizielle Antwort" -#: templates/web/zurich/admin/report_edit.html:69 -#: templates/web/zurich/admin/stats.html:37 +#: templates/web/zurich/admin/report_edit.html:67 msgid "Publish photo" msgstr "Foto veröffentlichen" -#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Publish the response" msgstr "Antwort veröffentlichen" @@ -2741,10 +2707,10 @@ msgid "" "site remember that you can contact your council directly using their own " "website." msgstr "" -"Züri wie neu dient dazu Mängel an der Infrastruktur zu melden. " +"Fix My Zürich dient dazu Mängel an der Infrastruktur zu melden. " "Meldungen und Wünsche bezüglich Verbesserungen an der " -"Infrastruktur sowie Gestaltungsvorschläge können über Züri " -"wie neu nicht berücksichtigt werden. Notfälle müssen der " +"Infrastruktur sowie Gestaltungsvorschläge können über Fix My " +"Zürich nicht berücksichtigt werden. Notfälle müssen der " "Polizei gemeldet werden via Telefon 117." #: templates/web/fixmybarangay/report/new/notes.html:9 @@ -2757,18 +2723,18 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:61 +#: templates/web/default/admin/report_edit.html:62 #: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/emptyhomes/header.html:10 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "" #: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 -#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 +#: 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 @@ -2816,7 +2782,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:606 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2828,25 +2794,25 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported by %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/DB/Result/Problem.pm:614 msgid "Reported by %s in the %s category by %s at %s" msgstr "" @@ -2854,11 +2820,11 @@ msgstr "" msgid "Reported in the %s category" msgstr "In der Kategorie %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:602 msgid "Reported in the %s category anonymously at %s" msgstr "In der Kategorie %s um %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported in the %s category by %s at %s" msgstr "Gemeldet in der Kategorie %s" @@ -2867,6 +2833,7 @@ msgstr "Gemeldet in der Kategorie %s" #: 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 @@ -2877,14 +2844,14 @@ msgstr "Gemeldet in der Kategorie %s" msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 #: templates/web/seesomething/admin/stats.html:1 -#: templates/web/zurich/header.html:60 +#: templates/web/zurich/header.html:59 msgid "Reports" msgstr "Meldungen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:432 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "" "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" @@ -2919,22 +2886,19 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1342 -#: templates/web/default/admin/report_edit.html:57 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/default/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:63 msgid "Rotate Left" msgstr "Links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 -#: templates/web/default/admin/report_edit.html:58 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/default/admin/report_edit.html:59 +#: templates/web/zurich/admin/report_edit.html:64 msgid "Rotate Right" msgstr "Rechts drehen" #: templates/web/default/admin/body_edit.html:76 msgid "Save changes" -msgstr "Speichern" +msgstr "Änderungen speichern" #: templates/web/default/admin/flagged.html:1 #: templates/web/default/admin/reports.html:1 @@ -2946,7 +2910,7 @@ msgstr "Meldungen suchen" msgid "Search Users" msgstr "User suchen" -#: templates/web/zurich/header.html:77 +#: templates/web/zurich/header.html:73 msgid "Search reports" msgstr "Meldungen suchen" @@ -2973,7 +2937,7 @@ msgid "" "or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:711 msgid "Sent to %s %s later" msgstr "" @@ -2982,7 +2946,6 @@ msgid "Sent:" msgstr "Gesendet:" #: templates/web/default/admin/report_edit.html:45 -#: templates/web/zurich/admin/stats.html:44 msgid "Service:" msgstr "" @@ -3037,12 +3000,10 @@ msgstr "Zeige Stecknadeln" #: 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:85 +#: 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 "Anmelden" @@ -3053,14 +3014,13 @@ msgstr "" #: templates/web/default/auth/general.html:1 #: templates/web/fixmystreet/auth/general.html:1 #: templates/web/seesomething/auth/general.html:1 -#: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "" #: templates/web/bromley/auth/sign_out.html:1 #: templates/web/default/auth/sign_out.html:1 #: templates/web/default/header.html:30 -#: templates/web/emptyhomes/header.html:42 +#: 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 @@ -3071,7 +3031,7 @@ msgid "Sign out" msgstr "" #: templates/web/default/header.html:29 -#: templates/web/emptyhomes/header.html:41 +#: 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 @@ -3136,8 +3096,8 @@ msgstr "" #: templates/web/bromley/report/display.html:78 #: templates/web/default/admin/flagged.html:18 -#: templates/web/default/admin/list_updates.html:7 -#: templates/web/default/admin/reports.html:20 +#: templates/web/default/admin/list_updates.html:6 +#: templates/web/default/admin/reports.html:21 #: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "Status" @@ -3145,22 +3105,20 @@ msgstr "Status" #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:41 +#: templates/web/zurich/admin/report_edit.html:74 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1097 #: templates/web/default/admin/stats.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" -msgstr "Statistik" +msgstr "" -#: 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/index-dm.html:25 +#: templates/web/zurich/admin/index-sdm.html:23 +#: templates/web/zurich/admin/reports.html:17 msgid "Status" msgstr "" @@ -3186,6 +3144,7 @@ msgstr "Titel" #: 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:31 msgid "Subject:" msgstr "Titel:" @@ -3197,6 +3156,7 @@ msgstr "Titel:" #: 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 @@ -3205,11 +3165,11 @@ msgstr "Titel:" msgid "Submit" msgstr "Abschicken" -#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:65 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:61 -#: templates/web/zurich/admin/report_edit.html:180 +#: templates/web/zurich/admin/report_edit-sdm.html:51 +#: templates/web/zurich/admin/report_edit.html:172 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Änderungen speichern" @@ -3219,15 +3179,14 @@ msgstr "Änderungen speichern" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 #: 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:78 -#: templates/web/zurich/admin/report_edit.html:79 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "Erfasst" @@ -3250,13 +3209,12 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:195 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:136 #: 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 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 msgid "Summary" msgstr "Zusammenfassung" @@ -3270,7 +3228,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1094 msgid "Survey" msgstr "" @@ -3278,8 +3236,8 @@ msgstr "" msgid "Survey Results" msgstr "" -#: templates/web/default/admin/list_updates.html:15 -#: templates/web/zurich/admin/list_updates.html:8 +#: templates/web/default/admin/list_updates.html:14 +#: templates/web/zurich/admin/list_updates.html:7 msgid "Text" msgstr "" @@ -3299,7 +3257,7 @@ msgid "" "the site." msgstr "" "Danke &mdash; Sie können Ihre aktualisierte Meldung <a href=\"%s" -"\">auf der Webseite anschauen</a>." +"\">auf der Webseite anschauen</a>" #: templates/web/emptyhomes/tokens/confirm_problem.html:6 #: templates/web/emptyhomes/tokens/confirm_problem.html:8 @@ -3362,9 +3320,9 @@ msgid "" "offshore or outside the country. Please try again." msgstr "" "Sie können Mängel nur innerhalb der Stadt Zürich melden. " -"Verwenden Sie dafür die Adresssuche." +"Verwenden Sie dafür die Adressuche." -#: perllib/FixMyStreet/App/Controller/Location.pm:123 +#: perllib/FixMyStreet/App/Controller/Location.pm:121 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3373,18 +3331,18 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:670 +#: perllib/FixMyStreet/App/Controller/Admin.pm:642 msgid "That problem will now be resent." msgstr "" #: perllib/FixMyStreet/App/Controller/Report.pm:117 #, fuzzy msgid "That report cannot be viewed on %s." -msgstr "Diese Meldung wurde von Züri wie neu entfernt." +msgstr "Diese Meldung wurde von Fix My Zürich entfernt." #: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." -msgstr "Diese Meldung wurde von Züri wie neu entfernt." +msgstr "Diese Meldung wurde von Fix My Zürich entfernt." #: templates/web/emptyhomes/static/about.html:7 msgid "The Empty Homes Agency" @@ -3550,12 +3508,11 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:749 +#: 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 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 " @@ -3602,7 +3559,8 @@ msgid "" "it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:890 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3654,7 +3612,6 @@ 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:65 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Überprüfung ausstehend" @@ -3681,13 +3638,13 @@ msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" #: templates/web/default/admin/flagged.html:10 -#: templates/web/default/admin/reports.html:12 +#: templates/web/default/admin/reports.html:13 msgid "Title" msgstr "Titel" @@ -3735,8 +3692,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:32 +#: templates/web/zurich/admin/report_edit.html:52 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Unbestätigt" @@ -3779,7 +3736,7 @@ msgstr "" #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Update body" -msgstr "Speichern" +msgstr "Beschreibung" #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" @@ -3810,30 +3767,30 @@ msgstr "" msgid "Update:" msgstr "" -#: templates/web/zurich/admin/index-dm.html:23 -#: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:24 +#: templates/web/zurich/admin/index-sdm.html:22 +#: templates/web/zurich/admin/reports.html:16 msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:762 -#: perllib/FixMyStreet/App/Controller/Admin.pm:906 -#: perllib/FixMyStreet/App/Controller/Admin.pm:959 -#: perllib/FixMyStreet/App/Controller/Admin.pm:998 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:486 +#: perllib/FixMyStreet/App/Controller/Admin.pm:734 +#: perllib/FixMyStreet/App/Controller/Admin.pm:868 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:958 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:326 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:381 msgid "Updated!" msgstr "Aktualisiert!" -#: templates/web/default/admin/list_updates.html:2 +#: templates/web/default/admin/list_updates.html:1 #: 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/admin/list_updates.html:1 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Antwort" -#: perllib/FixMyStreet/DB/Result/Comment.pm:150 +#: perllib/FixMyStreet/DB/Result/Comment.pm:152 msgid "" "Updates are limited to 2000 characters in length. Please shorten your update" msgstr "" @@ -3851,18 +3808,18 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1296 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1256 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1268 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1228 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1095 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:151 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:68 msgid "Users" msgstr "" @@ -3873,7 +3830,7 @@ 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:21 +#: templates/web/zurich/admin/report_edit-sdm.html:13 #: templates/web/zurich/admin/report_edit.html:19 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" @@ -3989,11 +3946,11 @@ msgid "When edited" msgstr "Wann editiert" #: templates/web/default/admin/flagged.html:19 -#: templates/web/default/admin/reports.html:21 +#: templates/web/default/admin/reports.html:22 msgid "When sent" msgstr "Wann gesendet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 msgid "Whole block of empty flats" msgstr "" @@ -4045,9 +4002,9 @@ 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:30 #: 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:21 #: templates/web/default/admin/report_edit.html:35 #: templates/web/default/admin/report_edit.html:49 @@ -4113,6 +4070,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:97 #: templates/web/default/questionnaire/index.html:96 #: templates/web/default/report/new/fill_in_details_form.html:93 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90 #: templates/web/fixmystreet/questionnaire/index.html:87 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:99 #: templates/web/seesomething/report/new/fill_in_details_form.html:59 @@ -4121,8 +4079,6 @@ msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." msgstr "" -"Sie haben bereits ein Foto ausgewählt. Machen Sie ein neues um dieses " -"zu ersetzen." #: templates/web/bromley/report/display.html:108 #: templates/web/default/report/update-form.html:59 @@ -4140,6 +4096,7 @@ msgstr "Sie haben sich abgemeldet" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 #: templates/web/zurich/report/new/fill_in_details_form.html:13 msgid "" @@ -4156,7 +4113,7 @@ msgstr "" #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." -msgstr "Sie haben Ihre Meldung erfolgreich bestätigt." +msgstr "Sie haben Ihre Meldung erfolgreich bestätigt" #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 @@ -4178,7 +4135,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:756 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " @@ -4226,8 +4183,6 @@ msgstr "Passwort" #: 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 "Ihre E-Mail Adresse" @@ -4238,6 +4193,7 @@ msgstr "Ihre E-Mail Adresse:" #: 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 "Ihre E-Mail:" @@ -4268,7 +4224,6 @@ msgstr "Ihr Name" #: 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 "Ihr Name" @@ -4277,6 +4232,7 @@ msgstr "Ihr Name" #: 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 "Ihr Name:" @@ -4286,7 +4242,6 @@ msgstr "Ihr Name:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 #: templates/web/fixmystreet/report/update-form.html:94 #: templates/web/seesomething/auth/general.html:30 -#: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Ihr Passwort" @@ -4317,7 +4272,7 @@ msgstr "" #: templates/web/fiksgatami/nn/footer.html:6 #: templates/web/fixmystreet/footer.html:46 #: templates/web/oxfordshire/footer.html:21 -#: templates/web/oxfordshire/header.html:58 +#: templates/web/oxfordshire/header.html:63 #: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41 msgid "Your reports" msgstr "Ihre Meldungen" @@ -4339,20 +4294,20 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:48 msgid "didn't use map" msgstr "hat Karte nicht verwendet" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 +#: perllib/FixMyStreet/DB/Result/Comment.pm:197 #, fuzzy msgid "duplicate report" -msgstr "Erfassen Sie eine Meldung" +msgstr "Erfasse eine Meldung" #: templates/web/default/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 @@ -4365,13 +4320,7 @@ msgstr "z.B. ‘%s’ oder ‘%s’" msgid "from %d different users" msgstr "" -#: templates/web/fixmystreet/report/_item.html:12 -#: templates/web/zurich/report/_item.html:16 -#, fuzzy -msgid "last updated %s" -msgstr "Letzte Bearbeitung" - -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:268 msgid "less than a minute" msgstr "weniger als einer Minute" @@ -4392,9 +4341,9 @@ msgstr "" #: templates/web/default/report/updates.html:32 #, fuzzy msgid "no further action" -msgstr "Abschliessen" +msgstr "Bearbeitung abschliessen" -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 +#: perllib/FixMyStreet/DB/Result/Comment.pm:195 msgid "not the council's responsibility" msgstr "" @@ -4410,16 +4359,16 @@ msgstr "oder automatisch lokalisieren" #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit-sdm.html:35 +#: templates/web/zurich/admin/report_edit-sdm.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:24 #: templates/web/zurich/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit.html:35 #: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:47 -#: templates/web/zurich/admin/report_edit.html:49 +#: templates/web/zurich/admin/report_edit.html:44 +#: templates/web/zurich/admin/report_edit.html:46 msgid "originally entered: “%s”" msgstr "Originaltext: “%s”" @@ -4436,8 +4385,8 @@ msgstr "" #: 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/oxfordshire/header.html:82 #: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12 msgid "sign out" msgstr "ausloggen" @@ -4446,6 +4395,8 @@ msgstr "ausloggen" #: 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" @@ -4462,13 +4413,13 @@ msgstr "" msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:240 msgid "today" msgstr "heute" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:48 msgid "used map" msgstr "Karte verwendet" @@ -4492,14 +4443,14 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> Meldung in letzter Zeit" msgstr[1] "<big>%s</big> Meldungen in letzter Zeit" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:287 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:289 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4520,7 +4471,7 @@ msgid_plural "" "We do not yet have details for the councils that cover this location." msgstr[0] "" -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:283 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4552,7 +4503,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:285 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 41efc3cbe..a118ed890 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-02-20 20:23+0000\n" +"POT-Creation-Date: 2013-02-13 11:17+0000\n" "PO-Revision-Date: 2012-09-14 00:22+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -22,7 +22,7 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "X-Poedit-Basepath: ../../../\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:636 +#: perllib/FixMyStreet/DB/Result/Problem.pm:649 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:355 msgid " and " msgstr " og " @@ -73,16 +73,12 @@ msgstr "%d spørreskjema sendt – %d besvart (%s%%)" msgid "%d supporters" msgstr "" -#: templates/web/default/pagination.html:10 -msgid "%d to %d of %d" -msgstr "" - #: templates/web/default/reports/body.html:0 #: templates/web/default/reports/body.html:20 msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:685 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -90,7 +86,7 @@ msgstr "%s ref: %s" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 #, fuzzy msgid "%s, reported at %s" msgstr "%s, rapportert av %s %s" @@ -137,15 +133,15 @@ msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:22 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(lukket)" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:20 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/fixmystreet/report/_item.html:18 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(løst)" @@ -155,18 +151,19 @@ msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:16 +#: templates/web/fixmystreet/report/_item.html:14 msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" #: 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 "(valgfritt)" # Denne teksten er lite forklarende #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:15 +#: templates/web/fixmystreet/report/_item.html:13 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -178,14 +175,14 @@ 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:636 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 -#: perllib/FixMyStreet/DB/Result/Problem.pm:418 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/DB/Result/Problem.pm:431 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 -#: perllib/FixMyStreet/DB/Result/Problem.pm:424 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:437 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" @@ -323,7 +320,6 @@ msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nei</strong> La meg bekrefte min oppdatering med e-post" #: templates/web/fixmystreet/auth/general.html:50 -#: templates/web/zurich/auth/general.html:49 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, la meg logge inn med e-post:" @@ -351,7 +347,7 @@ msgstr "<strong>Ja</strong> Jeg har et passord" #: templates/web/default/static/about.html:1 #: templates/web/default/static/about.html:3 -#: templates/web/emptyhomes/header.html:30 +#: templates/web/emptyhomes/header.html:34 #: templates/web/emptyhomes/static/about.html:1 #: templates/web/emptyhomes/static/about.html:3 msgid "About us" @@ -377,7 +373,7 @@ msgstr "" msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/default/admin/users.html:36 +#: templates/web/default/admin/users.html:35 msgid "Add user" msgstr "" @@ -405,30 +401,27 @@ msgstr "Send meg varsel ved fremtidige oppdateringer" #: 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 "Alle rapporter" #: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 #: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 -#: templates/web/emptyhomes/header.html:28 +#: 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:60 +#: 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 "Alle rapporter" #: templates/web/default/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 #, fuzzy msgid "All reports between %s and %s" msgstr "%srapporter mellom %s og %s" @@ -462,6 +455,10 @@ msgstr "" #: 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 "" @@ -469,26 +466,14 @@ msgid "" msgstr "" "All informasjonen du har lagt inn her vil bli sendt til <strong>%s</strong>." -#: templates/web/emptyhomes/report/new/councils_text_all.html:2 -#: templates/web/emptyhomes/report/new/councils_text_all.html:4 -#, 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 problem." -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." - #: templates/web/default/questionnaire/index.html:60 #: templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this problem as fixed." msgstr "En oppdatering markerte dette problemet som fikset." #: templates/web/default/admin/flagged.html:15 -#: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/reports.html:17 +#: templates/web/default/admin/list_updates.html:10 +#: templates/web/default/admin/reports.html:18 msgid "Anonymous" msgstr "Anonym" @@ -520,21 +505,19 @@ msgstr "Der du fra den lokale administrasjonen?" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:111 -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/report_edit.html:109 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:120 +#: templates/web/zurich/admin/report_edit.html:118 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:152 -#: templates/web/zurich/admin/report_edit.html:99 +#: templates/web/zurich/admin/report_edit.html:150 +#: templates/web/zurich/admin/report_edit.html:97 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:97 #: templates/web/zurich/report/updates.html:11 #, fuzzy msgid "Assigned to %s" @@ -554,8 +537,8 @@ msgstr "" 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 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -573,14 +556,14 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:203 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/header.html:64 +#: templates/web/zurich/header.html:63 msgid "Bodies" msgstr "" -#: templates/web/default/admin/reports.html:15 +#: templates/web/default/admin/reports.html:16 #: templates/web/default/admin/users.html:14 msgid "Body" msgstr "" @@ -609,20 +592,20 @@ msgstr "" "Hvis du ikke kan se kartet, <a href='%s' rel='nofollow'>hopp over dette " "steget</a>." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 #: 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/flagged.html:14 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/reports.html:17 +#: 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:49 +#: templates/web/zurich/admin/index-dm.html:22 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/admin/reports.html:14 #: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategori" @@ -635,9 +618,10 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" #: templates/web/default/admin/body_edit.html:23 #: templates/web/default/admin/report_edit.html:33 #: 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:39 -#: templates/web/zurich/admin/report_edit.html:110 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit.html:108 msgid "Category:" msgstr "Kategori:" @@ -656,7 +640,6 @@ msgstr "Bytt passord" msgid "Click map to report a problem" msgstr "Klikk i kartet for å rapportere et problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:28 #: templates/web/default/dashboard/index.html:142 @@ -665,14 +648,13 @@ msgstr "Klikk i kartet for å rapportere et problem" #: 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:85 #: templates/web/zurich/admin/report_edit.html:87 -#: templates/web/zurich/admin/report_edit.html:89 -#: templates/web/zurich/admin/stats.html:30 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:778 +#: perllib/FixMyStreet/DB/Result/Problem.pm:791 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" @@ -690,14 +672,14 @@ 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/zurich/admin/report_edit-sdm.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:22 #: templates/web/zurich/admin/report_edit.html:43 msgid "Co-ordinates:" msgstr "Koordinater:" #: templates/web/default/admin/flagged.html:16 -#: templates/web/default/admin/list_updates.html:14 -#: templates/web/default/admin/reports.html:18 +#: templates/web/default/admin/list_updates.html:13 +#: templates/web/default/admin/reports.html:19 msgid "Cobrand" msgstr "Merkevaresamarbeid" @@ -753,7 +735,6 @@ msgstr "Bekreftelse" #: 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:39 msgid "Confirmed" msgstr "Bekreftet" @@ -792,8 +773,8 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1264 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1252 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -802,7 +783,7 @@ msgid "Could not look up location" msgstr "" #: templates/web/default/admin/flagged.html:13 -#: templates/web/default/admin/list_updates.html:13 +#: templates/web/default/admin/list_updates.html:12 msgid "Council" msgstr "Administrasjon" @@ -818,8 +799,6 @@ msgstr "Administrasjon:" #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:44 -#: templates/web/zurich/admin/stats.html:49 msgid "Count" msgstr "Antall" @@ -833,16 +812,16 @@ msgid "Create category" msgstr "Lag kategori" #: templates/web/default/admin/flagged.html:17 -#: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/reports.html:19 -#: templates/web/zurich/admin/list_updates.html:7 +#: templates/web/default/admin/list_updates.html:9 +#: templates/web/default/admin/reports.html:20 +#: templates/web/zurich/admin/list_updates.html:6 msgid "Created" msgstr "Opprettet" #: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit-sdm.html:34 +#: templates/web/zurich/admin/report_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Opprettet:" @@ -856,10 +835,6 @@ msgstr "Gjeldende tilstand" msgid "Dashboard" msgstr "Oversikt" -#: templates/web/zurich/admin/stats.html:34 -msgid "Dealt with by subdivision within 5 working days" -msgstr "" - #: templates/web/default/admin/body.html:38 #: templates/web/default/admin/body.html:88 #: templates/web/default/admin/body_edit.html:37 @@ -867,9 +842,9 @@ msgstr "" msgid "Deleted" msgstr "Slettet" -#: templates/web/zurich/admin/index-dm.html:22 -#: templates/web/zurich/admin/index-sdm.html:20 -#: templates/web/zurich/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:21 +#: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/reports.html:13 msgid "Description" msgstr "" @@ -883,7 +858,8 @@ msgstr "Detaljer" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 -#: templates/web/zurich/admin/report_edit-sdm.html:22 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:14 #: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/report_edit.html:32 msgid "Details:" @@ -923,10 +899,10 @@ msgstr "Vet ikke" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 +#: templates/web/default/admin/list_updates.html:35 #: templates/web/default/admin/problem_row.html:31 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:38 +#: templates/web/zurich/admin/problem_row.html:35 msgid "Edit" msgstr "Rediger" @@ -937,7 +913,6 @@ 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 msgid "Editing problem %d" @@ -962,24 +937,22 @@ msgstr "Oppdatert av" #: templates/web/default/admin/body_edit.html:83 #: templates/web/default/admin/flagged.html:12 #: templates/web/default/admin/flagged.html:35 -#: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/reports.html:14 +#: templates/web/default/admin/list_updates.html:8 +#: templates/web/default/admin/reports.html:15 #: 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 "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1240 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1237 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" @@ -999,8 +972,8 @@ msgstr "Send meg oppdateringer" #: 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:41 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:31 +#: templates/web/zurich/admin/report_edit.html:51 msgid "Email:" msgstr "E-post:" @@ -1009,15 +982,15 @@ msgstr "E-post:" msgid "Email: %s" msgstr "E-post:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Empty flat or maisonette" msgstr "Tom leilighet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -1025,11 +998,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eiendom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sykehos, etc." @@ -1086,7 +1059,6 @@ msgstr "Skriv inn et nytt passord:" #: 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 "Skriv inn et nytt passord" @@ -1224,7 +1196,7 @@ msgstr "Løst:" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flagget:" @@ -1295,7 +1267,6 @@ msgstr "Gi meg en RSS-strøm" #: templates/web/default/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 #: templates/web/seesomething/around/postcode_form.html:10 -#: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "Fortsett" @@ -1304,6 +1275,7 @@ msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" #: templates/web/default/admin/index.html:24 +#: templates/web/zurich/admin/index.html:11 msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" @@ -1329,13 +1301,13 @@ msgstr "" #: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 #: templates/web/bromley/header.html:81 templates/web/default/footer.html:15 -#: templates/web/emptyhomes/header.html:29 +#: 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:64 +#: 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/footer.html:21 @@ -1353,8 +1325,8 @@ msgstr "" #: 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/oxfordshire/header.html:81 #: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hei, %s" @@ -1364,9 +1336,8 @@ msgstr "Hei, %s" #: 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:78 -#: templates/web/zurich/admin/report_edit.html:82 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:80 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjul" @@ -1395,7 +1366,7 @@ msgstr "Hvordan rapportere et problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:699 +#: perllib/FixMyStreet/App/Controller/Admin.pm:671 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." @@ -1420,12 +1391,12 @@ msgstr "" "webadressen fra en e-post, sjekk at du har kopiert den korrekt.\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 +#: templates/web/default/admin/list_updates.html:5 +#: templates/web/default/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:20 +#: templates/web/zurich/admin/index-sdm.html:18 +#: templates/web/zurich/admin/list_updates.html:5 +#: templates/web/zurich/admin/reports.html:12 msgid "ID" msgstr "ID" @@ -1518,13 +1489,12 @@ msgstr "" "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:77 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:28 #: 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:91 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Under arbeid" @@ -1534,7 +1504,7 @@ msgstr "Under arbeid" msgid "Incident Category" msgstr "Kategori" -#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:128 #, fuzzy msgid "Include reporter personal details" msgstr "Legg inn opplysninger om problemet" @@ -1547,8 +1517,8 @@ msgstr "Inkluder ubekreftede problemer" msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" -#: templates/web/zurich/admin/report_edit-sdm.html:53 -#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:71 msgid "Internal notes:" msgstr "" @@ -1556,7 +1526,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1564,7 +1534,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1001 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1603,7 +1573,6 @@ msgstr "" #: 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 "Husk min innlogging på denne datamaskinen" @@ -1633,6 +1602,7 @@ msgstr "List alle rapporterte problemer" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 #: templates/web/seesomething/report/new/fill_in_details_form.html:25 #: templates/web/zurich/report/new/fill_in_details_form.html:51 @@ -1670,7 +1640,7 @@ msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’" #: templates/web/fixmybarangay/footer.html:22 #: templates/web/fixmystreet/footer.html:50 #: templates/web/oxfordshire/footer.html:25 -#: templates/web/oxfordshire/header.html:62 +#: templates/web/oxfordshire/header.html:71 #: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45 msgid "Local alerts" msgstr "Lokale varsler" @@ -1705,10 +1675,6 @@ msgstr "Melding:" msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" -#: templates/web/zurich/admin/stats.html:33 -msgid "Moderated by division within one working day" -msgstr "" - #: templates/web/default/admin/stats.html:11 msgid "Month" msgstr "Måned" @@ -1721,8 +1687,8 @@ msgstr "Flere problemer i nærheten" #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 -#: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/reports.html:13 +#: templates/web/default/admin/list_updates.html:7 +#: templates/web/default/admin/reports.html:14 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 @@ -1734,7 +1700,6 @@ msgstr "Flere problemer i nærheten" #: 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 "Navn" @@ -1747,9 +1712,8 @@ msgstr "(valgfritt)" #: templates/web/default/admin/report_edit.html:38 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:53 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/report_edit-sdm.html:30 +#: templates/web/zurich/admin/report_edit.html:50 msgid "Name:" msgstr "Navn:" @@ -1789,7 +1753,7 @@ 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:266 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1882,7 +1846,7 @@ msgstr "Nye rapporter innenfor grensen til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:46 #, fuzzy msgid "New update:" msgstr "Få oppdateringer" @@ -1893,17 +1857,13 @@ msgstr "Få oppdateringer" msgid "New!" msgstr "Ny!" -#: templates/web/default/pagination.html:13 -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:30 #: 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:21 #: templates/web/default/admin/report_edit.html:36 #: templates/web/default/admin/report_edit.html:49 @@ -1924,7 +1884,7 @@ msgstr "" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:414 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -1940,7 +1900,7 @@ 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:62 +#: templates/web/zurich/admin/report_edit-sdm.html:52 #, fuzzy msgid "No further updates" msgstr "Dine oppdateringer" @@ -1968,8 +1928,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:54 msgid "None" msgstr "Ingen" @@ -1982,7 +1942,7 @@ msgstr "Ingen" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:10 msgid "Not for my subdivision" msgstr "" @@ -2081,7 +2041,6 @@ msgstr "Eldre løste" msgid "Older problems" msgstr "Eldre problemer" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:71 #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 @@ -2090,8 +2049,8 @@ msgstr "Eldre problemer" #: 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:76 #: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:80 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2127,13 +2086,13 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1042 -#: 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/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:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:343 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:356 msgid "Other" @@ -2147,7 +2106,7 @@ msgstr "" "Vår kildekode er fri programvare og <a href=\"http://github.com/mysociety/" "fixmystreet\">tilgjengelig på GitHub</a>." -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:11 msgid "Owner" msgstr "Eier" @@ -2171,8 +2130,6 @@ msgstr "Delvis" #: 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 "Passord (valgfritt)" @@ -2192,9 +2149,9 @@ msgstr "Telefonnummer (valgfritt)" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:265 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:54 msgid "Phone:" msgstr "Telefon:" @@ -2203,7 +2160,6 @@ 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/stats.html:36 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" msgstr "Bilde" @@ -2211,6 +2167,7 @@ msgstr "Bilde" #: 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 "Bilde:" @@ -2230,8 +2187,8 @@ msgstr "" #: 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:78 -#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:79 msgid "Planned" msgstr "Planlagt" @@ -2264,21 +2221,19 @@ msgstr "Vennligst sjekk e-posten du oppgav" #: templates/web/fixmystreet/auth/general.html:9 #: templates/web/seesomething/auth/general.html:15 #: templates/web/seesomething/auth/general.html:9 -#: templates/web/zurich/auth/general.html:3 -#: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:844 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:851 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:870 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:913 -#: perllib/FixMyStreet/DB/Result/Problem.pm:420 +#: 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:433 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:439 msgid "Please choose a property type" msgstr "Velg en type egenskap" @@ -2313,16 +2268,9 @@ msgstr "" "rapportere et problem,\n" "vennligst <a href=\"/\">gå til forsiden</a> og følg instruksjonene." -#: templates/web/oxfordshire/report/new/notes.html:6 -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/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 " @@ -2331,7 +2279,11 @@ msgstr "" "Ikke vær ufin — å kjefte på din administrasjon skader verdien av " "tjenesten for alle brukerne." -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 +msgid "Please do not give address or personal information in this section." +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:147 #: templates/web/default/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Vennligst legg til en melding" @@ -2342,7 +2294,7 @@ msgid "Please enter a password" msgstr "Skriv inn et passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:395 +#: perllib/FixMyStreet/DB/Result/Problem.pm:408 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" @@ -2360,7 +2312,7 @@ msgstr "Legg til en gyldig e-post" msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: perllib/FixMyStreet/DB/Result/Problem.pm:411 #: templates/web/default/js/translation_strings.html:4 #: templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" @@ -2377,8 +2329,6 @@ msgstr "Legg inn opplysninger om problemet" #: templates/web/seesomething/auth/general.html:14 #: templates/web/seesomething/auth/general.html:9 #: templates/web/seesomething/js/translation_strings.html:9 -#: templates/web/zurich/auth/general.html:3 -#: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Legg inn din e-post" @@ -2393,7 +2343,7 @@ msgstr "Vennligst tast inn din e-postadresse" msgid "Please enter your first name" msgstr "Vennligst tast inn ditt fornavn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 #: templates/web/default/js/translation_strings.html:7 #: templates/web/seesomething/js/translation_strings.html:4 msgid "" @@ -2405,8 +2355,8 @@ msgstr "" "under" #: 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/Comment.pm:144 +#: perllib/FixMyStreet/DB/Result/Problem.pm:419 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2490,6 +2440,7 @@ msgstr "Vennligst fyll ut detaljer om problemet." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "" @@ -2533,6 +2484,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "" @@ -2626,16 +2578,17 @@ msgstr "Lagt inn av %s (<strong>%s</strong>) %s" msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: templates/web/default/pagination.html:7 -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:51 msgid "Private" msgstr "" +#: 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" + #: templates/web/default/maps/openlayers.html:85 msgid "Problem" msgstr "Problem" @@ -2653,11 +2606,11 @@ msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" #: templates/web/default/admin/index.html:28 -#: templates/web/zurich/admin/index.html:9 +#: templates/web/zurich/admin/index.html:15 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:916 +#: perllib/FixMyStreet/App/Controller/Admin.pm:878 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -2721,7 +2674,12 @@ 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" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 +#, fuzzy +msgid "Property address:" +msgstr "Type egenskap:" + +#: templates/web/default/report/new/category.html:8 msgid "Property type:" msgstr "Type egenskap:" @@ -2763,17 +2721,19 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:44 +msgid "Public information (shown on site)" +msgstr "" + +#: templates/web/zurich/admin/report_edit.html:160 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:69 -#: templates/web/zurich/admin/stats.html:37 +#: templates/web/zurich/admin/report_edit.html:67 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Publish the response" msgstr "" @@ -2916,18 +2876,18 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:61 +#: templates/web/default/admin/report_edit.html:62 #: templates/web/default/admin/update_edit.html:51 #: 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/emptyhomes/header.html:10 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "Rapporter tomme hjem" #: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 -#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 +#: 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 @@ -2975,7 +2935,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:606 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2987,25 +2947,25 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported by %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/DB/Result/Problem.pm:614 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -3014,11 +2974,11 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:602 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -3027,6 +2987,7 @@ msgstr "Rapportert i kategorien %s av %s %s" #: 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 @@ -3037,15 +2998,15 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 #: templates/web/seesomething/admin/stats.html:1 -#: templates/web/zurich/header.html:60 +#: templates/web/zurich/header.html:59 #, fuzzy msgid "Reports" msgstr "Alle rapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:432 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "" "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" @@ -3084,16 +3045,13 @@ msgstr "" 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:1331 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1342 -#: templates/web/default/admin/report_edit.html:57 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/default/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:63 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 -#: templates/web/default/admin/report_edit.html:58 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/default/admin/report_edit.html:59 +#: templates/web/zurich/admin/report_edit.html:64 msgid "Rotate Right" msgstr "" @@ -3111,7 +3069,7 @@ msgstr "Søk i rapporter" msgid "Search Users" msgstr "Søk i brukere" -#: templates/web/zurich/header.html:77 +#: templates/web/zurich/header.html:73 #, fuzzy msgid "Search reports" msgstr "Søk i rapporter" @@ -3141,7 +3099,7 @@ msgstr "" "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kilde, " "eller skriv inn din e-postadresse for å abonnere på et e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:711 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -3150,7 +3108,6 @@ msgid "Sent:" msgstr "Sendt:" #: templates/web/default/admin/report_edit.html:45 -#: templates/web/zurich/admin/stats.html:44 msgid "Service:" msgstr "Tjeneste:" @@ -3205,12 +3162,10 @@ msgstr "Vis nåler" #: 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:85 +#: 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 "Logg inn" @@ -3221,14 +3176,13 @@ msgstr "Logg inn via epost" #: templates/web/default/auth/general.html:1 #: templates/web/fixmystreet/auth/general.html:1 #: templates/web/seesomething/auth/general.html:1 -#: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Logg inn eller opprett en konto" #: templates/web/bromley/auth/sign_out.html:1 #: templates/web/default/auth/sign_out.html:1 #: templates/web/default/header.html:30 -#: templates/web/emptyhomes/header.html:42 +#: 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 @@ -3239,7 +3193,7 @@ msgid "Sign out" msgstr "Logg ut" #: templates/web/default/header.html:29 -#: templates/web/emptyhomes/header.html:41 +#: 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 @@ -3308,8 +3262,8 @@ msgstr "Startmåned:" #: templates/web/bromley/report/display.html:78 #: templates/web/default/admin/flagged.html:18 -#: templates/web/default/admin/list_updates.html:7 -#: templates/web/default/admin/reports.html:20 +#: templates/web/default/admin/list_updates.html:6 +#: templates/web/default/admin/reports.html:21 #: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "Tilstand" @@ -3317,22 +3271,20 @@ msgstr "Tilstand" #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:41 +#: templates/web/zurich/admin/report_edit.html:74 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1097 #: templates/web/default/admin/stats.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" 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 +#: templates/web/zurich/admin/index-dm.html:25 +#: templates/web/zurich/admin/index-sdm.html:23 +#: templates/web/zurich/admin/reports.html:17 #, fuzzy msgid "Status" msgstr "Statistikk" @@ -3359,6 +3311,7 @@ msgstr "Emne" #: 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:31 msgid "Subject:" msgstr "Emne:" @@ -3370,6 +3323,7 @@ msgstr "Emne:" #: 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 @@ -3378,11 +3332,11 @@ msgstr "Emne:" msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:65 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:61 -#: templates/web/zurich/admin/report_edit.html:180 +#: templates/web/zurich/admin/report_edit-sdm.html:51 +#: templates/web/zurich/admin/report_edit.html:172 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringer" @@ -3392,15 +3346,14 @@ msgstr "Send inn endringer" msgid "Submit questionnaire" msgstr "Send inn spørreskjema" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 #: 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:78 -#: templates/web/zurich/admin/report_edit.html:79 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 #, fuzzy msgid "Submitted" @@ -3427,13 +3380,12 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:195 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:136 #: 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 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 msgid "Summary" msgstr "Oppsummering" @@ -3447,7 +3399,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1094 #, fuzzy msgid "Survey" msgstr "Resultater fra spørreundersøkelsen" @@ -3456,8 +3408,8 @@ msgstr "Resultater fra spørreundersøkelsen" msgid "Survey Results" msgstr "Resultater fra spørreundersøkelsen" -#: templates/web/default/admin/list_updates.html:15 -#: templates/web/zurich/admin/list_updates.html:8 +#: templates/web/default/admin/list_updates.html:14 +#: templates/web/zurich/admin/list_updates.html:7 msgid "Text" msgstr "Tekst" @@ -3553,7 +3505,7 @@ msgstr "" "utenfor lander - vennligst forsøk et annet sted." # Should this be "Norge" or "Storbritannia" ? -#: perllib/FixMyStreet/App/Controller/Location.pm:123 +#: perllib/FixMyStreet/App/Controller/Location.pm:121 msgid "That location does not appear to be in the UK; please try again." msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." @@ -3562,7 +3514,7 @@ 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:670 +#: perllib/FixMyStreet/App/Controller/Admin.pm:642 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." @@ -3765,12 +3717,11 @@ msgstr "" 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:749 +#: 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 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 " @@ -3831,7 +3782,8 @@ msgstr "" "snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å " "håndtere denne saken." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:890 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Denne informasjonen er påkrevd" @@ -3890,7 +3842,6 @@ 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:65 #: templates/web/zurich/report/_main.html:14 #, fuzzy msgid "This report is awaiting moderation." @@ -3919,13 +3870,13 @@ msgid "" msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" #: templates/web/default/admin/flagged.html:10 -#: templates/web/default/admin/reports.html:12 +#: templates/web/default/admin/reports.html:13 msgid "Title" msgstr "Tittel" @@ -3975,8 +3926,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:32 +#: templates/web/zurich/admin/report_edit.html:52 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Ubekreftet" @@ -4052,31 +4003,31 @@ msgstr "Oppdater tilstanden" msgid "Update:" 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 +#: templates/web/zurich/admin/index-dm.html:24 +#: templates/web/zurich/admin/index-sdm.html:22 +#: templates/web/zurich/admin/reports.html:16 #, fuzzy msgid "Updated" msgstr "Oppdatert!" -#: perllib/FixMyStreet/App/Controller/Admin.pm:762 -#: perllib/FixMyStreet/App/Controller/Admin.pm:906 -#: perllib/FixMyStreet/App/Controller/Admin.pm:959 -#: perllib/FixMyStreet/App/Controller/Admin.pm:998 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:486 +#: perllib/FixMyStreet/App/Controller/Admin.pm:734 +#: perllib/FixMyStreet/App/Controller/Admin.pm:868 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:958 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:326 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:381 msgid "Updated!" msgstr "Oppdatert!" -#: templates/web/default/admin/list_updates.html:2 +#: templates/web/default/admin/list_updates.html:1 #: 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/admin/list_updates.html:1 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Oppdateringer" -#: perllib/FixMyStreet/DB/Result/Comment.pm:150 +#: perllib/FixMyStreet/DB/Result/Comment.pm:152 msgid "" "Updates are limited to 2000 characters in length. Please shorten your update" msgstr "" @@ -4094,18 +4045,18 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1296 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1256 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1268 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1228 msgid "User flagged" msgstr "Bruker flagget" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1095 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:151 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:68 msgid "Users" msgstr "Brukere" @@ -4116,7 +4067,7 @@ msgstr "Verdier oppdatert" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 -#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit-sdm.html:13 #: templates/web/zurich/admin/report_edit.html:19 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" @@ -4244,11 +4195,11 @@ msgid "When edited" msgstr "Når redigert" #: templates/web/default/admin/flagged.html:19 -#: templates/web/default/admin/reports.html:21 +#: templates/web/default/admin/reports.html:22 msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 msgid "Whole block of empty flats" msgstr "Hel blokk med tomme leiligheter" @@ -4310,9 +4261,9 @@ 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:30 #: 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:21 #: templates/web/default/admin/report_edit.html:35 #: templates/web/default/admin/report_edit.html:49 @@ -4386,6 +4337,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:97 #: templates/web/default/questionnaire/index.html:96 #: templates/web/default/report/new/fill_in_details_form.html:93 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90 #: templates/web/fixmystreet/questionnaire/index.html:87 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:99 #: templates/web/seesomething/report/new/fill_in_details_form.html:59 @@ -4415,6 +4367,7 @@ msgstr "Du er allerede logget ut" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 #: templates/web/zurich/report/new/fill_in_details_form.html:13 msgid "" @@ -4457,7 +4410,7 @@ 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:756 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " @@ -4508,8 +4461,6 @@ msgstr "Passord (valgfritt)" #: 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 "Din e-postadresse" @@ -4520,6 +4471,7 @@ msgstr "Din e-postadresse:" #: 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 "Din e-post" @@ -4550,7 +4502,6 @@ msgstr "Ditt etternavn" #: 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 "Ditt navn" @@ -4559,6 +4510,7 @@ msgstr "Ditt navn" #: 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 "Ditt navn:" @@ -4568,7 +4520,6 @@ msgstr "Ditt navn:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 #: templates/web/fixmystreet/report/update-form.html:94 #: templates/web/seesomething/auth/general.html:30 -#: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Ditt passord" @@ -4599,7 +4550,7 @@ msgstr "" #: templates/web/fiksgatami/nn/footer.html:6 #: templates/web/fixmystreet/footer.html:46 #: templates/web/oxfordshire/footer.html:21 -#: templates/web/oxfordshire/header.html:58 +#: templates/web/oxfordshire/header.html:63 #: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41 msgid "Your reports" msgstr "Dine oppdateringer" @@ -4621,18 +4572,18 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 #, fuzzy msgid "council ref: %s" msgstr "%s ref: %s" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:48 msgid "didn't use map" msgstr "brukte ikke kart" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 +#: perllib/FixMyStreet/DB/Result/Comment.pm:197 #, fuzzy msgid "duplicate report" msgstr "Lag en rapport" @@ -4648,13 +4599,7 @@ msgstr "for eksempel «%s» eller «%s»" msgid "from %d different users" 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:" - -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:268 msgid "less than a minute" msgstr "mindre enn et minutt" @@ -4677,7 +4622,7 @@ msgstr "n/a" msgid "no further action" msgstr "Dine oppdateringer" -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 +#: perllib/FixMyStreet/DB/Result/Comment.pm:195 msgid "not the council's responsibility" msgstr "" @@ -4693,16 +4638,16 @@ 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:24 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit-sdm.html:35 +#: templates/web/zurich/admin/report_edit-sdm.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:24 #: templates/web/zurich/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit.html:35 #: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:47 -#: templates/web/zurich/admin/report_edit.html:49 +#: templates/web/zurich/admin/report_edit.html:44 +#: templates/web/zurich/admin/report_edit.html:46 #, fuzzy msgid "originally entered: “%s”" msgstr "søkte etter" @@ -4720,8 +4665,8 @@ msgstr "åpnet på nytt" #: 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/oxfordshire/header.html:82 #: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12 msgid "sign out" msgstr "logg ut" @@ -4730,6 +4675,8 @@ msgstr "logg ut" #: 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" @@ -4744,13 +4691,13 @@ msgstr "" msgid "this type of local problem" msgstr "denne type lokalt problem" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:240 msgid "today" msgstr "idag" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:48 msgid "used map" msgstr "brukte kart" @@ -4774,14 +4721,14 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> rapportert<br>nylig" msgstr[1] "<big>%s</big> rapportert<br>nylig" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:287 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timer" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:289 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4805,7 +4752,7 @@ msgstr[0] "" msgstr[1] "" "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:283 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4841,13 +4788,24 @@ msgstr[1] "" "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene " "som dekker dette stedet." -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:285 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dager" +#~ 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 "Enter a nearby GB postcode, or street name and area" #~ msgstr "Skriv inn GB-postnummer i nærheten, eller veinavn og sted" @@ -4947,6 +4905,13 @@ msgstr[1] "%d dager" #~ msgid "Search Abuse Table" #~ msgstr "Søk i misbrukstabell" +#~ 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." + #~ msgid "the map was not used so pin location may be inaccurate" #~ msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 258b11da0..ce2589ebb 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-02-20 20:23+0000\n" +"POT-Creation-Date: 2013-02-13 11:17+0000\n" "PO-Revision-Date: 2011-12-08 10:56+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:636 +#: perllib/FixMyStreet/DB/Result/Problem.pm:649 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:355 msgid " and " msgstr " og " @@ -72,16 +72,12 @@ msgstr "%d spørjeskjema sendt – %d svart (%s%%)" msgid "%d supporters" msgstr "" -#: templates/web/default/pagination.html:10 -msgid "%d to %d of %d" -msgstr "" - #: templates/web/default/reports/body.html:0 #: templates/web/default/reports/body.html:20 msgid "%s - Summary reports" msgstr "%s – oppsummeringsrapportar" -#: perllib/FixMyStreet/DB/Result/Problem.pm:685 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "%s ref: %s" msgstr "" @@ -89,7 +85,7 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 #, fuzzy msgid "%s, reported at %s" msgstr "%s, rapportert av %s %s" @@ -136,16 +132,16 @@ msgstr "(alternativt kan RSS-straumen tilpassast, innanfor" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:22 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 #, fuzzy msgid "(closed)" msgstr "Lukka" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:20 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/fixmystreet/report/_item.html:18 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(løyst)" @@ -155,17 +151,18 @@ msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:16 +#: templates/web/fixmystreet/report/_item.html:14 msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" #: 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 "(valfritt)" #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:15 +#: templates/web/fixmystreet/report/_item.html:13 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -177,14 +174,14 @@ 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:636 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 -#: perllib/FixMyStreet/DB/Result/Problem.pm:418 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:661 +#: perllib/FixMyStreet/DB/Result/Problem.pm:431 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 -#: perllib/FixMyStreet/DB/Result/Problem.pm:424 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:437 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" @@ -325,7 +322,6 @@ msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" #: templates/web/fixmystreet/auth/general.html:50 -#: templates/web/zurich/auth/general.html:49 #, fuzzy msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" @@ -355,7 +351,7 @@ msgstr "<strong>Ja</strong>, eg har eit passord:" #: templates/web/default/static/about.html:1 #: templates/web/default/static/about.html:3 -#: templates/web/emptyhomes/header.html:30 +#: templates/web/emptyhomes/header.html:34 #: templates/web/emptyhomes/static/about.html:1 #: templates/web/emptyhomes/static/about.html:3 msgid "About us" @@ -381,7 +377,7 @@ msgstr "" msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/default/admin/users.html:36 +#: templates/web/default/admin/users.html:35 msgid "Add user" msgstr "" @@ -409,7 +405,6 @@ msgstr "Send meg varsel ved framtidige oppdateringar" #: 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 #, fuzzy msgid "All Reports" @@ -417,23 +412,21 @@ msgstr "Alle rapportar" #: 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:28 +#: 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:60 +#: 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 "Alle rapportar" #: templates/web/default/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 #, fuzzy msgid "All reports between %s and %s" msgstr "%srapportar mellom %s og %s" @@ -469,6 +462,10 @@ msgstr "" #: 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 "" @@ -476,25 +473,14 @@ msgid "" msgstr "" "All informasjonen du har lagt inn her vil sendast til <strong>%s</strong>." -#: templates/web/emptyhomes/report/new/councils_text_all.html:2 -#: templates/web/emptyhomes/report/new/councils_text_all.html:4 -#, 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 problem." -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." - #: templates/web/default/questionnaire/index.html:60 #: templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this problem as fixed." msgstr "Ei oppdatering markerte dette problemet som løyst." #: templates/web/default/admin/flagged.html:15 -#: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/reports.html:17 +#: templates/web/default/admin/list_updates.html:10 +#: templates/web/default/admin/reports.html:18 msgid "Anonymous" msgstr "Anonym" @@ -526,21 +512,19 @@ msgstr "den lokale administrasjonen" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:111 -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/report_edit.html:109 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:120 +#: templates/web/zurich/admin/report_edit.html:118 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:152 -#: templates/web/zurich/admin/report_edit.html:99 +#: templates/web/zurich/admin/report_edit.html:150 +#: templates/web/zurich/admin/report_edit.html:97 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:97 #: templates/web/zurich/report/updates.html:11 #, fuzzy msgid "Assigned to %s" @@ -560,8 +544,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "For augneblunken går det berre an å søkja etter og å sjå på rapportar." -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -579,14 +563,14 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:203 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/header.html:64 +#: templates/web/zurich/header.html:63 msgid "Bodies" msgstr "" -#: templates/web/default/admin/reports.html:15 +#: templates/web/default/admin/reports.html:16 #: templates/web/default/admin/users.html:14 msgid "Body" msgstr "" @@ -616,20 +600,20 @@ msgstr "" "<small>Viss du ikkje kan sjå kartet, <a href='%s' rel='nofollow'>hopp over " "dette steget</a>.</small>" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 #: 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/flagged.html:14 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/reports.html:17 +#: 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:49 +#: templates/web/zurich/admin/index-dm.html:22 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/admin/reports.html:14 #: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategori" @@ -642,9 +626,10 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" #: templates/web/default/admin/body_edit.html:23 #: templates/web/default/admin/report_edit.html:33 #: 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:39 -#: templates/web/zurich/admin/report_edit.html:110 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit.html:108 msgid "Category:" msgstr "Kategori:" @@ -664,7 +649,6 @@ msgstr "Byt passord" msgid "Click map to report a problem" msgstr "Korleis rapportera eit problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:28 #: templates/web/default/dashboard/index.html:142 @@ -673,15 +657,14 @@ msgstr "Korleis rapportera eit problem" #: 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:85 #: templates/web/zurich/admin/report_edit.html:87 -#: templates/web/zurich/admin/report_edit.html:89 -#: templates/web/zurich/admin/stats.html:30 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Lukka" # skal det vera forskjellig tyding frå engelsken her? --KBU -#: perllib/FixMyStreet/DB/Result/Problem.pm:778 +#: perllib/FixMyStreet/DB/Result/Problem.pm:791 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -699,14 +682,14 @@ 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/zurich/admin/report_edit-sdm.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:22 #: templates/web/zurich/admin/report_edit.html:43 msgid "Co-ordinates:" msgstr "Koordinatar:" #: templates/web/default/admin/flagged.html:16 -#: templates/web/default/admin/list_updates.html:14 -#: templates/web/default/admin/reports.html:18 +#: templates/web/default/admin/list_updates.html:13 +#: templates/web/default/admin/reports.html:19 msgid "Cobrand" msgstr "Merkevaresamarbeid" @@ -762,7 +745,6 @@ msgstr "Stadfesting" #: 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:39 msgid "Confirmed" msgstr "Stadfesta" @@ -801,8 +783,8 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppa" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1264 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1252 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -811,7 +793,7 @@ msgid "Could not look up location" msgstr "" #: templates/web/default/admin/flagged.html:13 -#: templates/web/default/admin/list_updates.html:13 +#: templates/web/default/admin/list_updates.html:12 msgid "Council" msgstr "Administrasjon" @@ -827,8 +809,6 @@ msgstr "Administrasjon:" #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:44 -#: templates/web/zurich/admin/stats.html:49 msgid "Count" msgstr "Mengd" @@ -842,16 +822,16 @@ msgid "Create category" msgstr "Lag kategori" #: templates/web/default/admin/flagged.html:17 -#: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/reports.html:19 -#: templates/web/zurich/admin/list_updates.html:7 +#: templates/web/default/admin/list_updates.html:9 +#: templates/web/default/admin/reports.html:20 +#: templates/web/zurich/admin/list_updates.html:6 msgid "Created" msgstr "Oppretta" #: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:44 -#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit-sdm.html:34 +#: templates/web/zurich/admin/report_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Oppretta:" @@ -865,10 +845,6 @@ msgstr "Gjeldande tilstand" msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:34 -msgid "Dealt with by subdivision within 5 working days" -msgstr "" - #: templates/web/default/admin/body.html:38 #: templates/web/default/admin/body.html:88 #: templates/web/default/admin/body_edit.html:37 @@ -876,9 +852,9 @@ msgstr "" msgid "Deleted" msgstr "Sletta" -#: templates/web/zurich/admin/index-dm.html:22 -#: templates/web/zurich/admin/index-sdm.html:20 -#: templates/web/zurich/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:21 +#: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/reports.html:13 msgid "Description" msgstr "" @@ -893,7 +869,8 @@ msgstr "Detaljar:" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 -#: templates/web/zurich/admin/report_edit-sdm.html:22 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 +#: templates/web/zurich/admin/report_edit-sdm.html:14 #: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/report_edit.html:32 msgid "Details:" @@ -933,10 +910,10 @@ msgstr "Veit ikkje" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:36 +#: templates/web/default/admin/list_updates.html:35 #: templates/web/default/admin/problem_row.html:31 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:38 +#: templates/web/zurich/admin/problem_row.html:35 msgid "Edit" msgstr "Rediger" @@ -947,7 +924,6 @@ 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 msgid "Editing problem %d" @@ -972,24 +948,22 @@ msgstr "Oppdatert av" #: templates/web/default/admin/body_edit.html:83 #: templates/web/default/admin/flagged.html:12 #: templates/web/default/admin/flagged.html:35 -#: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/reports.html:14 +#: templates/web/default/admin/list_updates.html:8 +#: templates/web/default/admin/reports.html:15 #: 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 "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1240 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1237 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" @@ -1009,8 +983,8 @@ msgstr "Send meg oppdateringar" #: 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:41 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:31 +#: templates/web/zurich/admin/report_edit.html:51 msgid "Email:" msgstr "E-post:" @@ -1019,15 +993,15 @@ msgstr "E-post:" msgid "Email: %s" msgstr "E-post:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Empty flat or maisonette" msgstr "Tom leilegheit" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -1035,11 +1009,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eigedom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentleg bygning – skule, sjukehus, osb." @@ -1095,7 +1069,6 @@ msgstr "Skriv inn eit nytt passord:" #: 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 #, fuzzy msgid "Enter a password" msgstr "Skriv inn eit nytt passord:" @@ -1237,7 +1210,7 @@ msgstr "Løyst:" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flagga:" @@ -1311,7 +1284,6 @@ msgstr "Gje meg ein RSS-straum" #: templates/web/default/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 #: templates/web/seesomething/around/postcode_form.html:10 -#: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "Hald fram" @@ -1320,6 +1292,7 @@ msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" #: templates/web/default/admin/index.html:24 +#: templates/web/zurich/admin/index.html:11 msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" @@ -1345,13 +1318,13 @@ msgstr "" #: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 #: templates/web/bromley/header.html:81 templates/web/default/footer.html:15 -#: templates/web/emptyhomes/header.html:29 +#: 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:64 +#: 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/footer.html:21 @@ -1368,8 +1341,8 @@ msgstr "Her er dei ulike typane lokale problemvarsel for «%s»." #: 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/oxfordshire/header.html:81 #: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" @@ -1379,9 +1352,8 @@ msgstr "" #: 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:78 -#: templates/web/zurich/admin/report_edit.html:82 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:80 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjult" @@ -1410,7 +1382,7 @@ msgstr "Korleis rapportera eit problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:699 +#: perllib/FixMyStreet/App/Controller/Admin.pm:671 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." @@ -1435,12 +1407,12 @@ msgstr "" "nettadressa frå ein e-post, sjekk at du har kopiert ho korrekt.\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 +#: templates/web/default/admin/list_updates.html:5 +#: templates/web/default/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:20 +#: templates/web/zurich/admin/index-sdm.html:18 +#: templates/web/zurich/admin/list_updates.html:5 +#: templates/web/zurich/admin/reports.html:12 msgid "ID" msgstr "ID" @@ -1534,13 +1506,12 @@ msgstr "" "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:77 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:28 #: 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:91 +#: templates/web/zurich/admin/report_edit.html:89 #: templates/web/zurich/report/banner.html:15 #, fuzzy msgid "In progress" @@ -1551,7 +1522,7 @@ msgstr "Under arbeid" msgid "Incident Category" msgstr "Kategori" -#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:128 #, fuzzy msgid "Include reporter personal details" msgstr "Ver venleg og legg inn opplysningar om problemet" @@ -1564,8 +1535,8 @@ msgstr "Inkluder ikkje-stadfesta problem" msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi «%s»" -#: templates/web/zurich/admin/report_edit-sdm.html:53 -#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:71 msgid "Internal notes:" msgstr "" @@ -1573,7 +1544,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1581,7 +1552,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1001 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1620,7 +1591,6 @@ msgstr "" #: 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 "Hugs mi innlogging på denne datamaskina" @@ -1651,6 +1621,7 @@ msgstr "Vis alle rapporterte problem" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 #: templates/web/seesomething/report/new/fill_in_details_form.html:25 #: templates/web/zurich/report/new/fill_in_details_form.html:51 @@ -1688,7 +1659,7 @@ msgstr "Lokal RSS-straum og e-postvarsel for «%s»" #: templates/web/fixmybarangay/footer.html:22 #: templates/web/fixmystreet/footer.html:50 #: templates/web/oxfordshire/footer.html:25 -#: templates/web/oxfordshire/header.html:62 +#: templates/web/oxfordshire/header.html:71 #: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45 msgid "Local alerts" msgstr "Lokale varsel" @@ -1724,10 +1695,6 @@ msgstr "Melding:" msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" -#: templates/web/zurich/admin/stats.html:33 -msgid "Moderated by division within one working day" -msgstr "" - #: templates/web/default/admin/stats.html:11 msgid "Month" msgstr "Månad" @@ -1740,8 +1707,8 @@ msgstr "Fleire problem i nærleiken" #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 -#: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/reports.html:13 +#: templates/web/default/admin/list_updates.html:7 +#: templates/web/default/admin/reports.html:14 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 @@ -1753,7 +1720,6 @@ msgstr "Fleire problem i nærleiken" #: 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 "Namn" @@ -1766,9 +1732,8 @@ msgstr "(valfritt)" #: templates/web/default/admin/report_edit.html:38 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:40 -#: templates/web/zurich/admin/report_edit.html:53 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/report_edit-sdm.html:30 +#: templates/web/zurich/admin/report_edit.html:50 msgid "Name:" msgstr "Namn:" @@ -1808,7 +1773,7 @@ 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:266 #, fuzzy msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " @@ -1902,7 +1867,7 @@ msgstr "Nye rapportar innanfor grensa til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:46 #, fuzzy msgid "New update:" msgstr "Siste oppdatering:" @@ -1913,17 +1878,13 @@ msgstr "Siste oppdatering:" msgid "New!" msgstr "Ny!" -#: templates/web/default/pagination.html:13 -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:30 #: 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:21 #: templates/web/default/admin/report_edit.html:36 #: templates/web/default/admin/report_edit.html:49 @@ -1944,7 +1905,7 @@ msgstr "" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:414 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -1960,7 +1921,7 @@ msgstr "Fann ingen flagga problem" msgid "No flagged users found" msgstr "Fann ingen flagga brukarar" -#: templates/web/zurich/admin/report_edit-sdm.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:52 #, fuzzy msgid "No further updates" msgstr "Oppdateringane dine" @@ -1988,8 +1949,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:54 msgid "None" msgstr "Ingen" @@ -2002,7 +1963,7 @@ msgstr "Ingen" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:10 msgid "Not for my subdivision" msgstr "" @@ -2105,7 +2066,6 @@ msgstr "Eldre løyste" msgid "Older problems" msgstr "Eldre problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:71 #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 @@ -2114,8 +2074,8 @@ msgstr "Eldre problem" #: 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:76 #: templates/web/zurich/admin/report_edit.html:78 -#: templates/web/zurich/admin/report_edit.html:80 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2151,13 +2111,13 @@ msgstr "" "Eller du kan abonnera på varsel basert på bydel eller administrasjon du " "høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1042 -#: 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/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:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:343 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:356 msgid "Other" @@ -2171,7 +2131,7 @@ msgstr "" "Kjeldekoda vår er fri programvare og <a href=\"http://github.com/mysociety/" "fixmystreet\">tilgjengeleg på GitHub</a>." -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:11 msgid "Owner" msgstr "Eigar" @@ -2195,8 +2155,6 @@ msgstr "Delvis" #: 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 #, fuzzy msgid "Password (optional)" msgstr "(valfritt)" @@ -2218,9 +2176,9 @@ msgstr "(valfritt)" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:265 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:57 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:54 msgid "Phone:" msgstr "Telefon:" @@ -2229,7 +2187,6 @@ 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/stats.html:36 #: templates/web/zurich/report/new/fill_in_details_form.html:68 #, fuzzy msgid "Photo" @@ -2238,6 +2195,7 @@ msgstr "Bilete:" #: 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 "Bilete:" @@ -2257,8 +2215,8 @@ msgstr "" #: 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:78 -#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:79 msgid "Planned" msgstr "Planlagt" @@ -2290,21 +2248,19 @@ msgstr "Ver venleg og sjekk e-posten du oppgav" #: templates/web/fixmystreet/auth/general.html:9 #: templates/web/seesomething/auth/general.html:15 #: templates/web/seesomething/auth/general.html:9 -#: templates/web/zurich/auth/general.html:3 -#: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:844 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:851 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:870 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:913 -#: perllib/FixMyStreet/DB/Result/Problem.pm:420 +#: 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:433 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:439 msgid "Please choose a property type" msgstr "Vel ein type eigenskap" @@ -2336,16 +2292,9 @@ msgstr "" "administrasjon. For å rapportera eit problem, ver venleg og <a href=\"/\">gå " "til forsida</a> og følg instruksjonane." -#: templates/web/oxfordshire/report/new/notes.html:6 -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." - #: 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 " @@ -2354,7 +2303,11 @@ msgstr "" "Ikkje ver ufin — å kjefta på administrasjonen din skader verdet av " "tenesta for alle brukarane." -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:46 +msgid "Please do not give address or personal information in this section." +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:147 #: templates/web/default/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" @@ -2365,7 +2318,7 @@ msgid "Please enter a password" msgstr "Skriv inn eit passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:395 +#: perllib/FixMyStreet/DB/Result/Problem.pm:408 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" @@ -2383,7 +2336,7 @@ msgstr "Ver venleg og legg til ein gyldig e-post" msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: perllib/FixMyStreet/DB/Result/Problem.pm:411 #: templates/web/default/js/translation_strings.html:4 #: templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" @@ -2400,8 +2353,6 @@ msgstr "Ver venleg og legg inn opplysningar om problemet" #: templates/web/seesomething/auth/general.html:14 #: templates/web/seesomething/auth/general.html:9 #: templates/web/seesomething/js/translation_strings.html:9 -#: templates/web/zurich/auth/general.html:3 -#: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" @@ -2418,7 +2369,7 @@ msgstr "Ver venleg og legg inn e-posten din" msgid "Please enter your first name" msgstr "Ver venleg og legg inn namnet ditt" -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 #: templates/web/default/js/translation_strings.html:7 #: templates/web/seesomething/js/translation_strings.html:4 #, fuzzy @@ -2431,8 +2382,8 @@ msgstr "" "visast." #: 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/Comment.pm:144 +#: perllib/FixMyStreet/DB/Result/Problem.pm:419 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2517,6 +2468,7 @@ msgstr "Ver venleg og fyll ut detaljar om problemet under." #: 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 "" @@ -2559,6 +2511,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "" @@ -2654,16 +2607,17 @@ msgstr "Lagt inn av %s (<strong>%s</strong>) %s" msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: templates/web/default/pagination.html:7 -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:51 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." + #: templates/web/default/maps/openlayers.html:85 msgid "Problem" msgstr "Problem" @@ -2681,11 +2635,11 @@ msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" #: templates/web/default/admin/index.html:28 -#: templates/web/zurich/admin/index.html:9 +#: templates/web/zurich/admin/index.html:15 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:916 +#: perllib/FixMyStreet/App/Controller/Admin.pm:878 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2750,7 +2704,12 @@ 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" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 +#, fuzzy +msgid "Property address:" +msgstr "Type eigenskap:" + +#: templates/web/default/report/new/category.html:8 msgid "Property type:" msgstr "Type eigenskap:" @@ -2794,17 +2753,19 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:44 +msgid "Public information (shown on site)" +msgstr "" + +#: templates/web/zurich/admin/report_edit.html:160 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:69 -#: templates/web/zurich/admin/stats.html:37 +#: templates/web/zurich/admin/report_edit.html:67 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:178 +#: templates/web/zurich/admin/report_edit.html:170 msgid "Publish the response" msgstr "" @@ -2948,18 +2909,18 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:61 +#: templates/web/default/admin/report_edit.html:62 #: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilete (kan ikkje gjerast om!)" -#: templates/web/emptyhomes/header.html:10 +#: templates/web/emptyhomes/header.html:12 msgid "Report Empty Homes" msgstr "Rapporter tomme heimar" #: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 -#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 +#: 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 @@ -3009,7 +2970,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:606 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -3021,25 +2982,25 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported by %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/DB/Result/Problem.pm:614 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -3048,11 +3009,11 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:602 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -3061,6 +3022,7 @@ msgstr "Rapportert i kategorien %s av %s %s" #: 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 @@ -3071,15 +3033,15 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 #: templates/web/seesomething/admin/stats.html:1 -#: templates/web/zurich/header.html:60 +#: templates/web/zurich/header.html:59 #, fuzzy msgid "Reports" msgstr "Alle rapportar" -#: perllib/FixMyStreet/DB/Result/Problem.pm:432 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "" "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" @@ -3118,16 +3080,13 @@ msgstr "" 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:1331 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1342 -#: templates/web/default/admin/report_edit.html:57 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/default/admin/report_edit.html:58 +#: templates/web/zurich/admin/report_edit.html:63 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 -#: templates/web/default/admin/report_edit.html:58 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/default/admin/report_edit.html:59 +#: templates/web/zurich/admin/report_edit.html:64 msgid "Rotate Right" msgstr "" @@ -3145,7 +3104,7 @@ msgstr "Søk i rapportar" msgid "Search Users" msgstr "Søk i brukarar" -#: templates/web/zurich/header.html:77 +#: templates/web/zurich/header.html:73 #, fuzzy msgid "Search reports" msgstr "Søk i rapportar" @@ -3175,7 +3134,7 @@ msgstr "" "Vel kva for ein type varsel du ynskjer og klikk på knappen for ei RSS-" "kjelde, eller skriv inn e-postadressa di for å abonnera på eit e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:711 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -3184,7 +3143,6 @@ msgid "Sent:" msgstr "Sendt:" #: templates/web/default/admin/report_edit.html:45 -#: templates/web/zurich/admin/stats.html:44 msgid "Service:" msgstr "Teneste:" @@ -3239,12 +3197,10 @@ msgstr "Vis nåler" #: 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:85 +#: 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 "Logg inn" @@ -3255,14 +3211,13 @@ msgstr "Logg inn via epost" #: templates/web/default/auth/general.html:1 #: templates/web/fixmystreet/auth/general.html:1 #: templates/web/seesomething/auth/general.html:1 -#: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Logg inn eller opprett ein konto" #: templates/web/bromley/auth/sign_out.html:1 #: templates/web/default/auth/sign_out.html:1 #: templates/web/default/header.html:30 -#: templates/web/emptyhomes/header.html:42 +#: 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 @@ -3273,7 +3228,7 @@ msgid "Sign out" msgstr "Logg ut" #: templates/web/default/header.html:29 -#: templates/web/emptyhomes/header.html:41 +#: 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 @@ -3343,8 +3298,8 @@ msgstr "Startmånad:" #: templates/web/bromley/report/display.html:78 #: templates/web/default/admin/flagged.html:18 -#: templates/web/default/admin/list_updates.html:7 -#: templates/web/default/admin/reports.html:20 +#: templates/web/default/admin/list_updates.html:6 +#: templates/web/default/admin/reports.html:21 #: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "Tilstand" @@ -3352,22 +3307,20 @@ msgstr "Tilstand" #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit-sdm.html:41 +#: templates/web/zurich/admin/report_edit.html:74 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1097 #: templates/web/default/admin/stats.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" 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 +#: templates/web/zurich/admin/index-dm.html:25 +#: templates/web/zurich/admin/index-sdm.html:23 +#: templates/web/zurich/admin/reports.html:17 #, fuzzy msgid "Status" msgstr "Statistikk" @@ -3396,6 +3349,7 @@ msgstr "Emne:" #: 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:31 msgid "Subject:" msgstr "Emne:" @@ -3407,6 +3361,7 @@ msgstr "Emne:" #: 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 @@ -3415,11 +3370,11 @@ msgstr "Emne:" msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:64 +#: templates/web/default/admin/report_edit.html:65 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:61 -#: templates/web/zurich/admin/report_edit.html:180 +#: templates/web/zurich/admin/report_edit-sdm.html:51 +#: templates/web/zurich/admin/report_edit.html:172 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringar" @@ -3429,15 +3384,14 @@ msgstr "Send inn endringar" msgid "Submit questionnaire" msgstr "Send inn spørjeskjema" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 #: 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:78 -#: templates/web/zurich/admin/report_edit.html:79 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 #, fuzzy msgid "Submitted" @@ -3464,13 +3418,12 @@ msgstr "" "Eller du kan abonnera på varsel basert på bydel eller administrasjon du " "høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:195 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:136 #: 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 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 msgid "Summary" msgstr "Oppsummering" @@ -3484,7 +3437,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1094 #, fuzzy msgid "Survey" msgstr "Resultat frå spørjeundersøkinga" @@ -3493,8 +3446,8 @@ msgstr "Resultat frå spørjeundersøkinga" msgid "Survey Results" msgstr "Resultat frå spørjeundersøkinga" -#: templates/web/default/admin/list_updates.html:15 -#: templates/web/zurich/admin/list_updates.html:8 +#: templates/web/default/admin/list_updates.html:14 +#: templates/web/zurich/admin/list_updates.html:7 msgid "Text" msgstr "Tekst" @@ -3593,7 +3546,7 @@ msgstr "" "Den staden vert ikkje dekt av nokon administrasjon, kanskje det er til\n" "havs – ver venleg og prøv ein meir spesifikk stad." -#: perllib/FixMyStreet/App/Controller/Location.pm:123 +#: perllib/FixMyStreet/App/Controller/Location.pm:121 #, fuzzy msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3604,7 +3557,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:670 +#: perllib/FixMyStreet/App/Controller/Admin.pm:642 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." @@ -3811,12 +3764,11 @@ msgstr "" "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv " "igjen seinare." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:749 +#: 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 #, fuzzy msgid "" "There was a problem with your email/password combination. If you cannot " @@ -3879,7 +3831,8 @@ msgstr "" "og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera " "denne saka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:890 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 #: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -3938,7 +3891,6 @@ 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:65 #: templates/web/zurich/report/_main.html:14 #, fuzzy msgid "This report is awaiting moderation." @@ -3967,13 +3919,13 @@ msgid "" msgstr "" "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" #: templates/web/default/admin/flagged.html:10 -#: templates/web/default/admin/reports.html:12 +#: templates/web/default/admin/reports.html:13 msgid "Title" msgstr "Tittel" @@ -4026,8 +3978,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:42 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:32 +#: templates/web/zurich/admin/report_edit.html:52 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Ikkje stadfesta" @@ -4105,31 +4057,31 @@ msgstr "Oppdater tilstanden" msgid "Update:" 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 +#: templates/web/zurich/admin/index-dm.html:24 +#: templates/web/zurich/admin/index-sdm.html:22 +#: templates/web/zurich/admin/reports.html:16 #, fuzzy msgid "Updated" msgstr "Oppdatert!" -#: perllib/FixMyStreet/App/Controller/Admin.pm:762 -#: perllib/FixMyStreet/App/Controller/Admin.pm:906 -#: perllib/FixMyStreet/App/Controller/Admin.pm:959 -#: perllib/FixMyStreet/App/Controller/Admin.pm:998 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:486 +#: perllib/FixMyStreet/App/Controller/Admin.pm:734 +#: perllib/FixMyStreet/App/Controller/Admin.pm:868 +#: perllib/FixMyStreet/App/Controller/Admin.pm:919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:958 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:326 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:381 msgid "Updated!" msgstr "Oppdatert!" -#: templates/web/default/admin/list_updates.html:2 +#: templates/web/default/admin/list_updates.html:1 #: 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/admin/list_updates.html:1 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Oppdateringar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:150 +#: perllib/FixMyStreet/DB/Result/Comment.pm:152 msgid "" "Updates are limited to 2000 characters in length. Please shorten your update" msgstr "" @@ -4147,18 +4099,18 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringar til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1296 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1256 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1268 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1228 msgid "User flagged" msgstr "Brukar flagga" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1095 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:151 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:68 msgid "Users" msgstr "Brukarar" @@ -4169,7 +4121,7 @@ msgstr "Verdi oppdatert" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 -#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit-sdm.html:13 #: templates/web/zurich/admin/report_edit.html:19 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" @@ -4302,11 +4254,11 @@ msgid "When edited" msgstr "Når redigert" #: templates/web/default/admin/flagged.html:19 -#: templates/web/default/admin/reports.html:21 +#: templates/web/default/admin/reports.html:22 msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 msgid "Whole block of empty flats" msgstr "Heil blokk med tomme leilegheiter" @@ -4367,9 +4319,9 @@ 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:30 #: 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:21 #: templates/web/default/admin/report_edit.html:35 #: templates/web/default/admin/report_edit.html:49 @@ -4444,6 +4396,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:97 #: templates/web/default/questionnaire/index.html:96 #: templates/web/default/report/new/fill_in_details_form.html:93 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90 #: templates/web/fixmystreet/questionnaire/index.html:87 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:99 #: templates/web/seesomething/report/new/fill_in_details_form.html:59 @@ -4473,6 +4426,7 @@ msgstr "Du er allereie logga ut" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 #: templates/web/zurich/report/new/fill_in_details_form.html:13 #, fuzzy @@ -4515,7 +4469,7 @@ 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:756 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " @@ -4567,8 +4521,6 @@ msgstr "(valfritt)" #: 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 #, fuzzy msgid "Your email address" msgstr "e-postadressa di:" @@ -4580,6 +4532,7 @@ msgstr "e-postadressa di:" #: 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 "E-posten din" @@ -4613,7 +4566,6 @@ msgstr "Namnet ditt:" #: 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 #, fuzzy msgid "Your name" @@ -4623,6 +4575,7 @@ msgstr "Namnet ditt:" #: 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 "Namnet ditt:" @@ -4632,7 +4585,6 @@ msgstr "Namnet ditt:" #: 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 #, fuzzy msgid "Your password" msgstr "Rapportane dine" @@ -4665,7 +4617,7 @@ msgstr "" #: templates/web/fiksgatami/nn/footer.html:6 #: templates/web/fixmystreet/footer.html:46 #: templates/web/oxfordshire/footer.html:21 -#: templates/web/oxfordshire/header.html:58 +#: templates/web/oxfordshire/header.html:63 #: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41 msgid "Your reports" msgstr "Oppdateringane dine" @@ -4687,17 +4639,17 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:48 msgid "didn't use map" msgstr "brukte ikkje kart" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 +#: perllib/FixMyStreet/DB/Result/Comment.pm:197 #, fuzzy msgid "duplicate report" msgstr "Lag ein rapport" @@ -4713,13 +4665,7 @@ msgstr "" msgid "from %d different users" 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:" - -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:268 msgid "less than a minute" msgstr "mindre enn eitt minutt" @@ -4742,7 +4688,7 @@ msgstr "i/t" msgid "no further action" msgstr "Oppdateringane dine" -#: perllib/FixMyStreet/DB/Result/Comment.pm:193 +#: perllib/FixMyStreet/DB/Result/Comment.pm:195 msgid "not the council's responsibility" msgstr "" @@ -4758,16 +4704,16 @@ 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:24 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit-sdm.html:35 +#: templates/web/zurich/admin/report_edit-sdm.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit-sdm.html:25 #: templates/web/zurich/admin/report_edit.html:24 #: templates/web/zurich/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit.html:35 #: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:47 -#: templates/web/zurich/admin/report_edit.html:49 +#: templates/web/zurich/admin/report_edit.html:44 +#: templates/web/zurich/admin/report_edit.html:46 #, fuzzy msgid "originally entered: “%s”" msgstr "søkte etter" @@ -4785,8 +4731,8 @@ msgstr "opna på nytt" #: 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/oxfordshire/header.html:82 #: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12 #, fuzzy msgid "sign out" @@ -4796,6 +4742,8 @@ msgstr "Logg ut" #: 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" @@ -4810,13 +4758,13 @@ msgstr "" msgid "this type of local problem" msgstr "denne typen lokalt problem" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:240 msgid "today" msgstr "i dag" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:37 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:48 msgid "used map" msgstr "brukte kart" @@ -4840,14 +4788,14 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> rapport nyleg" msgstr[1] "<big>%s</big> rapportar nyleg" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:287 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timar" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:289 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4871,7 +4819,7 @@ msgstr[0] "" msgstr[1] "" "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden." -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:283 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4907,13 +4855,22 @@ msgstr[1] "" "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane " "som dekkjer denne staden." -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:285 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dager" +#~ 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." + # GB – Great Britain? --KBU #~ msgid "Enter a nearby GB postcode, or street name and area" #~ msgstr "Skriv inn GB-postnummer i nærleiken, eller vegnamn og stad" @@ -5013,6 +4970,13 @@ msgstr[1] "%d dager" #~ msgid "Search Abuse Table" #~ msgstr "Søk i misbruktabell" +#~ 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." + #~ msgid "the map was not used so pin location may be inaccurate" #~ msgstr "karta vart ikkje brukt, så nåleposisjon kan vera unøyaktig" diff --git a/perllib/CronFns.pm b/perllib/CronFns.pm index 6bf698d2b..878482339 100755 --- a/perllib/CronFns.pm +++ b/perllib/CronFns.pm @@ -24,10 +24,12 @@ sub options { die "Either no arguments, --nomail or --verbose" if (@ARGV>1); my $nomail = 0; my $verbose = 0; + my $debug = 0; $nomail = 1 if (@ARGV==1 && $ARGV[0] eq '--nomail'); $verbose = 1 if (@ARGV==1 && $ARGV[0] eq '--verbose'); + $debug = 1 if (@ARGV==1 && $ARGV[0] eq '--debug'); $verbose = 1 if $nomail; - return ($verbose, $nomail); + return ($verbose, $nomail, $debug); } sub site { diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 687e54fbe..788e57be0 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -598,7 +598,6 @@ sub setup_categories_and_bodies : Private { # variables to populate my %bodies_to_list = (); # Bodies with categories assigned my @category_options = (); # categories to show - my $category_label = undef; # what to call them my %category_extras = (); # extra fields to fill in for open311 my %non_public_categories = (); # categories for which the reports are not public @@ -621,7 +620,6 @@ sub setup_categories_and_bodies : Private { _('Empty pub or bar'), _('Empty public building - school, hospital, etc.') ); - $category_label = _('Property type:'); } elsif ($first_area->{id} != COUNCIL_ID_BROMLEY && $first_area->{type} eq 'LBO') { @@ -636,7 +634,6 @@ sub setup_categories_and_bodies : Private { _('-- Pick a category --'), @local_categories ); - $category_label = _('Category'); } else { @@ -663,7 +660,6 @@ sub setup_categories_and_bodies : Private { # If there's an Other category present, put it at the bottom @category_options = ( _('-- Pick a category --'), grep { $_ ne _('Other') } @category_options ); push @category_options, _('Other') if $seen{_('Other')}; - $category_label = _('Category'); } } @@ -671,7 +667,6 @@ sub setup_categories_and_bodies : Private { $c->stash->{bodies} = \%bodies; $c->stash->{all_body_names} = [ map { $_->name } values %bodies ]; $c->stash->{bodies_to_list} = [ keys %bodies_to_list ]; - $c->stash->{category_label} = $category_label; $c->stash->{category_options} = \@category_options; $c->stash->{category_extras} = \%category_extras; $c->stash->{non_public_categories} = \%non_public_categories; @@ -838,6 +833,12 @@ sub process_report : Private { $bodies = join( ',', @{ $c->stash->{bodies_to_list} } ) || -1; $report->bodies_str( $bodies ); + my %extra; + $c->cobrand->process_extras( $c, undef, \%extra ); + if ( %extra ) { + $report->extra( \%extra ); + } + } elsif ( $first_area->{id} == COUNCIL_ID_BARNET ) { unless ( exists Utils::barnet_categories()->{ $report->category } ) { diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm index febeaf3c1..8d3775ddc 100644 --- a/perllib/FixMyStreet/App/View/Web.pm +++ b/perllib/FixMyStreet/App/View/Web.pm @@ -121,10 +121,16 @@ sub add_links { $text =~ s/\r//g; $text = ent($text); - $text =~ s{(https?://[^\s]+)}{<a href="$1">$1</a>}g; + $text =~ s{(https?://)([^\s]+)}{"<a href='$1$2'>$1" . _space_slash($2) . '</a>'}ge; return $text; } +sub _space_slash { + my $t = shift; + $t =~ s{/(?!$)}{/ }g; + return $t; +} + =head2 escape_js Used to escape strings that are going to be put inside JavaScript. diff --git a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm index c3d13448d..ef27d2c4e 100644 --- a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm +++ b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm @@ -107,5 +107,410 @@ sub council_rss_alert_options { return ( \@options, @reported_to_options ? \@reported_to_options : undef ); } +sub process_extras { + my $self = shift; + my $ctx = shift; + my $body_id = shift; + my $extra = shift; + + my $value = $ctx->request->params->{address} || ''; + $ctx->stash->{field_errors}->{address} = _('This information is required') + unless $value; + $extra->{address} = $value; +} + +# A record of the number of reports from the Channel 4 site and other old data +sub old_site_stats { + return { + 2223 => 95, + 2238 => 82, + 2245 => 54, + 2248 => 31, + 2250 => 132, + 2253 => 15, + 2255 => 25, + 2256 => 8, + 2257 => 3, + 2258 => 14, + 2259 => 5, + 2260 => 22, + 2261 => 12, + 2262 => 21, + 2263 => 14, + 2264 => 1, + 2267 => 1, + 2271 => 13, + 2272 => 7, + 2273 => 13, + 2274 => 7, + 2275 => 15, + 2276 => 14, + 2277 => 10, + 2278 => 7, + 2279 => 23, + 2280 => 16, + 2281 => 25, + 2282 => 14, + 2283 => 10, + 2284 => 22, + 2285 => 25, + 2286 => 32, + 2287 => 13, + 2288 => 13, + 2289 => 16, + 2290 => 18, + 2291 => 1, + 2292 => 9, + 2293 => 15, + 2294 => 16, + 2295 => 12, + 2296 => 4, + 2299 => 2, + 2300 => 1, + 2304 => 10, + 2305 => 17, + 2306 => 6, + 2307 => 11, + 2308 => 17, + 2309 => 9, + 2310 => 6, + 2311 => 9, + 2312 => 26, + 2313 => 2, + 2314 => 34, + 2315 => 18, + 2316 => 13, + 2317 => 17, + 2318 => 7, + 2319 => 14, + 2320 => 4, + 2321 => 20, + 2322 => 7, + 2323 => 10, + 2324 => 7, + 2325 => 15, + 2326 => 12, + 2327 => 25, + 2328 => 23, + 2329 => 11, + 2330 => 4, + 2331 => 29, + 2332 => 12, + 2333 => 7, + 2334 => 5, + 2335 => 16, + 2336 => 7, + 2337 => 7, + 2338 => 2, + 2339 => 12, + 2340 => 2, + 2341 => 7, + 2342 => 14, + 2343 => 20, + 2344 => 13, + 2345 => 17, + 2346 => 6, + 2347 => 4, + 2348 => 6, + 2349 => 18, + 2350 => 13, + 2351 => 11, + 2352 => 24, + 2353 => 10, + 2354 => 20, + 2355 => 14, + 2356 => 13, + 2357 => 14, + 2358 => 8, + 2359 => 6, + 2360 => 10, + 2361 => 36, + 2362 => 17, + 2363 => 8, + 2364 => 7, + 2365 => 8, + 2366 => 26, + 2367 => 19, + 2368 => 20, + 2369 => 8, + 2370 => 14, + 2371 => 79, + 2372 => 10, + 2373 => 5, + 2374 => 4, + 2375 => 12, + 2376 => 10, + 2377 => 24, + 2378 => 9, + 2379 => 8, + 2380 => 25, + 2381 => 13, + 2382 => 11, + 2383 => 16, + 2384 => 18, + 2385 => 12, + 2386 => 18, + 2387 => 5, + 2388 => 8, + 2389 => 12, + 2390 => 11, + 2391 => 23, + 2392 => 11, + 2393 => 16, + 2394 => 9, + 2395 => 27, + 2396 => 8, + 2397 => 27, + 2398 => 14, + 2402 => 1, + 2403 => 18, + 2404 => 14, + 2405 => 7, + 2406 => 9, + 2407 => 12, + 2408 => 3, + 2409 => 8, + 2410 => 23, + 2411 => 27, + 2412 => 9, + 2413 => 20, + 2414 => 96, + 2415 => 11, + 2416 => 20, + 2417 => 18, + 2418 => 24, + 2419 => 18, + 2420 => 7, + 2421 => 29, + 2427 => 7, + 2428 => 15, + 2429 => 18, + 2430 => 32, + 2431 => 9, + 2432 => 17, + 2433 => 8, + 2434 => 10, + 2435 => 14, + 2436 => 13, + 2437 => 11, + 2438 => 5, + 2439 => 4, + 2440 => 23, + 2441 => 8, + 2442 => 18, + 2443 => 12, + 2444 => 3, + 2445 => 8, + 2446 => 31, + 2447 => 15, + 2448 => 3, + 2449 => 12, + 2450 => 11, + 2451 => 8, + 2452 => 20, + 2453 => 25, + 2454 => 8, + 2455 => 6, + 2456 => 24, + 2457 => 6, + 2458 => 10, + 2459 => 15, + 2460 => 17, + 2461 => 20, + 2462 => 12, + 2463 => 16, + 2464 => 5, + 2465 => 14, + 2466 => 20, + 2467 => 14, + 2468 => 12, + 2469 => 4, + 2470 => 1, + 2471 => 1, + 2474 => 9, + 2475 => 12, + 2476 => 11, + 2477 => 9, + 2478 => 10, + 2479 => 21, + 2480 => 26, + 2481 => 30, + 2482 => 38, + 2483 => 46, + 2484 => 63, + 2485 => 7, + 2486 => 14, + 2487 => 16, + 2488 => 14, + 2489 => 39, + 2490 => 112, + 2491 => 79, + 2492 => 137, + 2493 => 55, + 2494 => 18, + 2495 => 41, + 2496 => 41, + 2497 => 22, + 2498 => 26, + 2499 => 46, + 2500 => 62, + 2501 => 90, + 2502 => 47, + 2503 => 32, + 2504 => 33, + 2505 => 47, + 2506 => 56, + 2507 => 26, + 2508 => 48, + 2509 => 47, + 2510 => 16, + 2511 => 6, + 2512 => 4, + 2513 => 41, + 2514 => 138, + 2515 => 48, + 2516 => 65, + 2517 => 35, + 2518 => 40, + 2519 => 31, + 2520 => 27, + 2521 => 25, + 2522 => 34, + 2523 => 27, + 2524 => 47, + 2525 => 22, + 2526 => 125, + 2527 => 126, + 2528 => 93, + 2529 => 23, + 2530 => 28, + 2531 => 24, + 2532 => 46, + 2533 => 22, + 2534 => 24, + 2535 => 27, + 2536 => 44, + 2537 => 54, + 2538 => 17, + 2539 => 13, + 2540 => 29, + 2541 => 15, + 2542 => 19, + 2543 => 14, + 2544 => 34, + 2545 => 30, + 2546 => 38, + 2547 => 32, + 2548 => 22, + 2549 => 37, + 2550 => 9, + 2551 => 41, + 2552 => 17, + 2553 => 36, + 2554 => 10, + 2555 => 20, + 2556 => 13, + 2557 => 19, + 2558 => 13, + 2559 => 23, + 2560 => 13, + 2561 => 62, + 2562 => 29, + 2563 => 31, + 2564 => 34, + 2565 => 57, + 2566 => 16, + 2567 => 22, + 2568 => 40, + 2569 => 5, + 2570 => 38, + 2571 => 17, + 2572 => 9, + 2573 => 12, + 2574 => 10, + 2575 => 16, + 2576 => 2, + 2577 => 28, + 2578 => 37, + 2579 => 79, + 2580 => 17, + 2581 => 734, + 2582 => 11, + 2583 => 23, + 2584 => 16, + 2585 => 4, + 2586 => 33, + 2587 => 3, + 2588 => 22, + 2589 => 19, + 2590 => 14, + 2591 => 9, + 2592 => 19, + 2593 => 11, + 2594 => 14, + 2595 => 13, + 2596 => 21, + 2597 => 10, + 2598 => 16, + 2599 => 26, + 2600 => 1, + 2601 => 19, + 2602 => 23, + 2603 => 12, + 2604 => 31, + 2605 => 30, + 2606 => 5, + 2607 => 32, + 2608 => 14, + 2609 => 27, + 2610 => 15, + 2611 => 20, + 2612 => 22, + 2613 => 20, + 2614 => 97, + 2615 => 29, + 2616 => 6, + 2617 => 34, + 2618 => 16, + 2619 => 25, + 2620 => 12, + 2621 => 29, + 2622 => 18, + 2623 => 12, + 2624 => 58, + 2625 => 54, + 2626 => 15, + 2627 => 1, + 2629 => 17, + 2630 => 22, + 2636 => 13, + 2637 => 13, + 2638 => 25, + 2639 => 57, + 2640 => 15, + 2641 => 11, + 2642 => 14, + 2643 => 38, + 2644 => 19, + 2645 => 6, + 2646 => 1, + 2647 => 16, + 2648 => 25, + 2649 => 38, + 2650 => 12, + 2651 => 78, + 2652 => 12, + 2654 => 16, + 2655 => 13, + 2656 => 15, + 2657 => 44, + 2658 => 53, + 16869 => 73, + 21068 => 44, + 21069 => 57, + 21070 => 20, + }; +} + 1; diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm index 62550e626..950ea8127 100644 --- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm +++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm @@ -49,6 +49,9 @@ sub example_places { return ( 'OX20 1SZ', 'Park St, Woodstock' ); } +# don't send questionnaires to people who used the OCC cobrand to report their problem +sub send_questionnaires { return 0; } + sub default_show_name { 0 } 1; diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 08f6beb6e..ec15600b6 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -411,7 +411,7 @@ sub check_for_errors { { $errors{name} = _( 'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below' - ); + ) unless $self->cobrand eq 'emptyhomes'; } if ( $self->category diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm index fe12f95e9..dc1c5c248 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm @@ -156,7 +156,7 @@ sub around_map { sub timeline { my ( $rs ) = @_; - my $prefetch = + my $prefetch = FixMyStreet::App->model('DB')->schema->storage->sql_maker->quote_char ? [ qw/user/ ] : []; @@ -220,7 +220,8 @@ sub send_reports { my ( $rs, $site_override ) = @_; # Set up site, language etc. - my ($verbose, $nomail) = CronFns::options(); + my ($verbose, $nomail, $debug_mode) = CronFns::options(); + my $base_url = mySociety::Config::get('BASE_URL'); my $site = $site_override || CronFns::site($base_url); @@ -237,18 +238,31 @@ sub send_reports { my $senders = $send_report->get_senders; my %sending_skipped_by_method; + my $debug_unsent_count = 0; + debug_print("starting to loop through unsent problem reports...") if $debug_mode; while (my $row = $unsent->next) { my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($row->cobrand)->new(); - # Cobranded and non-cobranded messages can share a database. In this case, the conf file - # should specify a vhost to send the reports for each cobrand, so that they don't get sent + if ($debug_mode) { + $debug_unsent_count++; + print "\n"; + debug_print("state=" . $row->state . ", bodies_str=" . $row->bodies_str . ($row->cobrand? ", cobrand=" . $row->cobrand : ""), $row->id); + } + + # Cobranded and non-cobranded messages can share a database. In this case, the conf file + # should specify a vhost to send the reports for each cobrand, so that they don't get sent # more than once if there are multiple vhosts running off the same database. The email_host # call checks if this is the host that sends mail for this cobrand. - next unless $cobrand->email_host(); + if (! $cobrand->email_host()) { + debug_print("skipping because this host does not send reports for cobrand " . $cobrand->moniker, $row->id) if $debug_mode; + next; + } + $cobrand->set_lang_and_domain($row->lang, 1); 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; } @@ -310,6 +324,7 @@ sub send_reports { my $sender = "FixMyStreet::SendReport::EmptyHomes"; $reporters{ $sender } = $sender->new() unless $reporters{$sender}; $reporters{ $sender }->add_body( $body ); + $sender_count = 1; } else { @@ -332,9 +347,11 @@ sub send_reports { $reporters{ $sender } ||= $sender->new(); if ( $reporters{ $sender }->should_skip( $row ) ) { - $sending_skipped_by_method{ $sender }++ if + debug_print("skipped by sender " . $sender_info->{method} . " (might be due to previous failed attempts?)", $row->id) if $debug_mode; + $sending_skipped_by_method{ $sender }++ if $reporters{ $sender }->skipped; } else { + debug_print("OK, adding recipient body " . $body->id . ":" . $body->name . ", " . $body->send_method, $row->id) if $debug_mode; push @dear, $body->name; $reporters{ $sender }->add_body( $body, $sender_info->{config} ); } @@ -360,7 +377,7 @@ sub send_reports { $h{multiple} = @dear>1 ? "[ " . _("This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue.") . " ]\n\n" : ''; } - $h{missing} = ''; + $h{missing} = ''; if ($missing) { $h{missing} = '[ ' . sprintf(_('We realise this problem might be the responsibility of %s; however, we don\'t currently have any contact details for them. If you know of an appropriate contact address, please do get in touch.'), $missing->name) @@ -374,11 +391,14 @@ sub send_reports { die 'Report not going anywhere for ID ' . $row->id . '!'; } - next unless $sender_count; + if (! $sender_count) { + debug_print("can't send because sender count is zero", $row->id) if $debug_mode; + next; + } if (mySociety::Config::get('STAGING_SITE') && !mySociety::Config::get('SEND_REPORTS_ON_STAGING')) { # on a staging server send emails to ourselves rather than the bodies - %reporters = map { $_ => $reporters{$_} } grep { /FixMyStreet::SendReport::(Email|NI)/ } keys %reporters; + %reporters = map { $_ => $reporters{$_} } grep { /FixMyStreet::SendReport::(Email|NI|EmptyHomes)/ } keys %reporters; unless (%reporters) { %reporters = ( 'FixMyStreet::SendReport::Email' => FixMyStreet::SendReport::Email->new() ); } @@ -388,6 +408,7 @@ sub send_reports { my $result = -1; for my $sender ( keys %reporters ) { + debug_print("sending using " . $sender, $row->id) if $debug_mode; $result *= $reporters{ $sender }->send( $row, \%h ); if ( $reporters{ $sender }->unconfirmed_counts) { foreach my $e (keys %{ $reporters{ $sender }->unconfirmed_counts } ) { @@ -410,6 +431,7 @@ sub send_reports { if ( $cobrand->report_sent_confirmation_email && !$h{anonymous_report}) { _send_report_sent_email( $row, \%h, $nomail ); } + debug_print("send successful: OK", $row->id) if $debug_mode; } else { my @errors; for my $sender ( keys %reporters ) { @@ -418,10 +440,19 @@ sub send_reports { } } $row->update_send_failed( join( '|', @errors ) ); + debug_print("send FAILED: " . join( '|', @errors ), $row->id) if $debug_mode; + } + } + if ($debug_mode) { + print "\n"; + if ($debug_unsent_count) { + debug_print("processed all unsent reports (total: $debug_unsent_count)"); + } else { + debug_print("no unsent reports were found (must have whensent=null and suitable bodies_str & state) -- nothing to send"); } } - if ($verbose) { + if ($verbose || $debug_mode) { print "Council email addresses that need checking:\n" if keys %notgot; foreach my $e (keys %notgot) { foreach my $c (keys %{$notgot{$e}}) { @@ -481,4 +512,11 @@ sub _send_report_sent_email { ); } +sub debug_print { + my $msg = shift; + my $id = shift || ''; + $id = "report $id: " if $id; + print "[] $id$msg\n"; +} + 1; diff --git a/perllib/FixMyStreet/SendReport/EmptyHomes.pm b/perllib/FixMyStreet/SendReport/EmptyHomes.pm index b29c1fd3c..4bae6af46 100644 --- a/perllib/FixMyStreet/SendReport/EmptyHomes.pm +++ b/perllib/FixMyStreet/SendReport/EmptyHomes.pm @@ -33,15 +33,20 @@ sub build_recipient_list { push @{ $self->to }, [ $body_email, $body->name ]; $recips{$body_email} = 1; - my $area_info = mySociety::MaPit::call('area', $body->area_id); + my $area_info = mySociety::MaPit::call('area', $body->body_areas->first->area_id); my $country = $area_info->{country}; if ($country eq 'W') { - $recips{ 'shelter@' . mySociety::Config::get('EMAIL_DOMAIN') } = 1; + $recips{ 'wales@' . mySociety::Config::get('EMAIL_DOMAIN') } = 1; + } elsif ($country eq 'S') { + $recips{ 'scotland@' . mySociety::Config::get('EMAIL_DOMAIN') } = 1; } else { $recips{ 'eha@' . mySociety::Config::get('EMAIL_DOMAIN') } = 1; } } + # Set address email parameter from added data + $h->{address} = $row->extra->{address}; + return () unless $all_confirmed; return keys %recips; } diff --git a/templates/email/emptyhomes/cy/submit.txt b/templates/email/emptyhomes/cy/submit.txt index 57c0d58b7..061758d12 100644 --- a/templates/email/emptyhomes/cy/submit.txt +++ b/templates/email/emptyhomes/cy/submit.txt @@ -5,19 +5,9 @@ Annwyl Swyddog Eiddo Gwag, Dyma gyfeiriad newydd am eiddo gwag yn eich ardal, a wnaed gan ddefnyddiwr gwefan ReportEmptyHomes.com; dywedwyd wrth ddefnyddiwr y wefan fod yr achos wedi cael ei gyfeirio atoch. Byddem yn ddiolchgar petaech yn gwneud yr hyn y -gallwch i helpu adfer yr eiddo hwn i'w ddefnyddio eto. Byddwn yn cysylltu â'r -defnyddiwr ymhen mis ac eto ymhen chwe mis ac yn gofyn iddynt beth sydd wedi -digwydd i'r eiddo. +gallwch i helpu adfer yr eiddo hwn i'w ddefnyddio eto. -Hoffwn eich annog chi i ddweud wrthom beth rydych chi wedi'i wneud, a phan y -daw'r eiddo yn ôl mewn defnydd, trwy lenwi diweddariad wrth y cyfeiriad at yr -eiddo ar y wefan: - - <?=$values['url']?> - -Mae hyn yn rhoi adborth defnyddiol i ddefnyddwyr y wefan ac yn helpu iddynt -ddeall pa gamau yr ydych yn eu cymryd. Byddwn yn cynnig cyngor i'r defnyddiwr -ar gamau eraill y gall eu cymryd os nad eir i'r afael â'r eiddo'n llwyddiannus. +<?=$values['url']?> <?=$values['has_photo']?>Os hoffech gael help neu gyngor ar gael eiddo gwag yn ôl mewn defnydd mae llawer o wybodaeth ddefnyddiol ar wefan yr Asiantaeth Tai @@ -34,6 +24,8 @@ E-bost: <?=$values['email']?> Math o eiddo: <?=$values['category']?> +Address: <?=$values['address']?> + Manylion: <?=$values['detail']?> <?=$values['closest_address']?>---------- diff --git a/templates/email/emptyhomes/en-gb/submit.txt b/templates/email/emptyhomes/en-gb/submit.txt index 4bbaed408..2256732d5 100644 --- a/templates/email/emptyhomes/en-gb/submit.txt +++ b/templates/email/emptyhomes/en-gb/submit.txt @@ -5,18 +5,9 @@ Dear Empty Property Officer, This is a new referral of an empty property in your area made by a user of the website ReportEmptyHomes.com; the website user has been told that the case has been referred to you. We would be grateful if you could do whatever you can to -help get this property back into use. We will contact the user in a month and -again in six months and ask them what has happened to the property. +help get this property back into use. -We'd encourage you to tell us what you have done, and when the property comes -back into use, by filling in an update against the property referral on the -website: - - <?=$values['url']?> - -This gives useful feedback to website users and helps them understand what -action you are taking. We will offer advice to the user on other action they -might take if the property isn't successfully dealt with. +<?=$values['url']?> <?=$values['has_photo']?>If you would like help or advice on getting empty properties back into use there is lots of useful information on the Empty Homes Agency's website @@ -32,6 +23,8 @@ Email: <?=$values['email']?> Property type: <?=$values['category']?> +Address: <?=$values['address']?> + Details: <?=$values['detail']?> <?=$values['closest_address']?>---------- diff --git a/templates/web/barnet/faq/faq-en-gb.html b/templates/web/barnet/faq/faq-en-gb.html index 126a03314..08bb744a6 100755 --- a/templates/web/barnet/faq/faq-en-gb.html +++ b/templates/web/barnet/faq/faq-en-gb.html @@ -7,7 +7,7 @@ <li>flyposting or graffiti <li>flytipping or litter <li>streetcleaning, such as broken glass in a cycle lane - <li>unlit lamposts + <li>unlit lampposts <li>broken playground equipment <li>potholes </ul> diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index b76d1717a..91af70d14 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -22,6 +22,9 @@ [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> <li>[% loc('For council(s):') %] [% IF problem.bodies_str %][% problem.bodies_str %][% ELSE %]<em>[% loc('None' ) %]</em>[% END %] ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li> +[% IF problem.extra.address %] +<li>[% loc('Property address:') %] [% problem.extra.address | html %]</li> +[% END %] <li><label class="inline" for="state">[% loc('State:') %]</label> <select name="state" id="state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['planned', loc('Planned')], ['in progress', diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 26f93afb8..bf47a1420 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -18,7 +18,7 @@ or clearing</strong>, such as: <li>Flytipping or litter <li>Streetcleaning, such as broken glass in a cycle lane [% IF c.cobrand.moniker != 'southampton' %] - <li>Unlit lamposts + <li>Unlit lampposts [% END %] <li>Potholes </ul> diff --git a/templates/web/default/report/new/category.html b/templates/web/default/report/new/category.html index a701e0851..a6f2bf14d 100644 --- a/templates/web/default/report/new/category.html +++ b/templates/web/default/report/new/category.html @@ -3,7 +3,12 @@ [% IF category; category = category | lower; END; %] - <label for='form_category' id="form_category_label">[% category_label | html %]</label> + <label for='form_category' id="form_category_label"> + [%- IF c.cobrand.moniker == 'emptyhomes' %] + [%- loc('Property type:') %] + [%- ELSE %] + [%- loc('Category') %] + [%- END -%]</label> <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index f56ded735..83f746d56 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -28,14 +28,15 @@ [%- 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 update.user.council == 'Bromley Council' ) AND update.problem_state == 'unable to fix' %] - [%- state = loc('no further action') %] - [% END %] + [%- 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' %] + [%- 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 %] + [%- END %] [%- END %] [%- update_state IF update_state != global.last_state %] [%- global.last_state = update_state %] diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index cc2f68ac0..d3f93b5ad 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -5,20 +5,24 @@ <!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]--> <head> - <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="[% version('/cobrands/emptyhomes/css.css') %]"> +[% SET start = c.config.ADMIN_BASE_URL IF admin %] + + <link rel="stylesheet" type="text/css" href="[% start %][% version('/css/core.css') %]"> + <link rel="stylesheet" type="text/css" href="[% start %][% version('/cobrands/emptyhomes/css.css') %]"> [% INCLUDE 'common_header_tags.html', site_title = loc('Report Empty Homes') %] </head> <body> <div id="header"> - <a href="http://www.emptyhomes.com/"><img id="eha-logo" border="0" src="/i/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="left"></a> + <a href="http://www.emptyhomes.com/"><img id="eha-logo" border="0" src="/cobrands/emptyhomes/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="left"></a> <div> <small><em>in conjunction with</em></small> <br> - <a href="http://www.sheltercymru.org.uk/"><img border="0" src="/i/Sheltercymru47s.png" alt="Shelter Cymru" width="80" height="33" align="bottom"></a> - <a href="http://scotland.shelter.org.uk/housing_issues/more_homes/empty_homes"><img border="0" src="/i/SEHPlogo-bwS.png" alt="Scottish Empty Homes Partnership" width="131" height="40" align="bottom"></a> + <a href="http://www.sheltercymru.org.uk/"><img border="0" src="/cobrands/emptyhomes/Sheltercymru47s.png" alt="Shelter Cymru" width="80" height="33" align="bottom"></a> + <a href="http://scotland.shelter.org.uk/housing_issues/more_homes/empty_homes"><img border="0" src="/cobrands/emptyhomes/SEHPlogo-bwS.png" alt="Scottish Empty Homes Partnership" width="131" height="40" align="bottom"></a> + <a href="http://www.channel4.com/"><img src="/cobrands/emptyhomes/c4logo.png" border="0" alt="Channel 4" align="bottom" width="30" height="40"></a> + <a href="http://www.tigeraspect.co.uk/"><img src="/cobrands/emptyhomes/tiger-aspect.png" border="0" alt="Tiger Aspect" align="bottom" width="113" height="30"></a> </div> </div> diff --git a/templates/web/emptyhomes/report/new/councils_text_all.html b/templates/web/emptyhomes/report/new/councils_text_all.html index 5769e6cd5..a2eae5efb 100644 --- a/templates/web/emptyhomes/report/new/councils_text_all.html +++ b/templates/web/emptyhomes/report/new/councils_text_all.html @@ -1,7 +1,7 @@ <p> [% tprintf( - loc('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.'), + loc('All the information you provide here will be sent to <strong>%s</strong>.') all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] diff --git a/templates/web/emptyhomes/report/new/fill_in_details_form.html b/templates/web/emptyhomes/report/new/fill_in_details_form.html new file mode 100644 index 000000000..b269267e1 --- /dev/null +++ b/templates/web/emptyhomes/report/new/fill_in_details_form.html @@ -0,0 +1,157 @@ +<h1>[% loc('Reporting a problem') %]</h1> + +[% IF report.used_map %] + [% IF partial_token %] + <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> + [% END %] +<p>[% loc('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. ') %]</p> +[% END %] + +[% IF js %] + <p id="councils_text">[% + tprintf( + loc('All the information you provide here will be sent to <strong>%s</strong>.'), + loc('the local council') + ); + %] + </p> +[% ELSE %] + [% PROCESS 'report/new/councils_text.html' %] +[% END %] + +<p> +[% IF report.used_map %] + [% INCLUDE 'report/new/fill_in_details_text.html' %] +[% ELSE %] + [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] +[% END %] +</p> + +[% INCLUDE 'errors.html' %] + +<div id="problem_form"> + +[% INCLUDE 'report/new/form_heading.html' %] + +<div class="fieldset"> + +[% IF field_errors.bodies %] + <div class='form-error'>[% field_errors.bodies %]</div> +[% END %] + +<div id="form_sign_in_yes"> + +<h3>[% loc('Public information (shown on site)') %]</h3> + +<p>[% loc('Please do not give address or personal information in this section.') %]</p> + +[% IF js %] + <div class="form-field" id="form_category_row"> + <label for="form_category">[% loc('Category:') %]</label> + <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> + </div> +[% ELSE %] + [% IF category_options.size %] + [% IF field_errors.category %] + <div class='form-error'>[% field_errors.category %]</div> + [% END %] + + <div class="form-field"> + [% PROCESS "report/new/category.html" %] + </div> + [% END %] +[% END %] + +[% IF field_errors.title %] + <div class='form-error'>[% field_errors.title %]</div> +[% END %] + +<div class="form-field"> + <label for="form_title">[% loc('Subject:') %]</label> + <input type="text" value="[% report.title | html %]" name="title" id="form_title" size="25" required> +</div> + +[% IF field_errors.detail %] + <div class='form-error'>[% field_errors.detail %]</div> +[% END %] + +<div class="form-field"> + <label for="form_detail">[% loc('Details:') %]</label> + <textarea name="detail" id="form_detail" rows="7" cols="26" required>[% report.detail | html %]</textarea> +</div> + +[% IF c.cobrand.allow_photo_upload %] + [% IF field_errors.photo %] + <div class='form-error'>[% field_errors.photo %]</div> + [% END %] + + <div class='form-field'> + [% IF upload_fileid || report.photo %] + <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> + [% IF upload_fileid %] + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> + [% END %] + [% IF report.photo %] + <img align="right" src="/photo/[% report.id %].jpeg" hspace="5"> + [% END %] + [% END %] + + <label for="form_photo">[% loc('Photo:') %]</label> + <input type="file" name="photo" id="form_photo" style="width:20em"> + </div> +[% END %] + +</div> + +<div id="form_sign_in_no"> + +<h3>[% loc('Private information (not shown on site)') %]</h3> + +[% IF field_errors.address %] + <div class='form-error'>[% field_errors.address %]</div> +[% END %] + +<div class="form-field"> + <label for="form_address">[% loc('Property address:') %]</label> + <textarea name="address" id="form_address" rows="7" cols="26">[% report.extra.address | html %]</textarea> +</div> + + [% IF field_errors.name %] + <div class='form-error'>[% field_errors.name %]</div> + [% END %] + + <div class="form-field"> + <label for="form_name">[% loc('Your name:') %]</label> + <input type="text" required value="[% report.name | html %]" name="name" id="form_name" size="25"> + </div> + + [% IF field_errors.email %] + <div class='form-error'>[% field_errors.email %]</div> + [% END %] + + <div class="form-field"> + <label for="form_email">[% loc('Your email:') %]</label> + <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" size="25" required> + </div> + + <div class="form-field"> + <label for="form_phone">[% loc('Phone:') %]</label> + <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" size="15"> + <small>[% loc('(optional)') %]</small> + </div> + + <p> + <input type="submit" value="[% loc('Submit') %]"> + </p> + +</div> + +[% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> +[% END %] + +<input type="hidden" name="submit_problem" value="1"> + +</div> +</div> + diff --git a/templates/web/fixmybarangay/report/_message_manager.html b/templates/web/fixmybarangay/report/_message_manager.html index 2860689be..b2537e907 100644 --- a/templates/web/fixmybarangay/report/_message_manager.html +++ b/templates/web/fixmybarangay/report/_message_manager.html @@ -1,10 +1,10 @@ [% IF c.user && c.user.from_body %] -[% IF problem.external_source_id && problem.external_source == c.config.MESSAGE_MANAGER_URL %] +[% IF problem.external_source_id && problem.external_source == c.config.MESSAGE_MANAGER_URL %] <p class="mm-submitted-by-sms"> [%# OK to link to Message Manager here because (currently) we're only showing this to staff users %] - <a href="[%= problem.external_source %]messages/view/[%= problem.external_source_id %]" - title="view in Message Manager admin"><img + <a href="[%= problem.external_source %]messages/view/[%= problem.external_source_id %]" + title="view in Message Manager admin"><img src="/cobrands/fixmybarangay/images/mobile-22x40.png" alt="SMS"></a> This report was submitted via SMS. </p> @@ -41,7 +41,7 @@ <input name="mm-htauth-password" id="mm-htauth-password" type="password"/> </div> <div class="submit"> - <input id="available-submit" type="submit" value="Get available messages" class="green-btn"/> + <input id="available-submit" type="submit" value="Get available messages" class="green-btn"/> </div> </div> </li> @@ -49,27 +49,27 @@ <div id="mm-message-list" style="min-height:1em;"></div> </li> </ul> - + <script type="text/javascript"> $(document).ready(function() { var $mm_message_list = $('#mm-message-list'); var mm_url = "[% c.config.MESSAGE_MANAGER_URL %]"; // from config - - [%# note that the presence of a problem id implies that this is a report view page, not a problem creation page %] + + [%# note that the presence of a problem id implies that this is a report view page, not a problem creation page %] var problem_id = "[% problem.id %]"; - + var dummy_busy = false; var fms_username = "[% c.user.email | replace('\@.*', '') %]"; var timeout_id = 0; var can_refresh = true; // disable refresh var refresh_period = 60000 * 3; // refresh messages every three minutes var has_archive_message = false; - + function sanitise_id(css_id) { - return css_id.replace(/\D/g, ""); + return css_id.replace(/\D/g, ""); } - + // call this to push the auto-refresh timeout off so it's only triggered // if there's no activity for a while function reset_timeout() { @@ -80,19 +80,19 @@ $(document).ready(function() { timeout_id = setTimeout(mm_refresh_messages, refresh_period); } } - + var mm_refresh_messages = function() { $('#mm-link-to-refresh').fadeOut(); $('#available-submit').click(); } - + var mm_populate_list = function(data) { $('#mm-status-message-container').find('p').text("Accessed Message Manager as " + data['username']); $('input[name=mm_text]').prop('checked', false); // uncheck all $('#mm-link-to-refresh').delay(2000).fadeIn(); reset_timeout(); } - + var mm_selected_message = function(data) { var msg_text = ""; var service_id = ""; @@ -108,7 +108,7 @@ $(document).ready(function() { $('#form_detail').val(msg_text); $('#external_source_id').val(service_id); } - + var reply_cleanup = function(data) { reset_timeout(); $('#reply_text').val(''); @@ -133,7 +133,7 @@ $(document).ready(function() { custom_tooltips = {tt_radio: "Select before clicking 'Copy to Update' to add this message as an update"}; } message_manager.config({ - url_root: mm_url, + url_root: mm_url, tooltips: custom_tooltips, want_nice_msgs: true }); @@ -142,51 +142,53 @@ $(document).ready(function() { // problem form hidden input "external_source_id": pass the MM id into FMS, if used var $problem_form = $('#problem_form').size()? $('#problem_form') : $('#form_update_form'); $('<input type="hidden"/>').attr({ - 'id': 'external_source_id', - 'name': 'external_source_id', - }).appendTo($problem_form); + 'id': 'external_source_id', + 'name': 'external_source_id', + }).appendTo($problem_form); $('#available-submit').click(function(e){ e.preventDefault(); reset_timeout(); message_manager.get_available_messages({ - callback: mm_populate_list, + callback: mm_populate_list, suggest_username: fms_username, fms_id: problem_id, anim_duration: 500 }); }); $('#available-submit').click(); - + $mm_message_list.on('mouseover', 'li.mm-msg', function(e){ e.stopPropagation(); // because replies are nested $('.mm-msg-action', $mm_message_list).stop().fadeOut(200); $(this).find('> .mm-msg-action').stop().show(); }); - + $('#mm-message-list').on('click', '.mm-info', function(e){ reset_timeout(); message_manager.show_info(sanitise_id($(this).parent().attr('id'))); }); - + $('#mm-hide-reasons').change(function(e){ - $('#reason_text').val($(this).val()); // load reason_text with boilerplate reason + $('#reason_text').val($(this).val()); // load reason_text with boilerplate reason }); $('#mm-boilerplate-replies').change(function(e){ - $('#reply_text').val($(this).val()); // load reason_text with boilerplate reason + var old_txt = $('#reply_text').val(); + var new_txt = $(this).val().replace(/(^\.\.\.|\.\.\.$)/, old_txt); + $('#reply_text').val(new_txt); // load reply_text with boilerplate reason }); - + $('#reply-submit').click(function(e) { e.preventDefault(); // TODO: pending fancybox callbacks working, force dummy_busy here - // this is possibly overly cautious anyway - dummy_busy = false; + // this is possibly overly cautious anyway + dummy_busy = false; if (! dummy_busy) { dummy_busy = true; message_manager.reply( - $('#reply_to_msg_id').val(), - $('#reply_text').val(), - {callback:reply_cleanup}); + $('#reply_to_msg_id').val(), + $('#reply_text').val(), + {callback:reply_cleanup}); } }); @@ -194,14 +196,14 @@ $(document).ready(function() { e.preventDefault(); reset_timeout(); // TODO: pending fancybox callbacks working, force dummy_busy here - // this is possibly overly cautious anyway - dummy_busy = false; + // this is possibly overly cautious anyway + dummy_busy = false; if (! dummy_busy) { dummy_busy = true; message_manager.hide( - $('#hide_msg_id').val(), - $('#reason_text').val(), - {callback:hide_cleanup}); + $('#hide_msg_id').val(), + $('#reason_text').val(), + {callback:hide_cleanup}); } }); @@ -210,8 +212,8 @@ $(document).ready(function() { if (! dummy_busy) { dummy_busy = true; message_manager.mark_as_not_a_reply( - $('#detach_msg_id').val(), - {callback:detach_cleanup}); + $('#detach_msg_id').val(), + {callback:detach_cleanup}); } }); @@ -236,7 +238,7 @@ $(document).ready(function() { $('#external_source_id').val(id); $('#form_update').val( $(this).val() ); $('#form_update_form').on('submit', function(e) { - message_manager.assign_fms_id( $('#external_source_id').val(), problem_id, { 'is_async': false } ); + message_manager.assign_fms_id( $('#external_source_id').val(), problem_id, { 'is_async': false } ); }); }); }); @@ -250,9 +252,9 @@ $(document).ready(function() { $('#show_messages').val('Show Messages'); $('#copy_to_update').stop(true,true).fadeOut(); } - + }); - + $('#mm-link-to-refresh').on('click', function(e) { e.preventDefault(); mm_refresh_messages(); @@ -277,8 +279,8 @@ $(document).ready(function() { .attr('title', 'show all available messages (for adding updates)'); $('#mm-link-to-toggle-archive').fadeIn(); can_refresh = false; - }) - }); + }) + }); } else { $('.mm-archive', $mm_message_list).stop(true,true).slideUp(1000, function(){ message_manager.say_status("Available messages:"); @@ -291,15 +293,15 @@ $(document).ready(function() { $('.mm-empty', $mm_message_list).stop(true,true).fadeIn(); can_refresh = true; reset_timeout(); - }) - }); + }) + }); } }); - + $("a#mm-link-to-help").fancybox(); message_manager.populate_boilerplate_strings('hide-reason'); - message_manager.populate_boilerplate_strings('reply'); + message_manager.populate_boilerplate_strings('reply'); }); </script> diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index 8628085e5..3fe8d5af9 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -32,7 +32,7 @@ or clearing</strong>, such as: <li>Flytipping or litter <li>Streetcleaning, such as broken glass in a cycle lane [% IF c.cobrand.moniker != 'southampton' %] - <li>Unlit lamposts + <li>Unlit lampposts [% END %] <li>Potholes </ul> @@ -80,12 +80,14 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd> the size of your screen automatically. We plan to release updated native apps in the near future. <ul> +<!-- <li><em>iPhone:</em> Our basic app from 2008 is available for download on the App Store: <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app available from the <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. +--> <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the <a href="http://store.ovi.com/content/107557">Ovi Store</a>. </ul> diff --git a/templates/web/fixmystreet/report/banner.html b/templates/web/fixmystreet/report/banner.html index 2292352ad..83c780958 100644 --- a/templates/web/fixmystreet/report/banner.html +++ b/templates/web/fixmystreet/report/banner.html @@ -5,7 +5,7 @@ </div> [% END %] -[% IF c.cobrand.moniker != 'bromley' AND problem.council != '2482' AND problem.is_open AND date.now - problem.lastupdate.epoch > 8 * 7 * 24 * 60 * 60 %] +[% IF c.cobrand.moniker != 'bromley' AND problem.bodies_str != '2482' AND problem.is_open AND date.now - problem.lastupdate.epoch > 8 * 7 * 24 * 60 * 60 %] [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %] [% END %] [% IF problem.is_fixed %] @@ -15,7 +15,7 @@ [% INCLUDE banner, id = 'closed', text = loc('Closed') %] [% END %] [% states = [ 'investigating', 'in progress', 'planned', 'action scheduled' ]; - IF c.cobrand.moniker != 'bromley' && states.grep(problem.state).size %] + IF c.cobrand.moniker != 'bromley' AND problem.bodies_str != '2482' && states.grep(problem.state).size %] [% INCLUDE banner, id = 'progress', text = loc('In progress') %] [% END %] diff --git a/templates/web/fixmystreet/reports/_extras.html b/templates/web/fixmystreet/reports/_extras.html index e210b9c07..ba81c676d 100755 --- a/templates/web/fixmystreet/reports/_extras.html +++ b/templates/web/fixmystreet/reports/_extras.html @@ -9,7 +9,7 @@ secure = { 'fix.bromley.gov.uk' = 's' } - site = fms_councils.${area.name} + site = fms_councils.${body.name} %] [% IF site %] <tr align="center" diff --git a/templates/web/oxfordshire/faq/faq-en-gb.html b/templates/web/oxfordshire/faq/faq-en-gb.html index 9361d5647..5aafa0bc4 100755 --- a/templates/web/oxfordshire/faq/faq-en-gb.html +++ b/templates/web/oxfordshire/faq/faq-en-gb.html @@ -13,71 +13,70 @@ </div> <h1><a name="faq"></a>Frequently Asked Questions</h1> - <dl> - <dt>What is FixMyStreet?</dt> - <dd> - <p> - FixMyStreet is a site to help people report, view, -or discuss local problems they’ve found to their local council by -simply locating them on a map. It launched in early February -2007. - </p> - <p> - We have now integrated with the Oxfordshire County Council website - to make it easier to report highways faults. - </p> - </dd> - - <dt>What sort of problems should I report with FixMyStreet?</dt> - <dd> - <p> - FixMyStreet is primarily for reporting things which are -<strong>broken or dirty or damaged or dumped, and need fixing, cleaning -or clearing</strong>, such as: - </p> - - <ul><li>Abandoned vehicles - <li>Dog Fouling - <li>Flyposting or graffiti - <li>Flytipping or litter - <li>Streetcleaning, such as broken glass in a cycle lane - <li>Unlit lamposts - <li>Potholes - </ul> +<dl> + <dt>What is FixMyStreet?</dt> + <dd> + <p> + FixMyStreet is an easy to use web site to help people report, view, or discuss + local problems to their council by simply locating them on a map. + </p> + <p> + We have now integrated FixMyStreet with the Oxfordshire County Council website + to make it easier for our customers to report highways faults directly to us by + using their computer or mobile phone. + </p> </dd> - <dt>What isn’t FixMyStreet for?</dt> + <dt>What sort of problems should I report with FixMyStreet?</dt> <dd> - <p> - FixMyStreet is not a way of getting in touch with the council for all - issues – please use FixMyStreet only for problems such as the above. We - often route problem reports via cleansing services or highways and so using - FixMyStreet for other matters may result in a delay in your report getting - to the right department. - </p> - <div style="margin-left:1.5em;"> <p> - <strong>You will need to contact the county council directly for</strong>: + FixMyStreet is primarily for reporting things which are broken or dirty, damaged + or dumped, and need fixing, cleaning or clearing, such as: </p> <ul> - <li>Any urgent or emergency problems - <li>Complaining about the council - <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + <li>Abandoned vehicles + <li>Dog Fouling + <li>Flyposting or graffiti + <li>Flytipping or litter + <li>Streetcleaning, such as broken glass in a cycle lane + <li>Unlit lampposts + <li>Potholes </ul> + </dd> + <dt>What isn’t FixMyStreet for?</dt> + <dd> <p> - <strong>You will need to contact your district council directly for problems such as:</strong>: + FixMyStreet is not a way of getting in touch with the council for all issues — please use + FixMyStreet only for problems highlighted above. </p> - <ul> - <li>Anti-social behaviour - <li>Noise pollution or barking dogs - <li>Fires and smoke/smell pollution - <li>Missing wheelie bins or recycling boxes or missed rubbish collections - <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. - <li>Complaining about your neighbours - <li>Joy riding, drug taking, animal cruelty, or other criminal activity - </ul> - </div> + <p> + As we often route problems via our cleansing services or highways departments, using FixMyStreet + for other matters may result in a delay in your report getting to the right people. + </p> + <div style="margin-left:1.5em;"> + <p> + <strong>You will need to contact the county council directly for</strong>: + </p> + <ul> + <li>Any urgent or emergency problems + <li>Complaining about the council + <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + </ul> + <p> + <strong>You will need to contact your district council directly for problems such as:</strong>: + </p> + <ul> + <li>Anti-social behaviour + <li>Noise pollution or barking dogs + <li>Fires and smoke/smell pollution + <li>Missing wheelie bins or recycling boxes or missed rubbish collections + <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + <li>Complaining about your neighbours + <li>Joy riding, drug taking, animal cruelty, or other criminal activity + </ul> + </div> </dd> + <dt><a name="pothole"></a>Should I report a pothole on this site, or call?</dt> <dd> <p><strong>You must call us on 0845 310 1111 to report the pothole if it is:</strong></p> @@ -90,143 +89,105 @@ or clearing</strong>, such as: </ul> </dd> - <dt>How do I use the site?</dt> - <dd>After entering a postcode or location, you are presented -with a map of that area. You can view problems already reported in that area, -or report ones of your own simply by clicking on the map at the location of -the problem.</dd> + <dt>How do I use the FixMyStreet site?</dt> + <dd> + After entering a postcode or location, you will then be presented with a map of that area. + You can then view problems already reported in that area, or report new ones of your own + simply by clicking on the map at the location of the problem. + </dd> - <dt>How are the problems solved?</dt> - <dd>They are reported to the council by email. The -council can then resolve the problem the way they normally would. -Alternatively, you can discuss the problem on the website with others, and -then together lobby the council to fix it, or fix it directly yourselves.</dd> + <dt>How are the problems solved?</dt> + <dd> + They are reported to us automatically. We then resolve the problem the way we + normally would and update the fault on the map. + </dd> - <dt>What updates will I receive?</dt> - <dd>If you sign up to receive updates you will receive an email to acknowledge the report, an email when the problem is assigned to a representative to be inspected, one if the problem is either referred to the appropriate organisation and one when it is fixed.</dd> + <dt>What does the map show?</dt> + <dd> + The map shows all faults submitted online through FixMyStreet. You can view the + exact location of each fault and see its current status. + </dd> - <dt>Is it free?</dt> - <dd>The site is free to use, yes. FixMyStreet is run -by a registered charity, though, so if you want to make a contribution, <a -href="https://secure.mysociety.org/donate/">please do</a>.</dd> + <dt>How can I get an update on a fault?</dt> + <dd> + <p> + When you record a fault you can sign up to receive updates. You will then receive + an initial email to acknowledge the report. In time, you will receive a further email + when the problem is assigned for inspection, one if the problem needs to be referred + to another department or organisation, and a final email when it is fixed or requires + no further work. + </p> + <p> + These updates will also be posted on the mapped fault so that anyone can see the + status of any fault recorded via FixMyStreet by clicking on it on the map. + </p> + </dd> <dt>Can I use FixMyStreet on my mobile?</dt> <dd> - <p>The FixMyStreet website should work on your mobile phone, adapting to - the size of your screen automatically. We plan to release updated native - apps in the near future. - <ul> - <li><em>iPhone:</em> Our basic app from 2008 is available for download - on the App Store: - <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, - <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app - available from the - <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. - <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the - <a href="http://store.ovi.com/content/107557">Ovi Store</a>. - </ul> + <p> + Yes, you can view our website on your phone and it will automatically adapt + to the size of your screen. + </p> + <p> + The following apps are also available for the national FixMyStreet site, + and they plan to release updated native apps in the near future. + </p> + <ul> + <li><em>iPhone:</em> Our basic app from 2008 is available for download + on the App Store: + <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>. + <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app + available from the + <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. + <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the + <a href="http://store.ovi.com/content/107557">Ovi Store</a>. + </ul> </dd> +</dl> - </dl> - - <h2><a name="practical"></a>Practical Questions</h2> - <p> - <em>Taken from the national website <a href="http://www.fixmystreet.com">www.fixmystreet.com</a></em> - </p> - <dl> - <dt>Do you remove silly or illegal content?</dt> - <dd>FixMyStreet is not responsible for the content and accuracy -of material submitted by its users. We reserve the right to edit or remove any -problems or updates which we consider to be inappropriate upon being informed -by a user of the site.</dd> +<h2><a name="practical"></a>Practical Questions</h2> +<dl> + <dt>Do you remove silly or illegal content?</dt> + <dd> + Oxfordshire County Council and FixMyStreet are not responsible for the content and + accuracy of material submitted by its users. We reserve the right to edit or remove + any problems or updates which we consider to be inappropriate upon being informed + by a user of the site. + </dd> <dt>Why does the site use kilometres for measurements?</dt> - <dd>Thanks for asking politely – we never quite understand why some of the rudest - emails we receive are on this topic. The British national - grid reference system, devised by Ordnance Survey (the British national - mapping agency) around the time of the second world war, uses eastings and - northings measured in metres and kilometres; the maps we use are from - Ordnance Survey and so this is what we use to display distances. - There you have it: not everything British is in miles!</dd> + <dd> + The maps FixMyStreet uses are from Ordnance Survey who based their grid reference + system on measurements in metres and kilometres. + </dd> - <dt>Why can’t I zoom out more on the reporting map?</dt> - <dd>We want to keep FixMyStreet locally focused, so restrict the ability to - move radically between areas. The map on Your Reports will let you see all - the reports you’ve made, wherever they are. If you’re from the - council then the emailed version of the problem report also contains the - closest road and postcode to the pin on the map.</dd> + <dt>How do I report a fault outside of Oxfordshire?</dt> + <dd> + The map only shows locations within Oxfordshire to keep it locally focussed. + You can report a fault outside of Oxfordshire on the national + <a href="http://www.fixmystreet.com/">FixMyStreet</a> website. + </dd> +</dl> - <dt>This site is great – why aren’t you better publicised?</dt> - <dd>As a tiny charity we simply don’t have a publicity budget, and we - rely on word of mouth to advertise the site. We have a whole <a - href="posters/">array of posters, flyers and badges</a> if you’d like - to publicise us on the web or in your local area, and why not write to your - local paper to let them know about us?</dd> </dl> - - <h2><a name="organisation"></a>Organisation Questions</h2> - <p> - <em>Taken from the national website <a href="http://www.fixmystreet.com">www.fixmystreet.com</a></em> - </p> - <dl> - <dt>Who built FixMyStreet?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, +<h2><a name="organisation"></a>Organisation Questions</h2> +<dl> + <dt>Who built FixMyStreet?</dt> + <dd> + This site was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. -mySociety is the project of a registered charity which has grown out of the community of -volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. -mySociety’s primary mission is to build Internet projects which give people simple, tangible -benefits in the civic and community aspects of their lives. Our first project -was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your -elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety -can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, -or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd> - <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> - <dd>FixMyStreet was originally paid for via the Department for - Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial - work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> - <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> - <dd>Yes, we changed the name mid June 2007. We decided -Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> - <dt>Do you need any help with the project?</dt> - <dd>Yes, we can use help in all sorts of ways, technical or -non-technical. Please see our <a -href="http://www.mysociety.org/helpus/">Get Involved page</a>.</dd> - <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> - <dd> -The software behind this site is open source, and available -to you mainly under the GNU Affero GPL software license. You can <a -href="http://github.com/mysociety/fixmystreet">download the -source code</a> and help us develop it. -You’re welcome to use it in your own projects, although you must also -make available the source code to any such projects. -<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code -being used in a Norwegian version of this site. -</dd> -<dt>I’d prefer code in a different language?</dt> -<dd> -VisibleGovernment.ca wrote their own code for -<a href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a>, which is -written in GeoDjango and available under an MIT licence at <a -href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. -Or <a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> is written in -Drupal. + mySociety is the project of a registered charity which has grown out of the community of + volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. + mySociety’s primary mission is to build Internet projects which give people simple, tangible + benefits in the civic and community aspects of their lives. Their first project + was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your + elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity + number 1076346. + </dd> +</dl> +<p> + You can find out more about FixMyStreet at <a href="http://www.fixmystreet.com">www.fixmystreet.com</a>. </p> -</dd> - <dt>People build things, not organisations. Who <em>actually</em> built it?</dt> - <dd>Matthew Somerville and Francis Irving wrote the site, -Chris Lightfoot wrote the tileserver and map cutter, Richard Pope created -our pins, Deborah Kerr keeps things up-to-date and does user support, -Ayesha Garrett designed our posters, and Tom Steinberg managed it all. - -Thanks also to -<a href="http://www.ordnancesurvey.co.uk">Ordnance Survey</a> (for the maps, -UK postcodes, and UK addresses – data © Crown copyright, all -rights reserved, Ministry of Justice 100037819 2008), -Yahoo! for their BSD-licensed JavaScript libraries, the entire free software -community (this particular project was brought to you by Perl, PostgreSQL, -and the number 161.290) and <a -href="http://www.bytemark.co.uk/">Bytemark</a> (who kindly host all -our servers). +<p> <p> -Let us know if we’ve missed anyone.</dd> - </dl> [% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index cfca706c8..ffe32a4a1 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -38,9 +38,6 @@ <a href="http://www.oxfordshire.gov.uk/cms/public-site/contact-oxfordshire-county-council" title="Contac the council">Contact the council</a> </address> <ul><!-- use | between items --> - <li> - <a href="/contact" title="Contact the FixMyStreet team">Contact</a> | - </li> <li class="powered-by-fms"> <a href="http://www.fixmystreet.com/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-inverse.png" alt="FixMyStreet"></a> </li> diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 6c338452a..e9a592fd4 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -34,7 +34,7 @@ </head> <body class="[% bodyclass | html IF bodyclass %]"> <div id="oxford-wrapper"> - <div id="oxford-header" class="desk-only"> + <div id="oxford-header" class="desk-only oxford-left"> <a href="http://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council<span></span></a> <span id="oxford-links"> <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a>|<a href="/" title="">FixMyStreet</a> @@ -49,21 +49,51 @@ [% END %] </p> </div> + + + <div id="navigation"> + <div class="menubar"> + <div class="menu-inner"> + <ul class="menu"> + <li> + <[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %]>[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]> + </li> + </ul> + </div> + </div> + </div> + + + + </div> <!-- end of oxford header --> +<!-- <div id="oxford-main-menu" class="desk-only"> <ul class="tabs"> - <li class="home first"><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" - >[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END - %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END - %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li class="last"><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> + <li class="home first"></li>[% + %]<li></li>[% + %]<li></li>[% + %]<li></li>[% + %]<li class="last"></li> </ul> </div> +--> <div class="wrapper"> diff --git a/templates/web/oxfordshire/report/new/councils_text_all.html b/templates/web/oxfordshire/report/new/councils_text_all.html index e71a400ac..638c9d7de 100644 --- a/templates/web/oxfordshire/report/new/councils_text_all.html +++ b/templates/web/oxfordshire/report/new/councils_text_all.html @@ -1,17 +1,23 @@ +<div class="oxfordshire-preamble"> + <p> + Please <strong>do not</strong> use this form for reporting + <strong>emergencies and urgent</strong> problems. + You should report these by contacting 0845 310 11 11. + </p> + <p> + Our opening hours are 8.30 to 5, Monday to Thursday and 8.30 to 4 on Fridays. + </p> + If your enquiry is related to Highways and is outside of our opening hours and + cannot wait, please contact Thames Valley Police on 101. + </p> +</div> + <p>You can use this form to report a problem or to make an enquiry about roads -and pavements in your area. All the information you provide here will be sent -to <strong>[% all_council_names.join( '</strong> or <strong>' ) %]</strong>. +and pavements in your area. The subject and details of the problem will be public, plus your name if you give us permission. If you report a fault on a road that is not owned by Oxfordshire County Council we will pass the report on to the relevant body. -<p>Our opening hours are 8.30 to 5, Monday to Thursday and 8.30 to 4 on -Fridays. Please <strong>do not</strong> use this form for reporting -<strong>emergencies and urgent</strong> problems. You should report these by -contacting 0845 310 11 11. If your enquiry is related to Highways and is -outside of our opening hours and cannot wait, please contact Thames Valley -Police on 101.</p> - <p>Please use <a href="/faq#pothole" target="_blank">our chart</a> to determine the size of any pot holes being reported and whether to submit a report using this online form or by telephone.</p> diff --git a/templates/web/oxfordshire/report/new/notes.html b/templates/web/oxfordshire/report/new/notes.html index e03fd8644..5fa154ed9 100644 --- a/templates/web/oxfordshire/report/new/notes.html +++ b/templates/web/oxfordshire/report/new/notes.html @@ -3,7 +3,7 @@ <ul class="plain-list"> <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li> <li>[% loc("Please be polite, concise and to the point.") %]</li> - <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> + <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> <li>Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. Remember that you can contact Oxfordshire County Council for additional issues that are not covered on this reporting facility.</li> </ul> diff --git a/templates/web/seesomething/report/new/category.html b/templates/web/seesomething/report/new/category.html index 26d750b52..8c837a047 100644 --- a/templates/web/seesomething/report/new/category.html +++ b/templates/web/seesomething/report/new/category.html @@ -3,7 +3,7 @@ [% IF category; category = category | lower; END; %] - <label for='form_category' class="select">[% category_label | html %]</label> + <label for='form_category' class="select">[% loc('Category') %]</label> <select name='category' data-theme="c" id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] diff --git a/templates/web/southampton/report/new/category.html b/templates/web/southampton/report/new/category.html index 7c7748c78..0a7703bbb 100644 --- a/templates/web/southampton/report/new/category.html +++ b/templates/web/southampton/report/new/category.html @@ -1,6 +1,6 @@ [% FILTER collapse %] [% IF category_options.size %] - <label for='form_category'>[% category_label | html %]</label> + <label for='form_category'>[% loc('Category') %]</label> <select name='category' id='form_category'> [% FOREACH cat_op IN category_options %] [% NEXT IF cat_op == 'Abandoned vehicles' %] diff --git a/web/i/SEHPlogo-bwS.png b/web/cobrands/emptyhomes/SEHPlogo-bwS.png Binary files differindex 496d43115..496d43115 100644 --- a/web/i/SEHPlogo-bwS.png +++ b/web/cobrands/emptyhomes/SEHPlogo-bwS.png diff --git a/web/i/Sheltercymru47.gif b/web/cobrands/emptyhomes/Sheltercymru47.gif Binary files differindex b7eb2c4ff..b7eb2c4ff 100644 --- a/web/i/Sheltercymru47.gif +++ b/web/cobrands/emptyhomes/Sheltercymru47.gif diff --git a/web/i/Sheltercymru47s.png b/web/cobrands/emptyhomes/Sheltercymru47s.png Binary files differindex 5547be1e0..5547be1e0 100644 --- a/web/i/Sheltercymru47s.png +++ b/web/cobrands/emptyhomes/Sheltercymru47s.png diff --git a/web/cobrands/emptyhomes/c4logo.png b/web/cobrands/emptyhomes/c4logo.png Binary files differnew file mode 100644 index 000000000..783385e30 --- /dev/null +++ b/web/cobrands/emptyhomes/c4logo.png diff --git a/web/cobrands/emptyhomes/css.css b/web/cobrands/emptyhomes/css.css index ba761814a..97d0e1192 100644 --- a/web/cobrands/emptyhomes/css.css +++ b/web/cobrands/emptyhomes/css.css @@ -96,7 +96,7 @@ a:hover, a:active { #wrapper { clear: both; margin: 0 2em 2em; - padding-top: 0.5em; + padding-top: 2em; } #navigation { diff --git a/web/i/eha-logo.jpeg b/web/cobrands/emptyhomes/eha-logo.jpeg Binary files differindex 250be8502..250be8502 100644 --- a/web/i/eha-logo.jpeg +++ b/web/cobrands/emptyhomes/eha-logo.jpeg diff --git a/web/i/eha-logo.png b/web/cobrands/emptyhomes/eha-logo.png Binary files differindex 5cc912521..5cc912521 100644 --- a/web/i/eha-logo.png +++ b/web/cobrands/emptyhomes/eha-logo.png diff --git a/web/i/eha.jpg b/web/cobrands/emptyhomes/eha.jpg Binary files differindex 56e767b86..56e767b86 100644 --- a/web/i/eha.jpg +++ b/web/cobrands/emptyhomes/eha.jpg diff --git a/web/i/eha.png b/web/cobrands/emptyhomes/eha.png Binary files differindex 8c17db486..8c17db486 100644 --- a/web/i/eha.png +++ b/web/cobrands/emptyhomes/eha.png diff --git a/web/cobrands/emptyhomes/tiger-aspect.png b/web/cobrands/emptyhomes/tiger-aspect.png Binary files differnew file mode 100644 index 000000000..53e8d5311 --- /dev/null +++ b/web/cobrands/emptyhomes/tiger-aspect.png diff --git a/web/cobrands/oxfordshire/_colours.scss b/web/cobrands/oxfordshire/_colours.scss index 0179bdbe4..eea046781 100644 --- a/web/cobrands/oxfordshire/_colours.scss +++ b/web/cobrands/oxfordshire/_colours.scss @@ -13,4 +13,9 @@ $col_click_map_dark: $primary_text; $col_fixed_label: $oxfordshire_lt_green; $col_fixed_label_dark: $primary_text; +// Oxfordshire have toasty orange buttons +$oxfordshire_button_base: #F35A0E; +$oxfordshire_button_top: #EC6816; +$oxfordshire_button_bottom: #FE4602; +$oxfordshire_button_border: #CCC; diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss index 10e5c5711..d3ba888d9 100644 --- a/web/cobrands/oxfordshire/base.scss +++ b/web/cobrands/oxfordshire/base.scss @@ -37,4 +37,11 @@ height: 20px; width: 105px; } -}
\ No newline at end of file +} + +.oxfordshire-preamble { + background: #E0E0E0; + margin: 0em auto 1em auto; + padding: 1em 1em 0.5em 1em; +} + diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss index 8d5710158..e2192180c 100644 --- a/web/cobrands/oxfordshire/layout.scss +++ b/web/cobrands/oxfordshire/layout.scss @@ -6,6 +6,10 @@ body { background-image: none; } +body, body a { + font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; +} + #front-main { background-color: $primary; background-image: none; @@ -150,5 +154,30 @@ body.twothirdswidthpage .content { } } +#front-main #postcodeForm div { + border: 1px solid #fff; // because orange "Go" button (see below) abuts this border, looks a tiny bit better if it's not dark green +} + +// styled Oxfordshire buttons -- including the "Go" button on the postcode form -- to be orange: + +#front-main #postcodeForm div input#sub, +.green-btn, +button.green-btn, +input.green-btn{ + @include button-reset( + $oxfordshire_button_top, $oxfordshire_button_bottom, $oxfordshire_button_border, #fff, + $oxfordshire_button_top, $oxfordshire_button_bottom, $oxfordshire_button_border, #fff + ); + text-transform:capitalize; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + font-weight: normal; + cursor: pointer; +} @import "oxfordshire"; diff --git a/web/cobrands/oxfordshire/oxfordshire.scss b/web/cobrands/oxfordshire/oxfordshire.scss index 0429a622b..d6b31586c 100644 --- a/web/cobrands/oxfordshire/oxfordshire.scss +++ b/web/cobrands/oxfordshire/oxfordshire.scss @@ -9,7 +9,7 @@ body { font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; line-height:18px; - a {text-decoration:none; outline:0; font-family:Arial, Helvetica, sans-serif; font-size:0.75em; color:#0c62ba} + a {text-decoration:none; color:#0c62ba} a { font-size: 1em; } // mySociety a:hover {text-decoration:underline} margin:0; @@ -26,34 +26,43 @@ body { } -#oxford-header - { - padding:0 16px 7px 16px; - clear:both; - overflow:hidden; - position:relative; - width:958px; - height:84px; - height:auto !important; - min-height:84px; - background: $oxfordshire_lt_green url("/cobrands/oxfordshire/images/header.jpg") no-repeat 0 0; - - a.logo:hover {cursor:pointer;cursor:hand} - a.logo {float:left; display:inline; margin:3px 0 6px 10px; position:relative; overflow:hidden} - a.logo span {display:block; position:absolute; top:0; left:0; z-index:10} - a.logo, a.logo span {width:173px; height:38px; background: url("/cobrands/oxfordshire/images/logo.jpg") no-repeat 0 0;} - - h1 {float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; color:#ffffff; white-space:nowrap;font-family:"Trebuchet MS",Tahoma,Arial,sans-serif;} - span.header {float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; color:#ffffff; white-space:nowrap} - a {color:#ffffff;} - - #oxford-links { - padding: 10px 3px 0px 0px; float:right;color:#ffffff; - a{ +#oxford-header { + padding:0 16px 7px 16px; + clear:both; + overflow:hidden; + position:relative; + width:958px; + + /* note================= */ + height: 133px; + height:auto !important; + min-height:133px; + /* note================= */ + + background: $oxfordshire_lt_green url("/cobrands/oxfordshire/images/header.jpg") no-repeat 0 0; + + a.logo:hover {cursor:pointer;cursor:hand} + a.logo {float:left; display:inline; margin:3px 0 6px 10px; position:relative; overflow:hidden} + a.logo span {display:block; position:absolute; top:0; left:0; z-index:10} + a.logo, a.logo span {width:173px; height:38px; background: url("/cobrands/oxfordshire/images/logo.jpg") no-repeat 0 0;} + + h1 { + float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; + font-weight:bold; color:#ffffff; white-space:nowrap;font-family:"Trebuchet MS",Tahoma,Arial,sans-serif; + } + span.header { + float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; + color:#ffffff; white-space:nowrap + } + a { + color:#ffffff; + } + #oxford-links { + padding: 10px 3px 0px 0px; float:right;color:#ffffff; + a { font-size:0.75em; // mySociety putting this back (switched off in body) margin: 0px 5px 0px 5px } - } .oxford-user { float: right; @@ -142,10 +151,8 @@ body { li.last a {border-right:1px solid #666;} a {padding:8px 0 0 0;} } - } - #oxford-footer { float:left; display:inline; @@ -182,3 +189,66 @@ body { } } + /* --------------------------------------------------------------------------------- + oxfordshire nav menubar from e.g., + http://fisd.oxfordshire.gov.uk/kb5/oxfordshire/fsd/includes/css/wireframe/navbar.css + ---------------------------------------------------------------------------------*/ + +#navigation { + position: absolute; + left: 0; + top: 90px; + .menubar { + width: 972px; + padding: 0 0 0 18px; + border-top: 1px solid #004300; + font-size: 13px; /* explicit; it was implicit from OCC's styles */ + color: #999999; + overflow: visible; + /*width: @gridWidth; only needed for contained menu*/ + display: inline-block; + z-index: 100; + .menu-inner { + background-color: #004300; + background-repeat: repeat-x; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), 0 -1px 0 rgba(0, 0, 0, 0.1) inset; + .menu { + left: 0; + margin: 0 10px 0 0; + padding: 0; + position: relative; + list-style: none outside none; + > li { + list-style: none outside none; + float: left; + > a, > span { + color: #ffffff; + float: none; + line-height: 19px; + padding: 10px 10px 11px; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + display: block; + text-decoration: none; + &:hover { + color: #FFFFFF; + } + } + } + } + } + } + .menubar-fixed-top { + left: 0; + margin-bottom: 0; + position: fixed; + right: 0; + z-index: 1000; + } +} +.oxford-left { + float: left !important; +} + |
