diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-12-21 17:45:10 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-12-21 17:45:10 +0000 |
| commit | 6c4dfdb0048ed33384e0582164b5d8f4b51e752e (patch) | |
| tree | 04fcb6e53d6cd894d284e46720beb14a16c72528 /locale | |
| parent | 05a1e0a43c3fbf70dbb85eace1216bac0e7f539e (diff) | |
.po file update.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/FixMyStreet.po | 602 | ||||
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 963 | ||||
| -rw-r--r-- | locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po | 953 | ||||
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 982 | ||||
| -rw-r--r-- | locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 982 |
5 files changed, 2651 insertions, 1831 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 44584597a..2aae65b43 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: 2012-12-10 13:18+0000\n" +"POT-Creation-Date: 2012-12-21 17:13+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:560 perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:563 perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid " and " msgstr "" @@ -25,11 +25,11 @@ msgstr "" msgid " and <strong>we will now send it to the council</strong>" msgstr "" -#: templates/web/default/report/new/councils_text_all.html:10 templates/web/default/report/new/councils_text_all.html:17 templates/web/default/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_text_none.html:14 templates/web/default/report/new/councils_text_none.html:17 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:23 templates/web/default/report/new/councils_text_some.html:5 templates/web/emptyhomes/report/new/councils_text_all.html:2 +#: templates/web/default/report/new/councils_text_all.html:11 templates/web/default/report/new/councils_text_all.html:18 templates/web/default/report/new/councils_text_all.html:4 templates/web/default/report/new/councils_text_none.html:11 templates/web/default/report/new/councils_text_none.html:14 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:23 templates/web/default/report/new/councils_text_some.html:5 templates/web/emptyhomes/report/new/councils_text_all.html:2 msgid " or " msgstr "" -#: templates/web/default/admin/council_list.html:17 +#: templates/web/default/admin/bodies.html:19 msgid "%d addresses" msgstr "" @@ -41,7 +41,7 @@ msgstr "" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" -#: templates/web/default/admin/council_list.html:27 +#: templates/web/default/admin/edit-league.html:5 msgid "%d edits by %s" msgstr "" @@ -61,23 +61,23 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 +#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:496 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "%s, reported anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:498 +#: perllib/FixMyStreet/DB/Result/Problem.pm:502 msgid "%s, reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:306 perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "%s, within %s ward" msgstr "" @@ -85,7 +85,7 @@ msgstr "" msgid "(Don't worry — %s)" msgstr "" -#: templates/web/default/admin/report_blocks.html:11 templates/web/default/admin/search_users.html:23 +#: templates/web/default/admin/report_blocks.html:11 templates/web/default/admin/users.html:23 msgid "(Email in abuse table)" msgstr "" @@ -97,11 +97,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:23 +#: 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:23 templates/web/zurich/report/_item.html:27 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:21 +#: 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:21 templates/web/zurich/report/_item.html:25 msgid "(fixed)" msgstr "" @@ -109,15 +109,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:17 +#: templates/web/default/reports/_list-entry.html:4 templates/web/fixmystreet/report/_item.html:17 templates/web/zurich/report/_item.html:21 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:118 +#: templates/web/default/report/new/fill_in_details_form.html:217 templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "(optional)" msgstr "" -#: templates/web/default/reports/_list-entry.html:2 templates/web/fixmystreet/report/_item.html:16 +#: templates/web/default/reports/_list-entry.html:2 templates/web/fixmystreet/report/_item.html:16 templates/web/zurich/report/_item.html:20 msgid "(sent to both)" msgstr "" @@ -129,15 +129,15 @@ msgstr "" msgid "(we never show your email)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:628 perllib/FixMyStreet/App/Controller/Report/New.pm:656 perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 perllib/FixMyStreet/App/Controller/Report/New.pm:663 perllib/FixMyStreet/DB/Result/Problem.pm:356 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:608 perllib/FixMyStreet/DB/Result/Problem.pm:359 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 perllib/FixMyStreet/DB/Result/Problem.pm:362 msgid "-- Pick a property type --" msgstr "" @@ -253,7 +253,11 @@ msgstr "" msgid "About us" msgstr "" -#: templates/web/default/admin/council_contacts.html:72 +#: templates/web/default/admin/bodies.html:31 templates/web/default/admin/body-form.html:77 templates/web/zurich/admin/body-form.html:41 +msgid "Add body" +msgstr "" + +#: templates/web/default/admin/body.html:69 msgid "Add new category" msgstr "" @@ -281,10 +285,6 @@ msgstr "" msgid "All Reports" msgstr "" -#: templates/web/default/admin/council_list.html:44 -msgid "All confirmed" -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/fiksgatami/footer.html:7 templates/web/fiksgatami/nn/footer.html:7 templates/web/fixmybarangay/footer.html:20 templates/web/fixmystreet/footer.html:49 templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 templates/web/zurich/footer.html:12 msgid "All reports" msgstr "" @@ -297,15 +297,15 @@ msgstr "" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/default/report/new/councils_text_all.html:10 templates/web/default/report/new/councils_text_all.html:12 +#: templates/web/default/report/new/councils_text_all.html:11 templates/web/default/report/new/councils_text_all.html:13 msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>." msgstr "" -#: templates/web/default/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_text_all.html:5 +#: templates/web/default/report/new/councils_text_all.html:4 templates/web/default/report/new/councils_text_all.html:6 msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system." msgstr "" -#: 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:17 templates/web/default/report/new/councils_text_all.html:19 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/zurich/report/new/fill_in_details_form.html:6 templates/web/zurich/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/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:8 templates/web/zurich/report/new/fill_in_details_form.html:6 templates/web/zurich/report/new/fill_in_details_form.html:8 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -313,15 +313,19 @@ msgstr "" 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 "" +#: templates/web/zurich/report/new/councils_text_all.html:2 templates/web/zurich/report/new/councils_text_all.html:3 +msgid "All the information you provide here will be sent to <strong>Stadt Zürich</strong>." +msgstr "" + #: templates/web/default/questionnaire/index.html:60 templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/default/admin/list_flagged.html:15 templates/web/default/admin/list_updates.html:10 templates/web/default/admin/search_reports.html:18 +#: 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 "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/report_edit.html:27 templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "" @@ -337,6 +341,10 @@ msgstr "" msgid "Are you from a council?" msgstr "" +#: templates/web/default/admin/body-form.html:19 templates/web/zurich/admin/body-form.html:19 +msgid "Area covered" +msgstr "" + #: templates/web/default/open311/index.html:17 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" @@ -345,6 +353,10 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" +#: templates/web/zurich/report/_item.html:9 +msgid "Awaiting moderation" +msgstr "" + #: templates/web/default/admin/report_blocks.html:11 msgid "Ban email address" msgstr "" @@ -353,10 +365,18 @@ 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:1032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 templates/web/default/admin/bodies.html:1 templates/web/zurich/admin/header.html:13 msgid "Bodies" msgstr "" +#: templates/web/default/admin/reports.html:16 templates/web/default/admin/users.html:14 +msgid "Body" +msgstr "" + +#: templates/web/default/admin/user_edit.html:12 templates/web/zurich/admin/report_edit.html:17 +msgid "Body:" +msgstr "" + #: templates/web/fiksgatami/footer.html:16 templates/web/fiksgatami/nn/footer.html:16 msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>" msgstr "" @@ -369,7 +389,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:631 perllib/FixMyStreet/App/Controller/Report/New.pm:658 templates/web/bromley/report/new/fill_in_details_form.html:68 templates/web/default/admin/council_contacts.html:37 templates/web/default/admin/index.html:36 templates/web/default/admin/list_flagged.html:14 templates/web/default/admin/search_reports.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:74 templates/web/zurich/report/new/fill_in_details_form.html:68 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 perllib/FixMyStreet/App/Controller/Report/New.pm:665 templates/web/bromley/report/new/fill_in_details_form.html:68 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/fixmystreet/report/new/fill_in_details_form.html:74 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/index-dm.html:39 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/report/new/fill_in_details_form.html:64 msgid "Category" msgstr "" @@ -377,11 +397,11 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/default/admin/council_contacts.html:78 templates/web/default/admin/council_edit.html:23 templates/web/default/admin/report_edit.html:25 templates/web/default/report/new/fill_in_details_form.html:67 +#: templates/web/default/admin/body.html:75 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:26 templates/web/default/report/new/fill_in_details_form.html:67 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:41 msgid "Category:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:336 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 msgid "Category: %s" msgstr "" @@ -393,11 +413,11 @@ msgstr "" msgid "Click map to report a problem" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:15 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:21 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:15 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Closed by council" msgstr "" @@ -405,7 +425,7 @@ msgstr "" msgid "Closed reports" msgstr "" -#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/problem_row.html:27 msgid "Closed:" msgstr "" @@ -413,43 +433,31 @@ msgstr "" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:14 templates/web/zurich/admin/report_edit.html:16 msgid "Co-ordinates:" msgstr "" -#: templates/web/default/admin/list_flagged.html:16 templates/web/default/admin/list_updates.html:13 templates/web/default/admin/search_reports.html:19 +#: 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 "" -#: templates/web/default/admin/report_edit.html:39 templates/web/default/admin/update_edit.html:41 +#: templates/web/default/admin/report_edit.html:40 templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:38 templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/report_edit.html:39 templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:365 -msgid "Configuration updated" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:394 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" -#: templates/web/default/admin/council_edit.html:34 +#: templates/web/default/admin/body_edit.html:40 msgid "Configure Endpoint" msgstr "" -#: templates/web/default/admin/council_contacts.html:168 -msgid "Configure Open311" -msgstr "" - -#: templates/web/default/admin/council_contacts.html:116 -msgid "Configure Open311 integration" -msgstr "" - -#: templates/web/default/admin/council_contacts.html:46 +#: templates/web/default/admin/body.html:44 msgid "Confirm" msgstr "" @@ -461,11 +469,11 @@ msgstr "" msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." msgstr "" -#: templates/web/default/questionnaire/creator_fixed.html:1 templates/web/default/tokens/confirm_problem.html:1 templates/web/default/tokens/confirm_problem.html:3 templates/web/default/tokens/confirm_update.html:1 templates/web/default/tokens/confirm_update.html:3 templates/web/emptyhomes/tokens/confirm_problem.html:1 templates/web/emptyhomes/tokens/confirm_problem.html:3 templates/web/southampton/tokens/confirm_problem.html:1 templates/web/southampton/tokens/confirm_problem.html:3 +#: templates/web/default/questionnaire/creator_fixed.html:1 templates/web/default/tokens/confirm_problem.html:1 templates/web/default/tokens/confirm_problem.html:3 templates/web/default/tokens/confirm_update.html:1 templates/web/default/tokens/confirm_update.html:3 templates/web/emptyhomes/tokens/confirm_problem.html:1 templates/web/emptyhomes/tokens/confirm_problem.html:3 templates/web/southampton/tokens/confirm_problem.html:1 templates/web/southampton/tokens/confirm_problem.html:3 templates/web/zurich/tokens/confirm_problem.html:1 templates/web/zurich/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "" -#: templates/web/default/admin/council_contacts.html:39 templates/web/default/admin/council_contacts.html:88 templates/web/default/admin/council_edit.html:28 templates/web/default/admin/council_edit.html:71 +#: templates/web/default/admin/body.html:37 templates/web/default/admin/body.html:85 templates/web/default/admin/body_edit.html:31 templates/web/default/admin/body_edit.html:77 templates/web/zurich/admin/report_edit-sdm.html:22 templates/web/zurich/admin/report_edit.html:45 msgid "Confirmed" msgstr "" @@ -473,7 +481,7 @@ msgstr "" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/default/admin/problem_row.html:23 templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/problem_row.html:25 templates/web/default/admin/report_edit.html:35 msgid "Confirmed:" msgstr "" @@ -493,30 +501,22 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1159 perllib/FixMyStreet/App/Controller/Admin.pm:1187 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1168 perllib/FixMyStreet/App/Controller/Admin.pm:1196 msgid "Could not find user" msgstr "" -#: templates/web/default/admin/list_flagged.html:13 templates/web/default/admin/list_updates.html:12 templates/web/default/admin/search_reports.html:16 templates/web/default/admin/search_users.html:14 +#: templates/web/default/admin/flagged.html:13 templates/web/default/admin/list_updates.html:12 msgid "Council" msgstr "" -#: templates/web/default/admin/council_list.html:1 -msgid "Council contacts" -msgstr "" - -#: templates/web/default/admin/council_contacts.html:1 templates/web/default/admin/council_edit.html:1 +#: templates/web/default/admin/body.html:1 templates/web/default/admin/body_edit.html:1 msgid "Council contacts for %s" msgstr "" -#: templates/web/default/admin/stats.html:84 templates/web/default/admin/user_edit.html:12 +#: templates/web/default/admin/stats.html:84 msgid "Council:" msgstr "" -#: templates/web/default/admin/council_list.html:36 -msgid "Councils" -msgstr "" - #: templates/web/default/admin/stats.html:12 templates/web/default/admin/stats.html:32 msgid "Count" msgstr "" @@ -525,15 +525,15 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/default/admin/council_contacts.html:107 +#: templates/web/default/admin/body.html:103 msgid "Create category" msgstr "" -#: templates/web/default/admin/list_flagged.html:17 templates/web/default/admin/list_updates.html:9 templates/web/default/admin/search_reports.html:20 +#: 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/index-dm.html:14 templates/web/zurich/admin/index-dm.html:40 templates/web/zurich/admin/index-sdm.html:21 msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:33 templates/web/default/admin/update_edit.html:42 +#: templates/web/default/admin/report_edit.html:34 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:24 templates/web/zurich/admin/report_edit.html:48 templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -541,31 +541,27 @@ msgstr "" msgid "Current state" msgstr "" -#: templates/web/default/admin/council_list.html:40 -msgid "Currently has 1+ deleted" -msgstr "" - #: templates/web/default/dashboard/index.html:5 templates/web/default/dashboard/index.html:7 msgid "Dashboard" msgstr "" -#: templates/web/default/admin/council_contacts.html:40 templates/web/default/admin/council_contacts.html:91 templates/web/default/admin/council_edit.html:29 templates/web/default/admin/council_edit.html:72 +#: templates/web/default/admin/body.html:38 templates/web/default/admin/body.html:88 templates/web/default/admin/body_edit.html:33 templates/web/default/admin/body_edit.html:78 msgid "Deleted" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:54 templates/web/fixmystreet/report/new/fill_in_details_form.html:66 templates/web/zurich/report/new/fill_in_details_form.html:60 +#: templates/web/bromley/report/new/fill_in_details_form.html:54 templates/web/fixmystreet/report/new/fill_in_details_form.html:66 templates/web/zurich/report/new/fill_in_details_form.html:56 msgid "Details" msgstr "" -#: templates/web/default/admin/report_edit.html:14 templates/web/default/report/new/fill_in_details_form.html:61 +#: 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:13 templates/web/zurich/admin/report_edit.html:14 msgid "Details:" msgstr "" -#: templates/web/default/admin/council_contacts.html:41 +#: templates/web/default/admin/body.html:39 msgid "Devolved" msgstr "" -#: templates/web/default/admin/council_list.html:23 +#: templates/web/default/admin/edit-league.html:1 msgid "Diligency prize league table" msgstr "" @@ -581,15 +577,19 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/default/admin/list_updates.html:35 templates/web/default/admin/problem_row.html:29 templates/web/default/admin/search_users.html:24 +#: templates/web/default/admin/list_updates.html:35 templates/web/default/admin/problem_row.html:31 templates/web/default/admin/users.html:24 templates/web/zurich/admin/index-dm.html:24 templates/web/zurich/admin/index-dm.html:49 templates/web/zurich/admin/index-sdm.html:33 msgid "Edit" msgstr "" -#: templates/web/default/admin/report_edit.html:1 +#: templates/web/default/admin/body.html:112 +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.html:1 msgid "Editing problem %d" msgstr "" -#: templates/web/default/admin/update_edit.html:1 +#: templates/web/default/admin/update_edit.html:1 templates/web/zurich/admin/update_edit.html:1 msgid "Editing update %d" msgstr "" @@ -597,19 +597,19 @@ msgstr "" msgid "Editing user %d" msgstr "" -#: templates/web/default/admin/council_edit.html:73 +#: templates/web/default/admin/body_edit.html:79 msgid "Editor" msgstr "" -#: templates/web/bromley/report/display.html:126 templates/web/default/admin/council_contacts.html:38 templates/web/default/admin/council_edit.html:70 templates/web/default/admin/list_flagged.html:12 templates/web/default/admin/list_flagged.html:35 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/search_reports.html:15 templates/web/default/admin/search_users.html:13 templates/web/fixmystreet/auth/general.html:20 templates/web/fixmystreet/report/update-form.html:74 +#: templates/web/bromley/report/display.html:126 templates/web/default/admin/body.html:36 templates/web/default/admin/body_edit.html:76 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:74 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1141 msgid "Email already in abuse list" msgstr "" @@ -621,19 +621,19 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/default/admin/council_contacts.html:83 templates/web/default/admin/council_edit.html:26 templates/web/default/admin/report_edit.html:31 templates/web/default/admin/update_edit.html:24 templates/web/default/admin/user_edit.html:11 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:34 +#: templates/web/default/admin/body.html:80 templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html:32 templates/web/default/admin/update_edit.html:27 templates/web/default/admin/user_edit.html:11 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:34 templates/web/zurich/admin/report_edit-sdm.html:21 templates/web/zurich/admin/report_edit.html:44 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty office or other commercial" msgstr "" @@ -641,11 +641,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -661,7 +661,11 @@ msgstr "" msgid "End month:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:9 +#: templates/web/default/admin/body-form.html:40 +msgid "Endpoint" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:11 msgid "Enter a Zürich street name" msgstr "" @@ -697,7 +701,7 @@ msgstr "" msgid "Error" msgstr "" -#: templates/web/default/admin/council_contacts.html:13 templates/web/default/admin/council_edit.html:18 +#: templates/web/default/admin/body.html:11 templates/web/default/admin/body_edit.html:18 msgid "Example postcode %s" msgstr "" @@ -705,7 +709,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 msgid "Extra data:" msgstr "" @@ -729,7 +733,7 @@ msgstr "" msgid "FixMyStreet" msgstr "" -#: templates/web/default/admin/header.html:10 +#: templates/web/default/admin/header.html:10 templates/web/zurich/admin/header.html:10 msgid "FixMyStreet admin:" msgstr "" @@ -750,15 +754,15 @@ msgid "" "for the county council." msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:21 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 templates/web/zurich/admin/report_edit.html:26 templates/web/zurich/admin/report_edit.html:30 templates/web/zurich/report/banner.html:9 msgid "Fixed" msgstr "" -#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:22 msgid "Fixed - Council" msgstr "" -#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:22 msgid "Fixed - User" msgstr "" @@ -766,7 +770,7 @@ msgstr "" msgid "Fixed reports" msgstr "" -#: templates/web/default/admin/problem_row.html:24 +#: templates/web/default/admin/problem_row.html:26 msgid "Fixed:" msgstr "" @@ -774,11 +778,11 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 templates/web/default/admin/search_users.html:15 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 templates/web/default/admin/users.html:15 msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:42 templates/web/default/admin/user_edit.html:18 +#: templates/web/default/admin/report_edit.html:43 templates/web/default/admin/user_edit.html:18 msgid "Flagged:" msgstr "" @@ -786,7 +790,7 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 msgid "For council(s):" msgstr "" @@ -826,7 +830,7 @@ msgstr "" msgid "Go" msgstr "" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 msgid "Going to send questionnaire?" msgstr "" @@ -854,11 +858,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:64 templates/web/fixmystreet/header.html:49 templates/web/stevenage/header.html:97 templates/web/zurich/header.html:47 +#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 templates/web/bromley/header.html:99 templates/web/fixmybarangay/header.html:64 templates/web/fixmystreet/header.html:49 templates/web/stevenage/header.html:97 templates/web/zurich/header.html:45 msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:21 templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:22 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/report_edit.html:26 templates/web/zurich/admin/report_edit.html:31 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" @@ -870,7 +874,7 @@ msgstr "" msgid "Hide pins" msgstr "" -#: templates/web/default/admin/council_edit.html:66 +#: templates/web/default/admin/body_edit.html:72 msgid "History" msgstr "" @@ -878,7 +882,7 @@ msgstr "" msgid "How to report a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:648 +#: perllib/FixMyStreet/App/Controller/Admin.pm:656 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -890,15 +894,15 @@ msgstr "" msgid "I'm afraid we couldn't validate that token, as the report was made too long ago." msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:235 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:255 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/list_flagged.html:9 templates/web/default/admin/list_updates.html:5 templates/web/default/admin/search_reports.html:12 +#: 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:10 templates/web/zurich/admin/index-dm.html:37 templates/web/zurich/admin/index-sdm.html:18 msgid "ID" msgstr "" -#: templates/web/default/report/new/councils_text_none.html:11 templates/web/default/report/new/councils_text_none.html:12 +#: templates/web/default/report/new/councils_text_none.html:8 templates/web/default/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" @@ -925,15 +929,11 @@ msgstr "" msgid "Illegal feed selection" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 -msgid "In Progress" -msgstr "" - #: templates/web/default/open311/index.html:21 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 "" -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:21 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:19 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 templates/web/zurich/admin/report_edit.html:26 templates/web/zurich/admin/report_edit.html:29 templates/web/zurich/report/banner.html:18 msgid "In progress" msgstr "" @@ -941,27 +941,31 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:356 +#: perllib/FixMyStreet/App/Controller/Open311.pm:348 msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:341 +#: templates/web/zurich/admin/report_edit-sdm.html:18 templates/web/zurich/admin/report_edit.html:38 +msgid "Internal notes:" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:333 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:952 +#: perllib/FixMyStreet/App/Controller/Admin.pm:961 msgid "Invalid end date" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:424 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:951 msgid "Invalid start date" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:19 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 msgid "Investigating" msgstr "" @@ -977,23 +981,23 @@ msgstr "" msgid "Last Name" msgstr "" -#: templates/web/default/admin/council_contacts.html:42 +#: templates/web/default/admin/body.html:40 msgid "Last editor" msgstr "" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 msgid "Last update:" msgstr "" -#: templates/web/default/admin/problem_row.html:26 +#: templates/web/default/admin/problem_row.html:28 msgid "Last update:" msgstr "" -#: templates/web/default/admin/council_contacts.html:16 templates/web/default/admin/council_contacts.html:18 +#: templates/web/default/admin/body.html:14 templates/web/default/admin/body.html:16 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/zurich/report/new/fill_in_details_form.html:69 +#: 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/zurich/report/new/fill_in_details_form.html:65 msgid "Loading..." msgstr "" @@ -1025,7 +1029,7 @@ msgstr "" msgid "Message:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Missing jurisdiction_id" msgstr "" @@ -1037,11 +1041,11 @@ msgstr "" msgid "More problems nearby" msgstr "" -#: templates/web/default/admin/list_flagged.html:11 templates/web/default/admin/list_flagged.html:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/search_reports.html:14 templates/web/default/admin/search_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:19 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:197 templates/web/fixmystreet/report/update-form.html:134 templates/web/zurich/report/new/fill_in_details_form.html:118 +#: 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:19 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:197 templates/web/fixmystreet/report/update-form.html:134 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "Name" msgstr "" -#: templates/web/default/admin/report_edit.html:30 templates/web/default/admin/update_edit.html:23 templates/web/default/admin/user_edit.html:10 +#: templates/web/default/admin/report_edit.html:31 templates/web/default/admin/update_edit.html:26 templates/web/default/admin/user_edit.html:10 templates/web/zurich/admin/report_edit-sdm.html:20 templates/web/zurich/admin/report_edit.html:43 msgid "Name:" msgstr "" @@ -1053,7 +1057,7 @@ msgstr "" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:152 +#: perllib/FixMyStreet/Cobrand/UK.pm:148 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" @@ -1061,7 +1065,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:265 +#: 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" @@ -1075,7 +1079,11 @@ msgstr "" msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:320 +#: perllib/FixMyStreet/App/Controller/Admin.pm:248 +msgid "New body added" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:350 msgid "New category contact added" msgstr "" @@ -1139,34 +1147,34 @@ msgstr "" msgid "New!" msgstr "" -#: templates/web/default/admin/council_contacts.html:52 templates/web/default/admin/council_contacts.html:53 templates/web/default/admin/council_contacts.html:54 templates/web/default/admin/council_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:19 templates/web/default/admin/report_edit.html:28 templates/web/default/admin/report_edit.html:41 templates/web/default/admin/update_edit.html:16 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:107 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:29 templates/web/default/admin/report_edit.html:42 templates/web/default/admin/update_edit.html:19 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:107 templates/web/default/questionnaire/index.html:68 templates/web/fixmystreet/questionnaire/index.html:101 templates/web/fixmystreet/questionnaire/index.html:62 msgid "No" msgstr "" -#: templates/web/default/admin/stats.html:85 templates/web/default/admin/user_edit.html:13 +#: templates/web/default/admin/user_edit.html:13 +msgid "No body" +msgstr "" + +#: templates/web/default/admin/stats.html:85 msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:336 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 msgid "No council selected" msgstr "" -#: templates/web/default/admin/council_list.html:32 +#: templates/web/default/admin/edit-league.html:10 msgid "No edits have yet been made." msgstr "" -#: templates/web/default/admin/list_flagged.html:26 +#: templates/web/default/admin/flagged.html:26 msgid "No flagged problems found" msgstr "" -#: templates/web/default/admin/list_flagged.html:47 +#: templates/web/default/admin/flagged.html:47 msgid "No flagged users found" msgstr "" -#: templates/web/default/admin/council_list.html:38 -msgid "No info at all" -msgstr "" - #: templates/web/default/around/around_map_list_items.html:17 templates/web/fixmystreet/around/around_map_list_items.html:8 msgid "No problems found." msgstr "" @@ -1179,11 +1187,11 @@ msgstr "" msgid "No supporters" msgstr "" -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/body.html:55 msgid "Non Public" msgstr "" -#: templates/web/default/admin/council_list.html:5 templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 templates/web/zurich/admin/report_edit-sdm.html:23 templates/web/zurich/admin/report_edit.html:47 msgid "None" msgstr "" @@ -1195,7 +1203,7 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/default/admin/council_contacts.html:43 templates/web/default/admin/council_edit.html:74 +#: templates/web/default/admin/body.html:41 templates/web/default/admin/body_edit.html:80 msgid "Note" msgstr "" @@ -1203,7 +1211,7 @@ msgstr "" msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" msgstr "" -#: templates/web/default/admin/council_contacts.html:95 templates/web/default/admin/council_edit.html:32 +#: templates/web/default/admin/body.html:92 templates/web/default/admin/body_edit.html:37 msgid "Note:" msgstr "" @@ -1259,7 +1267,7 @@ msgstr "" msgid "Older problems" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/update_edit.html:19 templates/web/default/dashboard/index.html:138 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/update_edit.html:22 templates/web/default/dashboard/index.html:138 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 templates/web/zurich/admin/report_edit.html:26 templates/web/zurich/admin/report_edit.html:28 templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "" @@ -1287,7 +1295,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:1006 perllib/FixMyStreet/App/Controller/Report/New.pm:656 perllib/FixMyStreet/App/Controller/Report/New.pm:657 perllib/FixMyStreet/DB/Result/Problem.pm:505 perllib/FixMyStreet/DB/Result/Problem.pm:515 perllib/FixMyStreet/DB/Result/Problem.pm:525 perllib/FixMyStreet/DB/Result/Problem.pm:537 perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 perllib/FixMyStreet/App/Controller/Report/New.pm:663 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:509 perllib/FixMyStreet/DB/Result/Problem.pm:519 perllib/FixMyStreet/DB/Result/Problem.pm:529 perllib/FixMyStreet/DB/Result/Problem.pm:541 perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 templates/web/zurich/report/_main.html:8 msgid "Other" msgstr "" @@ -1303,7 +1311,11 @@ msgstr "" msgid "Page Not Found" msgstr "" -#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/body-form.html:9 templates/web/zurich/admin/body-form.html:9 +msgid "Parent" +msgstr "" + +#: templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:22 msgid "Partial" msgstr "" @@ -1315,15 +1327,15 @@ msgstr "" msgid "Password:" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:136 templates/web/bromley/report/new/fill_in_details_form.html:183 templates/web/fixmystreet/report/new/fill_in_details_form.html:148 templates/web/fixmystreet/report/new/fill_in_details_form.html:215 templates/web/zurich/report/new/fill_in_details_form.html:124 +#: templates/web/bromley/report/new/fill_in_details_form.html:136 templates/web/bromley/report/new/fill_in_details_form.html:183 templates/web/fixmystreet/report/new/fill_in_details_form.html:148 templates/web/fixmystreet/report/new/fill_in_details_form.html:215 templates/web/zurich/report/new/fill_in_details_form.html:120 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 templates/web/default/admin/report_edit.html:32 templates/web/default/report/new/fill_in_details_form.html:215 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 templates/web/default/admin/report_edit.html:33 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/zurich/admin/report_edit-sdm.html:23 templates/web/zurich/admin/report_edit.html:47 msgid "Phone:" msgstr "" -#: templates/web/bromley/report/display.html:109 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:57 templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/bromley/report/display.html:109 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:57 templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Photo" msgstr "" @@ -1335,7 +1347,7 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:19 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 msgid "Planned" msgstr "" @@ -1359,11 +1371,11 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:822 perllib/FixMyStreet/App/Controller/Report/New.pm:829 perllib/FixMyStreet/App/Controller/Report/New.pm:848 perllib/FixMyStreet/App/Controller/Report/New.pm:891 perllib/FixMyStreet/DB/Result/Problem.pm:355 templates/web/default/js/validation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:828 perllib/FixMyStreet/App/Controller/Report/New.pm:835 perllib/FixMyStreet/App/Controller/Report/New.pm:854 perllib/FixMyStreet/App/Controller/Report/New.pm:897 perllib/FixMyStreet/DB/Result/Problem.pm:358 templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:361 +#: perllib/FixMyStreet/DB/Result/Problem.pm:364 msgid "Please choose a property type" msgstr "" @@ -1382,7 +1394,7 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:146 templates/web/default/js/validation_strings.html:2 +#: perllib/FixMyStreet/DB/Result/Comment.pm:147 templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -1390,11 +1402,11 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:330 templates/web/default/js/validation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:333 templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/DB/Result/User.pm:104 templates/web/default/js/validation_strings.html:12 templates/web/default/js/validation_strings.html:16 +#: perllib/FixMyStreet/DB/Result/User.pm:115 templates/web/default/js/validation_strings.html:12 templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" msgstr "" @@ -1402,15 +1414,15 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 templates/web/default/js/validation_strings.html:4 +#: perllib/FixMyStreet/DB/Result/Problem.pm:336 templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:96 perllib/FixMyStreet/DB/Result/User.pm:101 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 templates/web/default/js/validation_strings.html:11 templates/web/default/js/validation_strings.html:15 templates/web/fixmystreet/auth/general.html:14 templates/web/fixmystreet/auth/general.html:9 +#: 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/validation_strings.html:11 templates/web/default/js/validation_strings.html:15 templates/web/fixmystreet/auth/general.html:14 templates/web/fixmystreet/auth/general.html:9 msgid "Please enter your email" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:161 templates/web/zurich/report/new/fill_in_details_form.html:110 +#: templates/web/bromley/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:161 templates/web/zurich/report/new/fill_in_details_form.html:106 msgid "Please enter your email address" msgstr "" @@ -1418,11 +1430,11 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 templates/web/default/js/validation_strings.html:7 +#: perllib/FixMyStreet/DB/Result/Problem.pm:351 templates/web/default/js/validation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:143 perllib/FixMyStreet/DB/Result/Problem.pm:341 perllib/FixMyStreet/DB/Result/User.pm:97 templates/web/default/js/validation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:144 perllib/FixMyStreet/DB/Result/Problem.pm:344 perllib/FixMyStreet/DB/Result/User.pm:108 templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1463,11 +1475,11 @@ msgid "" "photo of the problem if you have one), etc." msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 templates/web/zurich/report/new/fill_in_details_form.html:64 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 templates/web/zurich/report/new/fill_in_details_form.html:60 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:35 +#: 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:34 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 "" @@ -1487,7 +1499,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:26 +#: 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:25 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" @@ -1547,15 +1559,15 @@ msgstr "" msgid "Posted anonymously at %s" msgstr "" -#: templates/web/default/report/updates.html:21 +#: templates/web/default/report/updates.html:21 templates/web/zurich/report/updates.html:11 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "" -#: templates/web/default/report/updates.html:23 +#: templates/web/default/report/updates.html:23 templates/web/zurich/report/updates.html:13 msgid "Posted by %s at %s" msgstr "" -#: templates/web/default/admin/council_contacts.html:100 templates/web/default/admin/council_edit.html:30 templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/body.html:97 templates/web/default/admin/body_edit.html:35 templates/web/default/admin/report_edit.html:44 msgid "Private" msgstr "" @@ -1575,11 +1587,15 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" +#: templates/web/zurich/admin/index-dm.html:11 +msgid "Problem ID" +msgstr "" + #: templates/web/default/admin/index.html:28 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:849 +#: perllib/FixMyStreet/App/Controller/Admin.pm:863 msgid "Problem marked as open." msgstr "" @@ -1587,7 +1603,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: templates/web/default/admin/list_flagged.html:5 +#: templates/web/default/admin/flagged.html:5 msgid "Problems" msgstr "" @@ -1611,11 +1627,11 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:612 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/Default.pm:600 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 perllib/FixMyStreet/Cobrand/UK.pm:227 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 perllib/FixMyStreet/Cobrand/UK.pm:245 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "Problems within %s ward" msgstr "" @@ -1631,7 +1647,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Property type:" msgstr "" @@ -1651,7 +1667,7 @@ msgstr "" msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/default/admin/council_contacts.html:44 templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/body.html:42 templates/web/default/admin/body.html:55 msgid "Public" msgstr "" @@ -1675,19 +1691,19 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:274 perllib/FixMyStreet/Cobrand/UK.pm:286 +#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:178 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 perllib/FixMyStreet/Cobrand/UK.pm:300 perllib/FixMyStreet/Cobrand/UK.pm:312 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:305 perllib/FixMyStreet/Cobrand/UK.pm:317 +#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -1699,11 +1715,11 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:613 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 perllib/FixMyStreet/Cobrand/UK.pm:238 +#: perllib/FixMyStreet/Cobrand/Default.pm:601 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 perllib/FixMyStreet/Cobrand/UK.pm:234 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 perllib/FixMyStreet/Cobrand/UK.pm:244 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 perllib/FixMyStreet/Cobrand/UK.pm:240 msgid "RSS feed of problems within %s ward" msgstr "" @@ -1747,7 +1763,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:54 templates/web/default/admin/update_edit.html:48 +#: templates/web/default/admin/report_edit.html:55 templates/web/default/admin/update_edit.html:51 templates/web/zurich/admin/report_edit.html:61 templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -1783,39 +1799,47 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:46 +#: perllib/FixMyStreet/DB/Result/Problem.pm:524 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "" +#: templates/web/zurich/report/_main.html:11 +msgid "Reported at %s" +msgstr "" + #: templates/web/default/admin/questionnaire.html:5 templates/web/default/questionnaire/index.html:77 templates/web/fixmystreet/questionnaire/index.html:71 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:516 msgid "Reported by %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:543 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:48 +#: perllib/FixMyStreet/DB/Result/Problem.pm:547 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:534 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:528 +#: perllib/FixMyStreet/DB/Result/Problem.pm:532 msgid "Reported by %s in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:516 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:538 +#: templates/web/zurich/report/_main.html:9 +msgid "Reported in the %s category at %s" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:542 msgid "Reported in the %s category by %s at %s" msgstr "" @@ -1823,7 +1847,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1033 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 templates/web/zurich/admin/header.html:14 msgid "Reports" msgstr "" @@ -1831,7 +1855,7 @@ msgstr "" msgid "Reports on and around the map" msgstr "" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "Resend report" msgstr "" @@ -1843,35 +1867,47 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: templates/web/default/admin/council_edit.html:63 +#: templates/web/default/admin/body_edit.html:69 msgid "Save changes" msgstr "" -#: templates/web/default/admin/list_flagged.html:1 templates/web/default/admin/search_reports.html:1 +#: templates/web/default/admin/flagged.html:1 templates/web/default/admin/reports.html:1 msgid "Search Reports" msgstr "" -#: templates/web/default/admin/search_users.html:1 +#: templates/web/default/admin/users.html:1 msgid "Search Users" msgstr "" -#: templates/web/default/admin/search_reports.html:5 templates/web/default/admin/search_users.html:5 +#: templates/web/default/admin/reports.html:5 templates/web/default/admin/users.html:5 msgid "Search:" msgstr "" +#: templates/web/default/admin/body-form.html:11 templates/web/zurich/admin/body-form.html:11 +msgid "Select a body" +msgstr "" + +#: templates/web/default/admin/body-form.html:21 templates/web/zurich/admin/body-form.html:21 +msgid "Select an area" +msgstr "" + #: templates/web/default/alert/_list.html:8 templates/web/fixmystreet/alert/_list.html:10 msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: templates/web/zurich/admin/report_edit-sdm.html:15 +msgid "Send back to division" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Sent to %s %s later" msgstr "" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "Sent:" msgstr "" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:38 msgid "Service:" msgstr "" @@ -1908,7 +1944,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:68 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:53 templates/web/stevenage/header.html:101 templates/web/zurich/header.html:51 +#: templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 templates/web/fixmybarangay/header.html:68 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:53 templates/web/stevenage/header.html:101 templates/web/zurich/header.html:49 msgid "Sign in" msgstr "" @@ -1940,11 +1976,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: templates/web/default/admin/council_list.html:42 -msgid "Some unconfirmeds" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/UK.pm:89 +#: perllib/FixMyStreet/Cobrand/UK.pm:93 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -1976,15 +2008,15 @@ msgstr "" msgid "Start month:" msgstr "" -#: templates/web/bromley/report/display.html:78 templates/web/default/admin/list_flagged.html:18 templates/web/default/admin/list_updates.html:6 templates/web/default/admin/search_reports.html:21 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:17 templates/web/default/admin/update_edit.html:18 templates/web/default/report/update-form.html:28 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/update_edit.html:21 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit.html:25 templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 templates/web/default/admin/stats.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1047 templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "" @@ -1996,15 +2028,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/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:13 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:152 templates/web/fixmystreet/report/new/fill_in_details_form.html:177 templates/web/fixmystreet/report/new/fill_in_details_form.html:222 templates/web/zurich/report/new/fill_in_details_form.html:128 +#: 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:152 templates/web/fixmystreet/report/new/fill_in_details_form.html:177 templates/web/fixmystreet/report/new/fill_in_details_form.html:222 templates/web/zurich/report/new/fill_in_details_form.html:125 msgid "Submit" msgstr "" -#: templates/web/default/admin/report_edit.html:57 templates/web/default/admin/update_edit.html:51 templates/web/default/admin/user_edit.html:20 +#: templates/web/default/admin/report_edit.html:58 templates/web/default/admin/update_edit.html:54 templates/web/default/admin/user_edit.html:20 templates/web/zurich/admin/report_edit-sdm.html:31 templates/web/zurich/admin/report_edit.html:64 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2012,6 +2044,10 @@ msgstr "" msgid "Submit questionnaire" msgstr "" +#: templates/web/zurich/admin/report_edit.html:26 templates/web/zurich/admin/report_edit.html:27 templates/web/zurich/report/banner.html:15 +msgid "Submitted" +msgstr "" + #: templates/web/bromley/report/display.html:44 templates/web/default/alert/updates.html:17 templates/web/default/report/display.html:38 templates/web/fixmystreet/alert/updates.html:23 templates/web/fixmystreet/report/display.html:56 msgid "Subscribe" msgstr "" @@ -2024,7 +2060,7 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1031 templates/web/default/admin/index.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 templates/web/default/admin/index.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 msgid "Summary" msgstr "" @@ -2032,7 +2068,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1044 msgid "Survey" msgstr "" @@ -2040,15 +2076,15 @@ msgstr "" msgid "Survey Results" msgstr "" -#: templates/web/default/admin/list_updates.html:14 +#: templates/web/default/admin/list_updates.html:14 templates/web/zurich/admin/index-dm.html:13 msgid "Text" msgstr "" -#: templates/web/default/admin/council_contacts.html:20 +#: templates/web/default/admin/body.html:18 msgid "Text only version" msgstr "" -#: templates/web/default/admin/update_edit.html:13 +#: templates/web/default/admin/update_edit.html:14 templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "" @@ -2104,11 +2140,11 @@ msgstr "" msgid "That location does not appear to be in the UK; please try again." msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 perllib/FixMyStreet/Cobrand/UK.pm:82 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 perllib/FixMyStreet/Cobrand/UK.pm:86 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:616 +#: perllib/FixMyStreet/App/Controller/Admin.pm:624 msgid "That problem will now be resent." msgstr "" @@ -2155,7 +2191,7 @@ msgstr "" msgid "The details of your problem are available on the right hand side of this page." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 perllib/FixMyStreet/App/Controller/Reports.pm:43 perllib/FixMyStreet/App/Controller/Reports.pm:74 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 perllib/FixMyStreet/App/Controller/Reports.pm:50 msgid "The error was: %s" msgstr "" @@ -2227,11 +2263,11 @@ msgstr "" msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:271 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:273 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:71 +#: perllib/FixMyStreet/App/Controller/Reports.pm:47 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -2239,7 +2275,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:736 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/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 "" @@ -2259,19 +2295,23 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/zurich/admin/report_edit.html:26 templates/web/zurich/admin/report_edit.html:32 templates/web/zurich/report/banner.html:12 +msgid "Third party" +msgstr "" + #: templates/web/default/open311/index.html:10 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:345 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:868 perllib/FixMyStreet/Cobrand/UK.pm:54 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "" @@ -2315,6 +2355,10 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" +#: templates/web/zurich/report/_main.html:21 +msgid "This report is awaiting moderation." +msgstr "" + #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." msgstr "" @@ -2327,15 +2371,15 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:266 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" -#: templates/web/default/admin/list_flagged.html:10 templates/web/default/admin/search_reports.html:13 +#: templates/web/default/admin/flagged.html:10 templates/web/default/admin/reports.html:13 templates/web/zurich/admin/index-dm.html:38 templates/web/zurich/admin/index-sdm.html:19 msgid "Title" msgstr "" @@ -2351,7 +2395,7 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:270 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:272 msgid "To view a map of the precise location of this issue" msgstr "" @@ -2359,11 +2403,7 @@ msgstr "" msgid "Total" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:42 -msgid "Unable to look up areas in MaPit. Please try again later." -msgstr "" - -#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:21 templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:22 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -2395,6 +2435,10 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" +#: templates/web/default/admin/body-form.html:77 templates/web/zurich/admin/body-form.html:41 +msgid "Update body" +msgstr "" + #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" msgstr "" @@ -2403,27 +2447,27 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/default/admin/update_edit.html:33 +#: templates/web/default/admin/update_edit.html:36 templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/default/admin/update_edit.html:35 +#: templates/web/default/admin/update_edit.html:38 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/default/admin/update_edit.html:37 +#: templates/web/default/admin/update_edit.html:40 msgid "Update reopened problem" msgstr "" -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/body.html:65 msgid "Update statuses" msgstr "" -#: templates/web/default/report/update-form.html:22 +#: templates/web/default/report/update-form.html:22 templates/web/zurich/admin/report_edit-sdm.html:26 msgid "Update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:708 perllib/FixMyStreet/App/Controller/Admin.pm:839 perllib/FixMyStreet/App/Controller/Admin.pm:899 +#: perllib/FixMyStreet/App/Controller/Admin.pm:720 perllib/FixMyStreet/App/Controller/Admin.pm:853 perllib/FixMyStreet/App/Controller/Admin.pm:912 perllib/FixMyStreet/Cobrand/Zurich.pm:171 msgid "Updated!" msgstr "" @@ -2439,23 +2483,23 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1163 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1172 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 templates/web/default/admin/list_flagged.html:30 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 templates/web/default/admin/flagged.html:30 templates/web/zurich/admin/header.html:17 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 perllib/FixMyStreet/App/Controller/Admin.pm:375 msgid "Values updated" msgstr "" -#: templates/web/default/admin/report_edit.html:12 templates/web/default/admin/update_edit.html:12 +#: templates/web/default/admin/report_edit.html:12 templates/web/default/admin/update_edit.html:12 templates/web/zurich/admin/report_edit-sdm.html:12 templates/web/zurich/admin/report_edit.html:12 templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "" @@ -2495,7 +2539,7 @@ msgstr "" msgid "We never show your email" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:133 templates/web/bromley/report/new/fill_in_details_form.html:179 templates/web/fixmystreet/report/new/fill_in_details_form.html:144 templates/web/fixmystreet/report/new/fill_in_details_form.html:211 templates/web/zurich/report/new/fill_in_details_form.html:114 +#: templates/web/bromley/report/new/fill_in_details_form.html:133 templates/web/bromley/report/new/fill_in_details_form.html:179 templates/web/fixmystreet/report/new/fill_in_details_form.html:144 templates/web/fixmystreet/report/new/fill_in_details_form.html:211 templates/web/zurich/report/new/fill_in_details_form.html:110 msgid "We never show your email address or phone number." msgstr "" @@ -2523,15 +2567,15 @@ msgstr "" msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" msgstr "" -#: templates/web/default/admin/council_contacts.html:45 templates/web/default/admin/council_edit.html:69 +#: templates/web/default/admin/body.html:43 templates/web/default/admin/body_edit.html:75 msgid "When edited" msgstr "" -#: templates/web/default/admin/list_flagged.html:19 templates/web/default/admin/search_reports.html:22 +#: 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:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 msgid "Whole block of empty flats" msgstr "" @@ -2559,7 +2603,7 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/council_contacts.html:52 templates/web/default/admin/council_contacts.html:53 templates/web/default/admin/council_contacts.html:54 templates/web/default/admin/council_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:19 templates/web/default/admin/report_edit.html:27 templates/web/default/admin/report_edit.html:41 templates/web/default/admin/search_users.html:23 templates/web/default/admin/update_edit.html:15 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:105 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:28 templates/web/default/admin/report_edit.html:42 templates/web/default/admin/update_edit.html:18 templates/web/default/admin/users.html:23 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:105 templates/web/default/questionnaire/index.html:66 templates/web/fixmystreet/questionnaire/index.html:60 templates/web/fixmystreet/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -2579,11 +2623,15 @@ msgstr "" msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>." msgstr "" +#: templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:8 +msgid "You can <a href=\"%s%s\">view the problem on this site</a>." +msgstr "" + #: templates/web/emptyhomes/reports/body.html:66 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "" -#: templates/web/default/report/new/councils_text_none.html:14 templates/web/default/report/new/councils_text_none.html:16 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:22 +#: templates/web/default/report/new/councils_text_none.html:11 templates/web/default/report/new/councils_text_none.html:13 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:22 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" @@ -2591,7 +2639,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:92 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/zurich/report/new/fill_in_details_form.html:93 +#: templates/web/bromley/report/new/fill_in_details_form.html:97 templates/web/default/questionnaire/index.html:92 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/zurich/report/new/fill_in_details_form.html:89 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" @@ -2603,7 +2651,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:28 +#: 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:27 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 "" @@ -2611,6 +2659,10 @@ msgstr "" msgid "You have successfully confirmed your alert." msgstr "" +#: templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:6 +msgid "You have successfully confirmed your email address." +msgstr "" + #: templates/web/default/tokens/confirm_problem.html:14 templates/web/default/tokens/confirm_problem.html:15 msgid "You have successfully confirmed your problem" msgstr "" @@ -2627,7 +2679,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:743 perllib/FixMyStreet/App/Controller/Report/Update.pm:140 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -2635,7 +2687,7 @@ msgstr "" msgid "You must now click the link in the email we've just sent you — if you do not, %s." msgstr "" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "You really want to resend?" msgstr "" @@ -2643,7 +2695,7 @@ msgstr "" msgid "Your Reports" msgstr "" -#: templates/web/bromley/report/display.html:41 templates/web/bromley/report/display.html:43 templates/web/bromley/report/new/fill_in_details_form.html:145 templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:72 templates/web/fixmystreet/report/display.html:53 templates/web/fixmystreet/report/display.html:55 templates/web/fixmystreet/report/new/fill_in_details_form.html:115 templates/web/fixmystreet/report/new/fill_in_details_form.html:157 templates/web/zurich/report/new/fill_in_details_form.html:106 +#: templates/web/bromley/report/display.html:41 templates/web/bromley/report/display.html:43 templates/web/bromley/report/new/fill_in_details_form.html:145 templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:72 templates/web/fixmystreet/report/display.html:53 templates/web/fixmystreet/report/display.html:55 templates/web/fixmystreet/report/new/fill_in_details_form.html:115 templates/web/fixmystreet/report/new/fill_in_details_form.html:157 templates/web/zurich/report/new/fill_in_details_form.html:102 msgid "Your email" msgstr "" @@ -2671,7 +2723,7 @@ msgstr "" msgid "Your last name" msgstr "" -#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/contact/index.html:65 templates/web/fixmystreet/report/new/fill_in_details_form.html:124 templates/web/fixmystreet/report/new/fill_in_details_form.html:202 templates/web/fixmystreet/report/update-form.html:138 templates/web/zurich/report/new/fill_in_details_form.html:122 +#: 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:202 templates/web/fixmystreet/report/update-form.html:138 templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "Your name" msgstr "" @@ -2687,7 +2739,7 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:137 templates/web/bromley/report/new/fill_in_details_form.html:184 templates/web/fixmystreet/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:216 templates/web/zurich/report/new/fill_in_details_form.html:125 +#: templates/web/bromley/report/new/fill_in_details_form.html:137 templates/web/bromley/report/new/fill_in_details_form.html:184 templates/web/fixmystreet/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:216 templates/web/zurich/report/new/fill_in_details_form.html:121 msgid "Your phone number" msgstr "" @@ -2715,11 +2767,11 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:609 msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:14 templates/web/zurich/admin/report_edit.html:16 msgid "didn't use map" msgstr "" @@ -2735,7 +2787,7 @@ msgstr "" msgid "less than a minute" msgstr "" -#: templates/web/default/report/updates.html:27 +#: templates/web/default/report/updates.html:27 templates/web/zurich/report/updates.html:16 msgid "marked as %s" msgstr "" @@ -2743,7 +2795,7 @@ msgstr "" msgid "marked as fixed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:113 templates/web/default/admin/questionnaire.html:15 templates/web/default/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:127 templates/web/default/admin/questionnaire.html:15 templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "" @@ -2755,19 +2807,19 @@ msgstr "" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:14 templates/web/zurich/admin/report_edit.html:16 msgid "originally entered" msgstr "" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:26 +#: templates/web/default/report/updates.html:26 templates/web/zurich/report/updates.html:15 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:65 templates/web/fixmystreet/header.html:50 templates/web/stevenage/header.html:98 templates/web/zurich/header.html:48 +#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 templates/web/bromley/header.html:65 templates/web/fixmybarangay/header.html:65 templates/web/fixmystreet/header.html:50 templates/web/stevenage/header.html:98 templates/web/zurich/header.html:46 msgid "sign out" msgstr "" @@ -2775,11 +2827,11 @@ msgstr "" msgid "the local council" msgstr "" -#: templates/web/default/report/_main.html:6 +#: templates/web/default/report/_main.html:6 templates/web/zurich/report/_main.html:14 msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:333 msgid "this type of local problem" msgstr "" @@ -2787,15 +2839,15 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:14 templates/web/zurich/admin/report_edit.html:16 msgid "used map" msgstr "" -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/update_edit.html:29 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:32 msgid "user is problem owner" msgstr "" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 337bd8a40..bedde3250 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: 2012-12-10 13:18+0000\n" +"POT-Creation-Date: 2012-12-21 17:13+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,8 +20,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:560 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid " and " msgstr "" @@ -30,11 +30,11 @@ msgstr "" msgid " and <strong>we will now send it to the council</strong>" msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>" -#: templates/web/default/report/new/councils_text_all.html:10 -#: templates/web/default/report/new/councils_text_all.html:17 -#: templates/web/default/report/new/councils_text_all.html:3 +#: templates/web/default/report/new/councils_text_all.html:11 +#: templates/web/default/report/new/councils_text_all.html:18 +#: templates/web/default/report/new/councils_text_all.html:4 +#: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:14 -#: templates/web/default/report/new/councils_text_none.html:17 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 @@ -43,7 +43,7 @@ msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>" msgid " or " msgstr "neu" -#: templates/web/default/admin/council_list.html:17 +#: templates/web/default/admin/bodies.html:19 #, fuzzy msgid "%d addresses" msgstr "wythnos" @@ -56,7 +56,7 @@ msgstr "" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" -#: templates/web/default/admin/council_list.html:27 +#: templates/web/default/admin/edit-league.html:5 msgid "%d edits by %s" msgstr "" @@ -80,23 +80,23 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 +#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:496 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "%s, reported anonymously at %s" msgstr "Rhoddodd %s wybod yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:498 +#: perllib/FixMyStreet/DB/Result/Problem.pm:502 msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:306 perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 #, fuzzy msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" @@ -106,7 +106,7 @@ msgid "(Don't worry — %s)" msgstr "" #: templates/web/default/admin/report_blocks.html:11 -#: templates/web/default/admin/search_users.html:23 +#: templates/web/default/admin/users.html:23 msgid "(Email in abuse table)" msgstr "" @@ -123,12 +123,14 @@ 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:23 +#: templates/web/zurich/report/_item.html:27 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:21 +#: templates/web/zurich/report/_item.html:25 msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" @@ -139,17 +141,19 @@ msgstr " " #: templates/web/default/reports/_list-entry.html:4 #: templates/web/fixmystreet/report/_item.html:17 +#: templates/web/zurich/report/_item.html:21 #, 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/zurich/report/new/fill_in_details_form.html:118 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "(optional)" msgstr "(dewisol)" #: templates/web/default/reports/_list-entry.html:2 #: templates/web/fixmystreet/report/_item.html:16 +#: templates/web/zurich/report/_item.html:20 #, fuzzy msgid "(sent to both)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -163,19 +167,19 @@ 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/Admin.pm:285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:628 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 +#: perllib/FixMyStreet/DB/Result/Problem.pm:356 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:608 -#: perllib/FixMyStreet/DB/Result/Problem.pm:359 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:362 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -406,7 +410,13 @@ msgstr "Adrodd am eiddo gwag a gweld y rhain" msgid "About us" msgstr "Amdanom ni" -#: templates/web/default/admin/council_contacts.html:72 +#: templates/web/default/admin/bodies.html:31 +#: templates/web/default/admin/body-form.html:77 +#: templates/web/zurich/admin/body-form.html:41 +msgid "Add body" +msgstr "" + +#: templates/web/default/admin/body.html:69 msgid "Add new category" msgstr "" @@ -438,10 +448,6 @@ msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" msgid "All Reports" msgstr "Adroddiadau" -#: templates/web/default/admin/council_list.html:44 -msgid "All confirmed" -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/fiksgatami/footer.html:7 @@ -463,8 +469,8 @@ msgstr "Adroddwyd am %s gan %s am %s" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/default/report/new/councils_text_all.html:10 -#: templates/web/default/report/new/councils_text_all.html:12 +#: templates/web/default/report/new/councils_text_all.html:11 +#: templates/web/default/report/new/councils_text_all.html:13 #, fuzzy msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " @@ -475,8 +481,8 @@ msgstr "" "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/report/new/councils_text_all.html:3 -#: templates/web/default/report/new/councils_text_all.html:5 +#: templates/web/default/report/new/councils_text_all.html:4 +#: templates/web/default/report/new/councils_text_all.html:6 #, fuzzy msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " @@ -490,8 +496,8 @@ 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:17 -#: templates/web/default/report/new/councils_text_all.html:19 +#: 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 @@ -515,6 +521,18 @@ msgstr "" "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/zurich/report/new/councils_text_all.html:2 +#: templates/web/zurich/report/new/councils_text_all.html:3 +#, fuzzy +msgid "" +"All the information you provide here will be sent to <strong>Stadt Zürich</" +"strong>." +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." @@ -522,14 +540,14 @@ msgstr "" "Fe wnaeth diweddariad gofnodi bod yr eiddo hwn wedi cael ei adfer i'w " "ddefnyddio." -#: templates/web/default/admin/list_flagged.html:15 +#: templates/web/default/admin/flagged.html:15 #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/search_reports.html:18 +#: templates/web/default/admin/reports.html:18 msgid "Anonymous" msgstr "Di-enw" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/update_edit.html:17 #, fuzzy msgid "Anonymous:" msgstr "Di-enw" @@ -551,6 +569,11 @@ msgstr "" msgid "Are you from a council?" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" +#: templates/web/default/admin/body-form.html:19 +#: templates/web/zurich/admin/body-form.html:19 +msgid "Area covered" +msgstr "" + #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " @@ -562,6 +585,10 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" +#: templates/web/zurich/report/_item.html:9 +msgid "Awaiting moderation" +msgstr "" + #: templates/web/default/admin/report_blocks.html:11 #, fuzzy msgid "Ban email address" @@ -573,10 +600,22 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: templates/web/default/admin/bodies.html:1 +#: templates/web/zurich/admin/header.html:13 msgid "Bodies" msgstr "" +#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/users.html:14 +msgid "Body" +msgstr "" + +#: templates/web/default/admin/user_edit.html:12 +#: templates/web/zurich/admin/report_edit.html:17 +msgid "Body:" +msgstr "" + #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 msgid "" @@ -596,15 +635,18 @@ 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:631 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: templates/web/bromley/report/new/fill_in_details_form.html:68 -#: templates/web/default/admin/council_contacts.html:37 +#: 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/list_flagged.html:14 -#: templates/web/default/admin/search_reports.html:17 +#: templates/web/default/admin/reports.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/admin/index-dm.html:12 +#: templates/web/zurich/admin/index-dm.html:39 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/report/new/fill_in_details_form.html:64 #, fuzzy msgid "Category" msgstr "Categori:" @@ -613,14 +655,16 @@ msgstr "Categori:" msgid "Category fix rate for empty properties > 4 weeks old" msgstr "" -#: templates/web/default/admin/council_contacts.html:78 -#: templates/web/default/admin/council_edit.html:23 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/body.html:75 +#: templates/web/default/admin/body_edit.html:23 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/report/new/fill_in_details_form.html:67 +#: templates/web/zurich/admin/report_edit-sdm.html:19 +#: templates/web/zurich/admin/report_edit.html:41 msgid "Category:" msgstr "Categori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:336 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 #, fuzzy msgid "Category: %s" msgstr "Categori:" @@ -639,8 +683,8 @@ msgstr "Sut i roi gwybod am eiddo gwag" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -651,7 +695,7 @@ msgstr "Sut i roi gwybod am eiddo gwag" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 #, fuzzy msgid "Closed by council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -661,7 +705,7 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "Closed reports" msgstr "Cuddio hen adroddiadau " -#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/problem_row.html:27 msgid "Closed:" msgstr "" @@ -670,49 +714,38 @@ msgstr "" 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:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "Co-ordinates:" msgstr "" -#: templates/web/default/admin/list_flagged.html:16 +#: templates/web/default/admin/flagged.html:16 #: templates/web/default/admin/list_updates.html:13 -#: templates/web/default/admin/search_reports.html:19 +#: templates/web/default/admin/reports.html:19 msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/update_edit.html:41 +#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:365 -#, fuzzy -msgid "Configuration updated" -msgstr "Cadarnhau" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:394 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" -#: templates/web/default/admin/council_edit.html:34 +#: templates/web/default/admin/body_edit.html:40 #, fuzzy msgid "Configure Endpoint" msgstr "Cadarnhau" -#: templates/web/default/admin/council_contacts.html:168 -msgid "Configure Open311" -msgstr "" - -#: templates/web/default/admin/council_contacts.html:116 -msgid "Configure Open311 integration" -msgstr "" - -#: templates/web/default/admin/council_contacts.html:46 +#: templates/web/default/admin/body.html:44 #, fuzzy msgid "Confirm" msgstr "Cadarnhau" @@ -738,13 +771,17 @@ msgstr "" #: templates/web/emptyhomes/tokens/confirm_problem.html:3 #: templates/web/southampton/tokens/confirm_problem.html:1 #: templates/web/southampton/tokens/confirm_problem.html:3 +#: templates/web/zurich/tokens/confirm_problem.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Cadarnhau" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:88 -#: templates/web/default/admin/council_edit.html:28 -#: templates/web/default/admin/council_edit.html:71 +#: templates/web/default/admin/body.html:37 +#: templates/web/default/admin/body.html:85 +#: templates/web/default/admin/body_edit.html:31 +#: templates/web/default/admin/body_edit.html:77 +#: templates/web/zurich/admin/report_edit-sdm.html:22 +#: templates/web/zurich/admin/report_edit.html:45 #, fuzzy msgid "Confirmed" msgstr "Cadarnhau" @@ -754,8 +791,8 @@ msgstr "Cadarnhau" msgid "Confirmed reports between %s and %s" msgstr "Adroddwyd am %s gan %s am %s" -#: templates/web/default/admin/problem_row.html:23 -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/report_edit.html:35 #, fuzzy msgid "Confirmed:" msgstr "Cadarnhau" @@ -786,40 +823,27 @@ msgstr "Cysylltwch â Ni" msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1159 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1187 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1168 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 msgid "Could not find user" msgstr "" -#: templates/web/default/admin/list_flagged.html:13 +#: templates/web/default/admin/flagged.html:13 #: templates/web/default/admin/list_updates.html:12 -#: templates/web/default/admin/search_reports.html:16 -#: templates/web/default/admin/search_users.html:14 #, fuzzy msgid "Council" msgstr "cyngor" -#: templates/web/default/admin/council_list.html:1 -#, fuzzy -msgid "Council contacts" -msgstr "Cysylltwch â Ni" - -#: templates/web/default/admin/council_contacts.html:1 -#: templates/web/default/admin/council_edit.html:1 +#: templates/web/default/admin/body.html:1 +#: templates/web/default/admin/body_edit.html:1 msgid "Council contacts for %s" msgstr "" #: templates/web/default/admin/stats.html:84 -#: templates/web/default/admin/user_edit.html:12 #, fuzzy msgid "Council:" msgstr "cyngor" -#: templates/web/default/admin/council_list.html:36 -#, fuzzy -msgid "Councils" -msgstr "cyngor" - #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 #, fuzzy @@ -831,19 +855,25 @@ msgstr "Cysylltu" msgid "Create a report" msgstr "Categori:" -#: templates/web/default/admin/council_contacts.html:107 +#: templates/web/default/admin/body.html:103 #, fuzzy msgid "Create category" msgstr "Categori:" -#: templates/web/default/admin/list_flagged.html:17 +#: templates/web/default/admin/flagged.html:17 #: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/search_reports.html:20 +#: templates/web/default/admin/reports.html:20 +#: templates/web/zurich/admin/index-dm.html:14 +#: templates/web/zurich/admin/index-dm.html:40 +#: templates/web/zurich/admin/index-sdm.html:21 msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:33 -#: templates/web/default/admin/update_edit.html:42 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:45 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -851,39 +881,37 @@ msgstr "" msgid "Current state" msgstr "" -#: templates/web/default/admin/council_list.html:40 -msgid "Currently has 1+ deleted" -msgstr "" - #: templates/web/default/dashboard/index.html:5 #: templates/web/default/dashboard/index.html:7 msgid "Dashboard" msgstr "" -#: templates/web/default/admin/council_contacts.html:40 -#: templates/web/default/admin/council_contacts.html:91 -#: templates/web/default/admin/council_edit.html:29 -#: templates/web/default/admin/council_edit.html:72 +#: templates/web/default/admin/body.html:38 +#: templates/web/default/admin/body.html:88 +#: templates/web/default/admin/body_edit.html:33 +#: templates/web/default/admin/body_edit.html:78 msgid "Deleted" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:54 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/zurich/report/new/fill_in_details_form.html:60 +#: templates/web/zurich/report/new/fill_in_details_form.html:56 #, fuzzy msgid "Details" 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:13 +#: templates/web/zurich/admin/report_edit.html:14 msgid "Details:" msgstr "Manylion:" -#: templates/web/default/admin/council_contacts.html:41 +#: templates/web/default/admin/body.html:39 msgid "Devolved" msgstr "" -#: templates/web/default/admin/council_list.html:23 +#: templates/web/default/admin/edit-league.html:1 msgid "Diligency prize league table" msgstr "" @@ -906,17 +934,27 @@ msgid "Don’t know" msgstr "Ddim yn gwybod" #: templates/web/default/admin/list_updates.html:35 -#: templates/web/default/admin/problem_row.html:29 -#: templates/web/default/admin/search_users.html:24 +#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/users.html:24 +#: templates/web/zurich/admin/index-dm.html:24 +#: templates/web/zurich/admin/index-dm.html:49 +#: templates/web/zurich/admin/index-sdm.html:33 msgid "Edit" msgstr "" +#: templates/web/default/admin/body.html:112 +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.html:1 #, fuzzy msgid "Editing empty property %d" msgstr "Gweld eiddo gwag" #: templates/web/default/admin/update_edit.html:1 +#: templates/web/zurich/admin/update_edit.html:1 #, fuzzy msgid "Editing update %d" msgstr "Cyflwyno'ch diweddariad" @@ -926,29 +964,29 @@ msgstr "Cyflwyno'ch diweddariad" msgid "Editing user %d" msgstr "Cyflwyno'ch diweddariad" -#: templates/web/default/admin/council_edit.html:73 +#: templates/web/default/admin/body_edit.html:79 msgid "Editor" msgstr "" #: templates/web/bromley/report/display.html:126 -#: templates/web/default/admin/council_contacts.html:38 -#: templates/web/default/admin/council_edit.html:70 -#: templates/web/default/admin/list_flagged.html:12 -#: templates/web/default/admin/list_flagged.html:35 +#: templates/web/default/admin/body.html:36 +#: templates/web/default/admin/body_edit.html:76 +#: 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/search_reports.html:15 -#: templates/web/default/admin/search_users.html:13 +#: 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:74 #, fuzzy msgid "Email" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1141 msgid "Email already in abuse list" msgstr "" @@ -960,25 +998,27 @@ msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" msgid "Email me updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/council_contacts.html:83 -#: templates/web/default/admin/council_edit.html:26 -#: templates/web/default/admin/report_edit.html:31 -#: templates/web/default/admin/update_edit.html:24 +#: templates/web/default/admin/body.html:80 +#: templates/web/default/admin/body_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user_edit.html:11 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:44 msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 +#: 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:609 +#: 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:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty office or other commercial" msgstr "Swyddfa wag neu fan masnachol gwag arall" @@ -986,11 +1026,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:613 +#: 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:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." @@ -1007,7 +1047,12 @@ msgstr "diwrnod" msgid "End month:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:9 +#: templates/web/default/admin/body-form.html:40 +#, fuzzy +msgid "Endpoint" +msgstr "Cadarnhau" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:11 #, fuzzy msgid "Enter a Zürich street name" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" @@ -1066,8 +1111,8 @@ msgstr "Rhowch fanylion yr eiddo gwag" msgid "Error" msgstr "Gwall" -#: templates/web/default/admin/council_contacts.html:13 -#: templates/web/default/admin/council_edit.html:18 +#: templates/web/default/admin/body.html:11 +#: templates/web/default/admin/body_edit.html:18 msgid "Example postcode %s" msgstr "" @@ -1075,7 +1120,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 msgid "Extra data:" msgstr "" @@ -1112,6 +1157,7 @@ msgid "reportemptyhomes.com" msgstr "reportemptyhomes.com" #: templates/web/default/admin/header.html:10 +#: templates/web/zurich/admin/header.html:10 #, fuzzy msgid "reportemptyhomes.com admin:" msgstr "reportemptyhomes.com" @@ -1157,8 +1203,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1166,17 +1212,20 @@ msgstr "" #: templates/web/fixmystreet/report/banner.html:12 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/report/banner.html:9 msgid "Fixed" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 #, fuzzy msgid "Fixed - Council" msgstr "cyngor" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 #, fuzzy msgid "Fixed - User" msgstr "Cuddio hen adroddiadau " @@ -1186,7 +1235,7 @@ msgstr "Cuddio hen adroddiadau " msgid "Fixed reports" msgstr "Cuddio hen adroddiadau " -#: templates/web/default/admin/problem_row.html:24 +#: templates/web/default/admin/problem_row.html:26 msgid "Fixed:" msgstr "" @@ -1194,12 +1243,12 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 -#: templates/web/default/admin/search_users.html:15 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 +#: templates/web/default/admin/users.html:15 msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/admin/user_edit.html:18 msgid "Flagged:" msgstr "" @@ -1210,7 +1259,7 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 #, fuzzy msgid "For council(s):" msgstr "cyngor" @@ -1272,7 +1321,7 @@ msgstr "Rhowch borthiant RSS i mi" msgid "Go" msgstr "Ewch" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #, fuzzy msgid "Going to send questionnaire?" msgstr "Anfon yr holiadur" @@ -1322,13 +1371,16 @@ msgstr "" #: templates/web/bromley/header.html:99 #: templates/web/fixmybarangay/header.html:64 #: templates/web/fixmystreet/header.html:49 -#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:47 +#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:45 msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/update_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/update_edit.html:18 #, fuzzy msgid "Hidden" msgstr "Cuddio pinnau" @@ -1341,7 +1393,7 @@ msgstr "" msgid "Hide pins" msgstr "Cuddio pinnau" -#: templates/web/default/admin/council_edit.html:66 +#: templates/web/default/admin/body_edit.html:72 msgid "History" msgstr "" @@ -1350,7 +1402,7 @@ msgstr "" msgid "How to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:648 +#: perllib/FixMyStreet/App/Controller/Admin.pm:656 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1368,7 +1420,7 @@ msgstr "" "Yn anffodus, ni fu modd i ni ddilysu'r dynodiad hwnnw. Os ydych wedi copïo'r " "URL o neges e-bost, gwnewch yn siwr eich bod wedi'i gopïo'n union.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:235 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:255 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" @@ -1376,14 +1428,17 @@ msgstr "" "Yn anffodus, ni fu modd i ni ddilysu'r dynodiad hwnnw. Os ydych wedi copïo'r " "URL o neges e-bost, gwnewch yn siwr eich bod wedi'i gopïo'n union.\n" -#: templates/web/default/admin/list_flagged.html:9 +#: templates/web/default/admin/flagged.html:9 #: templates/web/default/admin/list_updates.html:5 -#: templates/web/default/admin/search_reports.html:12 +#: templates/web/default/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:10 +#: templates/web/zurich/admin/index-dm.html:37 +#: templates/web/zurich/admin/index-sdm.html:18 msgid "ID" msgstr "" -#: templates/web/default/report/new/councils_text_none.html:11 -#: templates/web/default/report/new/councils_text_none.html:12 +#: templates/web/default/report/new/councils_text_none.html:8 +#: templates/web/default/report/new/councils_text_none.html:9 msgid "" "If you submit an empty property here the subject and details of the empty " "property will be public, but the empty property will <strong>not</strong> be " @@ -1434,19 +1489,6 @@ msgstr "ID Anghyfreithlon" msgid "Illegal feed selection" msgstr "Dewis porthiant annilys" -#: templates/web/bromley/report/display.html:80 -#: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:138 -#: templates/web/default/dashboard/index.html:140 -#: templates/web/default/report/update-form.html:30 -#: templates/web/default/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 -msgid "In Progress" -msgstr "" - #: templates/web/default/open311/index.html:21 msgid "" "In addition, the following attributes that are not part of the Open311 v2 " @@ -1455,7 +1497,20 @@ msgid "" "present if requestor allowed the name to be shown on this site)." msgstr "" +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/report/banner.html:18 msgid "In progress" msgstr "" @@ -1464,31 +1519,36 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "Cynnwys hen adroddiadau" -#: perllib/FixMyStreet/App/Controller/Open311.pm:356 +#: perllib/FixMyStreet/App/Controller/Open311.pm:348 msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:341 +#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit.html:38 +msgid "Internal notes:" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:333 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:952 +#: perllib/FixMyStreet/App/Controller/Admin.pm:961 #, fuzzy msgid "Invalid end date" msgstr "Rhowch ddiweddariad" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:424 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:951 msgid "Invalid start date" msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -1541,21 +1601,21 @@ msgstr "" msgid "Last Name" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/council_contacts.html:42 +#: templates/web/default/admin/body.html:40 msgid "Last editor" msgstr "" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 #, fuzzy msgid "Last update:" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/problem_row.html:26 +#: templates/web/default/admin/problem_row.html:28 msgid "Last update:" msgstr "" -#: templates/web/default/admin/council_contacts.html:16 -#: templates/web/default/admin/council_contacts.html:18 +#: templates/web/default/admin/body.html:14 +#: templates/web/default/admin/body.html:16 #, fuzzy msgid "List all reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" @@ -1563,7 +1623,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/fixmystreet/report/new/fill_in_details_form.html:75 -#: templates/web/zurich/report/new/fill_in_details_form.html:69 +#: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Loading..." msgstr "" @@ -1623,7 +1683,7 @@ msgstr "Neges:" msgid "Message:" msgstr "Neges:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Missing jurisdiction_id" msgstr "" @@ -1636,11 +1696,12 @@ msgstr "Cysylltu" msgid "More empty properties nearby" msgstr "Mwy o eiddo gwag cyfagos" -#: templates/web/default/admin/list_flagged.html:11 -#: templates/web/default/admin/list_flagged.html:34 +#: 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/search_reports.html:14 -#: templates/web/default/admin/search_users.html:12 +#: 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 @@ -1650,13 +1711,16 @@ msgstr "Mwy o eiddo gwag cyfagos" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:120 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 #: templates/web/fixmystreet/report/update-form.html:134 -#: templates/web/zurich/report/new/fill_in_details_form.html:118 +#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "Name" msgstr "Enw" -#: templates/web/default/admin/report_edit.html:30 -#: templates/web/default/admin/update_edit.html:23 +#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user_edit.html:10 +#: templates/web/zurich/admin/report_edit-sdm.html:20 +#: templates/web/zurich/admin/report_edit.html:43 msgid "Name:" msgstr "Enw:" @@ -1672,7 +1736,7 @@ msgid "" "using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:152 +#: perllib/FixMyStreet/Cobrand/UK.pm:148 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" @@ -1685,7 +1749,7 @@ msgid "" "Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:265 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1702,7 +1766,11 @@ msgstr "" msgid "New <br>empty properties" msgstr "Adroddiadau newydd am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:320 +#: perllib/FixMyStreet/App/Controller/Admin.pm:248 +msgid "New body added" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:350 msgid "New category contact added" msgstr "" @@ -1785,17 +1853,17 @@ msgstr "" msgid "New!" msgstr "Newydd!" -#: templates/web/default/admin/council_contacts.html:52 -#: templates/web/default/admin/council_contacts.html:53 -#: templates/web/default/admin/council_contacts.html:54 -#: templates/web/default/admin/council_edit.html:4 +#: 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:19 -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:16 +#: templates/web/default/admin/problem_row.html:21 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:107 #: templates/web/default/questionnaire/index.html:68 @@ -1804,33 +1872,32 @@ msgstr "Newydd!" msgid "No" msgstr "Nac ydw" -#: templates/web/default/admin/stats.html:85 #: templates/web/default/admin/user_edit.html:13 +msgid "No body" +msgstr "" + +#: templates/web/default/admin/stats.html:85 #, fuzzy msgid "No council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:336 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 msgid "No council selected" msgstr "Ni ddewiswyd cyngor" -#: templates/web/default/admin/council_list.html:32 +#: templates/web/default/admin/edit-league.html:10 msgid "No edits have yet been made." msgstr "" -#: templates/web/default/admin/list_flagged.html:26 +#: templates/web/default/admin/flagged.html:26 #, fuzzy msgid "No flagged empty properties found" msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." -#: templates/web/default/admin/list_flagged.html:47 +#: templates/web/default/admin/flagged.html:47 msgid "No flagged users found" msgstr "" -#: templates/web/default/admin/council_list.html:38 -msgid "No info at all" -msgstr "" - #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 msgid "No empty properties found." @@ -1845,12 +1912,13 @@ msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag." msgid "No supporters" msgstr "" -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/body.html:55 msgid "Non Public" msgstr "" -#: templates/web/default/admin/council_list.html:5 -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:47 #, fuzzy msgid "None" msgstr "Nac ydw" @@ -1865,8 +1933,8 @@ msgstr "Wedi adrodd o'r blaen" msgid "Not reported to council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/admin/council_contacts.html:43 -#: templates/web/default/admin/council_edit.html:74 +#: templates/web/default/admin/body.html:41 +#: templates/web/default/admin/body_edit.html:80 #, fuzzy msgid "Note" msgstr "Nac ydw" @@ -1878,8 +1946,8 @@ msgid "" "numbers may jump about a little" msgstr "" -#: templates/web/default/admin/council_contacts.html:95 -#: templates/web/default/admin/council_edit.html:32 +#: templates/web/default/admin/body.html:92 +#: templates/web/default/admin/body_edit.html:37 #, fuzzy msgid "Note:" msgstr "Nac ydw" @@ -1953,11 +2021,14 @@ msgid "Older empty property reports" msgstr "Adroddiadau hŷn o eiddo gwag" #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "" @@ -1993,15 +2064,16 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1006 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 -#: perllib/FixMyStreet/DB/Result/Problem.pm:505 -#: perllib/FixMyStreet/DB/Result/Problem.pm:515 -#: perllib/FixMyStreet/DB/Result/Problem.pm:525 -#: perllib/FixMyStreet/DB/Result/Problem.pm:537 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/DB/Result/Problem.pm:509 +#: perllib/FixMyStreet/DB/Result/Problem.pm:519 +#: perllib/FixMyStreet/DB/Result/Problem.pm:529 +#: perllib/FixMyStreet/DB/Result/Problem.pm:541 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 +#: templates/web/zurich/report/_main.html:8 msgid "Other" msgstr "Arall" @@ -2021,8 +2093,13 @@ msgstr "Arall" msgid "Page Not Found" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/body-form.html:9 +#: templates/web/zurich/admin/body-form.html:9 +msgid "Parent" +msgstr "" + +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 msgid "Partial" msgstr "" @@ -2043,14 +2120,16 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:148 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/report/new/fill_in_details_form.html:124 +#: templates/web/zurich/report/new/fill_in_details_form.html:120 #, fuzzy msgid "Phone number (optional)" msgstr "(dewisol)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 -#: templates/web/default/admin/report_edit.html:32 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 +#: templates/web/default/admin/report_edit.html:33 #: templates/web/default/report/new/fill_in_details_form.html:215 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Phone:" msgstr "Rhif ffôn:" @@ -2058,7 +2137,7 @@ msgstr "Rhif ffôn:" #: 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:57 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 #, fuzzy msgid "Photo" msgstr "Ffotograff:" @@ -2076,8 +2155,8 @@ msgstr "Ffotograffau o adroddiadau cyfagos diweddar" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -2117,16 +2196,16 @@ msgstr "Rhowch eich cyfeiriad e-bost" msgid "Please check your email address is correct" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:822 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:829 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 -#: perllib/FixMyStreet/DB/Result/Problem.pm:355 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:828 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:835 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:854 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:897 +#: perllib/FixMyStreet/DB/Result/Problem.pm:358 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Dewiswch gategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:361 +#: perllib/FixMyStreet/DB/Result/Problem.pm:364 msgid "Please choose a property type" msgstr "Dewiswch fath o eiddo" @@ -2158,7 +2237,7 @@ msgid "" "service for all users." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Comment.pm:147 #: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "Ychwanegwch neges" @@ -2170,12 +2249,12 @@ msgid "Please enter a password" msgstr "Ychwanegwch neges" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:330 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" -#: perllib/FixMyStreet/DB/Result/User.pm:104 +#: perllib/FixMyStreet/DB/Result/User.pm:115 #: templates/web/default/js/validation_strings.html:12 #: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" @@ -2186,13 +2265,13 @@ 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:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:336 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Cofnodwch fanylion" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 -#: perllib/FixMyStreet/DB/Result/User.pm:101 +#: 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/validation_strings.html:11 @@ -2204,7 +2283,7 @@ msgstr "Cofnodwch eich cyfeiriad e-bost" #: templates/web/bromley/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 -#: templates/web/zurich/report/new/fill_in_details_form.html:110 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 #, fuzzy msgid "Please enter your email address" msgstr "Cofnodwch eich cyfeiriad e-bost" @@ -2214,7 +2293,7 @@ msgstr "Cofnodwch eich cyfeiriad e-bost" msgid "Please enter your first name" msgstr "Cofnodwch eich enw" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:351 #: templates/web/default/js/validation_strings.html:7 #, fuzzy msgid "" @@ -2225,9 +2304,9 @@ 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:143 -#: perllib/FixMyStreet/DB/Result/Problem.pm:341 -#: perllib/FixMyStreet/DB/Result/User.pm:97 +#: perllib/FixMyStreet/DB/Result/Comment.pm:144 +#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "Cofnodwch eich enw" @@ -2293,7 +2372,7 @@ msgid "" msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/report/new/fill_in_details_form.html:64 +#: templates/web/zurich/report/new/fill_in_details_form.html:60 #, fuzzy msgid "Please fill in details of the empty property." msgstr "Llenwch fanylion yr eiddo gwag isod." @@ -2301,7 +2380,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/fixmystreet/report/new/fill_in_details_form.html:35 -#: templates/web/zurich/report/new/fill_in_details_form.html:35 +#: templates/web/zurich/report/new/fill_in_details_form.html:34 #, fuzzy msgid "" "Please fill in the form below with details of the empty property, and " @@ -2335,7 +2414,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/fixmystreet/report/new/fill_in_details_form.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:26 +#: templates/web/zurich/report/new/fill_in_details_form.html:25 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2419,17 +2498,19 @@ msgid "Posted anonymously at %s" msgstr "Cofnodwyd yn ddi-enw am %s" #: templates/web/default/report/updates.html:21 +#: templates/web/zurich/report/updates.html:11 #, fuzzy msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Cofnodwyd gan %s am %s" #: templates/web/default/report/updates.html:23 +#: templates/web/zurich/report/updates.html:13 msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" -#: templates/web/default/admin/council_contacts.html:100 -#: templates/web/default/admin/council_edit.html:30 -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/body.html:97 +#: templates/web/default/admin/body_edit.html:35 +#: templates/web/default/admin/report_edit.html:44 msgid "Private" msgstr "" @@ -2452,12 +2533,17 @@ msgstr "Ffurflen manylion eiddo gwag" msgid "Empty property %s sent to council %s" msgstr "Eiddo gwag yn %s" +#: templates/web/zurich/admin/index-dm.html:11 +#, fuzzy +msgid "Empty property ID" +msgstr "Eiddo gwag" + #: templates/web/default/admin/index.html:28 #, fuzzy msgid "Empty property breakdown by state" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:849 +#: perllib/FixMyStreet/App/Controller/Admin.pm:863 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" @@ -2466,7 +2552,7 @@ msgstr "Ffurflen manylion eiddo gwag" msgid "Empty property state change based on survey results" msgstr "" -#: templates/web/default/admin/list_flagged.html:5 +#: templates/web/default/admin/flagged.html:5 #, fuzzy msgid "Empty properties" msgstr "Eiddo gwag" @@ -2501,15 +2587,15 @@ msgstr "" msgid "Empty properties within %.1fkm of this location" msgstr "Eiddo gwag o fewn %skm o'r lleoliad hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:612 +#: perllib/FixMyStreet/Cobrand/Default.pm:600 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 +#: perllib/FixMyStreet/Cobrand/UK.pm:227 msgid "Empty properties within %s" msgstr "Eiddo gwag yn %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:245 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "Empty properties within %s ward" msgstr "Eiddo gwag yn ward %s" @@ -2530,7 +2616,7 @@ 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:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Property type:" msgstr "Math o eiddo:" @@ -2562,8 +2648,8 @@ msgid "" "report empty properties, leave updates and manage your reports." msgstr "" -#: templates/web/default/admin/council_contacts.html:44 -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/body.html:42 +#: templates/web/default/admin/body.html:55 msgid "Public" msgstr "" @@ -2605,25 +2691,25 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" msgid "RSS feed" msgstr "Porthiant RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:274 perllib/FixMyStreet/Cobrand/UK.pm:286 +#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 #, fuzzy msgid "RSS feed for %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 #, fuzzy msgid "RSS feed for %s ward, %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:178 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 -#: perllib/FixMyStreet/Cobrand/UK.pm:300 perllib/FixMyStreet/Cobrand/UK.pm:312 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 +#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 msgid "RSS feed of %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:305 perllib/FixMyStreet/Cobrand/UK.pm:317 +#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 #, fuzzy msgid "RSS feed of %s, within %s ward" msgstr "Porthiant RSS %s" @@ -2637,16 +2723,16 @@ msgstr "Porthiant RSS o eiddo gwag sydd gerllaw" msgid "RSS feed of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:613 +#: perllib/FixMyStreet/Cobrand/Default.pm:601 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 -#: perllib/FixMyStreet/Cobrand/UK.pm:238 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 +#: perllib/FixMyStreet/Cobrand/UK.pm:234 #, fuzzy msgid "RSS feed of empty properties within %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:244 +#: perllib/FixMyStreet/Cobrand/UK.pm:240 #, fuzzy msgid "RSS feed of empty properties within %s ward" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" @@ -2713,8 +2799,10 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:54 -#: templates/web/default/admin/update_edit.html:48 +#: templates/web/default/admin/report_edit.html:55 +#: templates/web/default/admin/update_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2765,45 +2853,55 @@ msgstr "Adroddiadau" msgid "Reported %s, to %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:524 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddi-enw am %s" +#: templates/web/zurich/report/_main.html:11 +#, fuzzy +msgid "Reported at %s" +msgstr "Adroddiadau" + #: templates/web/default/admin/questionnaire.html:5 #: templates/web/default/questionnaire/index.html:77 #: templates/web/fixmystreet/questionnaire/index.html:71 msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:516 msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:543 +#: perllib/FixMyStreet/DB/Result/Problem.pm:547 #: 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:534 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 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:528 +#: perllib/FixMyStreet/DB/Result/Problem.pm:532 msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:516 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 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:538 +#: templates/web/zurich/report/_main.html:9 +#, fuzzy +msgid "Reported in the %s category at %s" +msgstr "Adroddwyd yn y categori %s gan %s am %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:542 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" @@ -2819,7 +2917,8 @@ msgstr "Adroddwyd yn y categori %s gan %s am %s" msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1033 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: templates/web/zurich/admin/header.html:14 msgid "Reports" msgstr "Adroddiadau" @@ -2827,7 +2926,7 @@ msgstr "Adroddiadau" msgid "Reports on and around the map" msgstr "Adroddiadau ar ac yng nghyffiniau'r map" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 #, fuzzy msgid "Resend report" msgstr "Cuddio hen adroddiadau " @@ -2842,26 +2941,36 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: templates/web/default/admin/council_edit.html:63 +#: templates/web/default/admin/body_edit.html:69 msgid "Save changes" msgstr "" -#: templates/web/default/admin/list_flagged.html:1 -#: templates/web/default/admin/search_reports.html:1 +#: templates/web/default/admin/flagged.html:1 +#: templates/web/default/admin/reports.html:1 #, fuzzy msgid "Search Reports" msgstr "Adroddiadau cryno" -#: templates/web/default/admin/search_users.html:1 +#: templates/web/default/admin/users.html:1 #, fuzzy msgid "Search Users" msgstr "Adroddiadau cryno" -#: templates/web/default/admin/search_reports.html:5 -#: templates/web/default/admin/search_users.html:5 +#: templates/web/default/admin/reports.html:5 +#: templates/web/default/admin/users.html:5 msgid "Search:" msgstr "" +#: templates/web/default/admin/body-form.html:11 +#: templates/web/zurich/admin/body-form.html:11 +msgid "Select a body" +msgstr "" + +#: templates/web/default/admin/body-form.html:21 +#: templates/web/zurich/admin/body-form.html:21 +msgid "Select an area" +msgstr "" + #: templates/web/default/alert/_list.html:8 #: templates/web/fixmystreet/alert/_list.html:10 #, fuzzy @@ -2873,16 +2982,20 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: templates/web/zurich/admin/report_edit-sdm.html:15 +msgid "Send back to division" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 #, fuzzy msgid "Sent:" msgstr "Pwnc:" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:38 msgid "Service:" msgstr "" @@ -2956,7 +3069,7 @@ msgstr "Dangos pinnau" #: templates/web/fixmystreet/auth/general.html:42 #: templates/web/fixmystreet/auth/general.html:62 #: templates/web/fixmystreet/header.html:53 -#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:51 +#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:49 msgid "Sign in" msgstr "" @@ -3006,11 +3119,7 @@ msgstr "Rhai ffotograffau o adroddiadau diweddar" msgid "Some text to localize" msgstr "" -#: templates/web/default/admin/council_list.html:42 -msgid "Some unconfirmeds" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/UK.pm:89 +#: perllib/FixMyStreet/Cobrand/UK.pm:93 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3053,22 +3162,24 @@ msgid "Start month:" msgstr "" #: templates/web/bromley/report/display.html:78 -#: templates/web/default/admin/list_flagged.html:18 +#: templates/web/default/admin/flagged.html:18 #: templates/web/default/admin/list_updates.html:6 -#: templates/web/default/admin/search_reports.html:21 +#: templates/web/default/admin/reports.html:21 #: templates/web/fixmystreet/report/update-form.html:26 #, fuzzy msgid "State" msgstr "Diweddariad:" -#: templates/web/default/admin/report_edit.html:17 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/update_edit.html:17 #, fuzzy msgid "State:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1047 #: templates/web/default/admin/stats.html:1 #, fuzzy msgid "Stats" @@ -3089,6 +3200,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/zurich/admin/report_edit.html:13 msgid "Subject:" msgstr "Pwnc:" @@ -3102,13 +3214,16 @@ msgstr "Pwnc:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:152 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:177 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:222 -#: templates/web/zurich/report/new/fill_in_details_form.html:128 +#: templates/web/zurich/report/new/fill_in_details_form.html:125 msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:57 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:58 +#: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user_edit.html:20 +#: templates/web/zurich/admin/report_edit-sdm.html:31 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/update_edit.html:38 #, fuzzy msgid "Submit changes" msgstr "Anfon" @@ -3118,6 +3233,13 @@ msgstr "Anfon" msgid "Submit questionnaire" msgstr "Anfon yr holiadur" +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/report/banner.html:15 +#, fuzzy +msgid "Submitted" +msgstr "Anfon" + #: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:38 @@ -3139,8 +3261,11 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1031 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 #: templates/web/default/admin/index.html:1 +#: templates/web/zurich/admin/header.html:11 +#: templates/web/zurich/admin/index-dm.html:1 +#: templates/web/zurich/admin/index-sdm.html:1 #, fuzzy msgid "Summary" msgstr "Adroddiadau cryno" @@ -3153,7 +3278,7 @@ msgstr "Adroddiadau cryno" msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1044 msgid "Survey" msgstr "" @@ -3162,14 +3287,16 @@ msgid "Survey Results" msgstr "" #: templates/web/default/admin/list_updates.html:14 +#: templates/web/zurich/admin/index-dm.html:13 msgid "Text" msgstr "" -#: templates/web/default/admin/council_contacts.html:20 +#: templates/web/default/admin/body.html:18 msgid "Text only version" msgstr "" -#: templates/web/default/admin/update_edit.html:13 +#: templates/web/default/admin/update_edit.html:14 +#: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "" @@ -3289,11 +3416,11 @@ msgstr "" "arni." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:82 +#: perllib/FixMyStreet/Cobrand/UK.pm:86 msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:616 +#: perllib/FixMyStreet/App/Controller/Admin.pm:624 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" @@ -3378,8 +3505,7 @@ msgid "" msgstr "Mae manylion eich eiddo gwag ar gael ar ochr dde'r dudalen hon." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:43 -#: perllib/FixMyStreet/App/Controller/Reports.pm:74 +#: perllib/FixMyStreet/App/Controller/Reports.pm:50 #, fuzzy msgid "The error was: %s" msgstr "Testun y gwall oedd:" @@ -3494,7 +3620,7 @@ msgid "" "if you give us permission." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:271 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:273 msgid "" "The user could not locate the empty property on a map, but to see the area " "around the location they entered" @@ -3502,7 +3628,7 @@ msgstr "" "Ni allai'r defnyddiwr leoli'r eiddo gwag ar fap, ond i weld yr ardal o " "gwmpas y lleoliad a gofnodwyd ganddynt " -#: perllib/FixMyStreet/App/Controller/Reports.pm:71 +#: perllib/FixMyStreet/App/Controller/Reports.pm:47 msgid "" "There was an empty property showing the All Reports page. Please try again " "later." @@ -3513,7 +3639,7 @@ 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:736 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3542,13 +3668,19 @@ msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod." msgid "There were problems with your update. Please see below." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/report/banner.html:12 +msgid "Third party" +msgstr "" + #: templates/web/default/open311/index.html:10 msgid "" "This API implementation is work in progress and not yet stabilized. It will " "change without warnings in the future." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 msgid "" "This email has been sent to both councils covering the location of the empty " "property, as the user did not categorise it; please ignore it if you're not " @@ -3556,15 +3688,15 @@ msgid "" "empty property this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:345 msgid "" "This email has been sent to several councils covering the location of the " "empty property, as the category selected is provided for all of them; please " "ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:868 -#: perllib/FixMyStreet/Cobrand/UK.pm:54 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "" @@ -3632,6 +3764,10 @@ 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." +#: templates/web/zurich/report/_main.html:21 +msgid "This report is awaiting moderation." +msgstr "" + #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 #, fuzzy msgid "This report is currently marked as closed." @@ -3646,7 +3782,7 @@ msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:266 msgid "" "This web page also contains a photo of the empty property, provided by the " "user." @@ -3654,13 +3790,15 @@ 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:1034 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" -#: templates/web/default/admin/list_flagged.html:10 -#: templates/web/default/admin/search_reports.html:13 +#: templates/web/default/admin/flagged.html:10 +#: templates/web/default/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:38 +#: templates/web/zurich/admin/index-sdm.html:19 msgid "Title" msgstr "" @@ -3692,7 +3830,7 @@ msgstr "" "ward chi,\n" "cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:270 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:272 msgid "To view a map of the precise location of this issue" msgstr "Gweld map o union leoliad y broblem hon" @@ -3703,13 +3841,10 @@ msgstr "Gweld map o union leoliad y broblem hon" msgid "Total" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:42 -msgid "Unable to look up areas in MaPit. Please try again later." -msgstr "" - -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/update_edit.html:22 +#: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -3748,6 +3883,12 @@ msgstr "Adroddwyd yn ddi-enw am %s" msgid "Update below added by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" +#: templates/web/default/admin/body-form.html:77 +#: templates/web/zurich/admin/body-form.html:41 +#, fuzzy +msgid "Update body" +msgstr "Diweddariadau" + #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" msgstr "" @@ -3756,37 +3897,40 @@ msgstr "" msgid "Update by {{name}}" msgstr "Diweddariadau yn ôl {{name}}" -#: templates/web/default/admin/update_edit.html:33 +#: templates/web/default/admin/update_edit.html:36 +#: templates/web/zurich/admin/update_edit.html:25 #, fuzzy msgid "Update changed empty property state to %s" msgstr "" "Fe wnaeth diweddariad gofnodi bod yr eiddo hwn wedi cael ei adfer i'w " "ddefnyddio." -#: templates/web/default/admin/update_edit.html:35 +#: templates/web/default/admin/update_edit.html:38 #, fuzzy msgid "Update marked empty property as returned to use" msgstr "" "Fe wnaeth diweddariad gofnodi bod yr eiddo hwn wedi cael ei adfer i'w " "ddefnyddio." -#: templates/web/default/admin/update_edit.html:37 +#: templates/web/default/admin/update_edit.html:40 #, fuzzy msgid "Update reopened empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/body.html:65 #, fuzzy msgid "Update statuses" msgstr "Diweddariadau" #: templates/web/default/report/update-form.html:22 +#: templates/web/zurich/admin/report_edit-sdm.html:26 msgid "Update:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:839 -#: perllib/FixMyStreet/App/Controller/Admin.pm:899 +#: perllib/FixMyStreet/App/Controller/Admin.pm:720 +#: perllib/FixMyStreet/App/Controller/Admin.pm:853 +#: perllib/FixMyStreet/App/Controller/Admin.pm:912 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:171 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" @@ -3810,27 +3954,31 @@ 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:1191 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1163 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1172 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 -#: templates/web/default/admin/list_flagged.html:30 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 +#: templates/web/default/admin/flagged.html:30 +#: templates/web/zurich/admin/header.html:17 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:375 #, fuzzy msgid "Values updated" 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:12 +#: templates/web/zurich/admin/report_edit.html:12 +#: templates/web/zurich/admin/update_edit.html:10 #, fuzzy msgid "View report on site" msgstr "Adroddiadau" @@ -3896,7 +4044,7 @@ msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" #: templates/web/bromley/report/new/fill_in_details_form.html:179 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:144 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 -#: templates/web/zurich/report/new/fill_in_details_form.html:114 +#: templates/web/zurich/report/new/fill_in_details_form.html:110 #, fuzzy msgid "We never show your email address or phone number." msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" @@ -3951,17 +4099,17 @@ msgstr "" "Byddai'n dda gennym glywed eich barn am y wefan hon. Llenwch y ffurflen, neu " "anfonwch neges e-bost at <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:45 -#: templates/web/default/admin/council_edit.html:69 +#: templates/web/default/admin/body.html:43 +#: templates/web/default/admin/body_edit.html:75 msgid "When edited" msgstr "" -#: templates/web/default/admin/list_flagged.html:19 -#: templates/web/default/admin/search_reports.html:22 +#: 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:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 msgid "Whole block of empty flats" msgstr "Bloc cyfan o fflatiau gwag" @@ -4007,18 +4155,18 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/council_contacts.html:52 -#: templates/web/default/admin/council_contacts.html:53 -#: templates/web/default/admin/council_contacts.html:54 -#: templates/web/default/admin/council_edit.html:5 +#: 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:19 -#: templates/web/default/admin/report_edit.html:27 -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/search_users.html:23 -#: templates/web/default/admin/update_edit.html:15 +#: templates/web/default/admin/problem_row.html:21 +#: templates/web/default/admin/report_edit.html:28 +#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/users.html:23 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:105 #: templates/web/default/questionnaire/index.html:66 @@ -4060,13 +4208,19 @@ msgstr "" "Gallwch <a href=\"%s\">weld llai o fanylion</a> neu fynd yn ôl a <a href=\"/" "reports\">dangos pob cyngor</a>." +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:8 +#, fuzzy +msgid "You can <a href=\"%s%s\">view the empty property on this site</a>." +msgstr ". Gallwch <a href=\"%s\">weld yr eiddo gwag ar y safle hwn</a>." + #: templates/web/emptyhomes/reports/body.html:66 #, fuzzy msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a>." -#: templates/web/default/report/new/councils_text_none.html:14 -#: templates/web/default/report/new/councils_text_none.html:16 +#: templates/web/default/report/new/councils_text_none.html:11 +#: templates/web/default/report/new/councils_text_none.html:13 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 msgid "" @@ -4089,7 +4243,7 @@ msgstr "" #: 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/zurich/report/new/fill_in_details_form.html:93 +#: templates/web/zurich/report/new/fill_in_details_form.html:89 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -4111,7 +4265,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/fixmystreet/report/new/fill_in_details_form.html:28 -#: templates/web/zurich/report/new/fill_in_details_form.html:28 +#: templates/web/zurich/report/new/fill_in_details_form.html:27 #, fuzzy msgid "" "You have located the empty property at the point marked with a green pin on " @@ -4125,6 +4279,12 @@ msgstr "" msgid "You have successfully confirmed your alert." msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus." +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:6 +#, fuzzy +msgid "You have successfully confirmed your email address." +msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus." + #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 msgid "You have successfully confirmed your empty property" @@ -4148,7 +4308,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:743 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 #, fuzzy msgid "" @@ -4162,7 +4322,7 @@ msgid "" "do not, %s." msgstr "" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "You really want to resend?" msgstr "" @@ -4185,7 +4345,7 @@ msgstr "Adroddiadau" #: templates/web/fixmystreet/report/display.html:55 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:157 -#: templates/web/zurich/report/new/fill_in_details_form.html:106 +#: templates/web/zurich/report/new/fill_in_details_form.html:102 #, fuzzy msgid "Your email" msgstr "Eich cyfeiriad e-bost:" @@ -4234,7 +4394,7 @@ msgstr "Eich enw:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:202 #: templates/web/fixmystreet/report/update-form.html:138 -#: templates/web/zurich/report/new/fill_in_details_form.html:122 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 #, fuzzy msgid "Your name" msgstr "Eich enw:" @@ -4263,7 +4423,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:184 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:216 -#: templates/web/zurich/report/new/fill_in_details_form.html:125 +#: templates/web/zurich/report/new/fill_in_details_form.html:121 msgid "Your phone number" msgstr "" @@ -4302,11 +4462,13 @@ msgstr "" msgid "council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:609 msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "didn't use map" msgstr "" @@ -4324,6 +4486,7 @@ msgid "less than a minute" msgstr "llai na munud" #: templates/web/default/report/updates.html:27 +#: templates/web/zurich/report/updates.html:16 msgid "marked as %s" msgstr "" @@ -4331,7 +4494,7 @@ msgstr "" msgid "marked as returned to use" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin.pm:127 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" @@ -4347,15 +4510,18 @@ msgstr "neu" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "originally entered" msgstr "" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 msgid "other areas:" msgstr "" #: templates/web/default/report/updates.html:26 +#: templates/web/zurich/report/updates.html:15 msgid "reopened" msgstr "wedi'i ailagor" @@ -4363,7 +4529,7 @@ msgstr "wedi'i ailagor" #: templates/web/bromley/header.html:65 #: templates/web/fixmybarangay/header.html:65 #: templates/web/fixmystreet/header.html:50 -#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:48 +#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:46 msgid "sign out" msgstr "" @@ -4380,10 +4546,11 @@ msgid "the local council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" #: templates/web/default/report/_main.html:6 +#: templates/web/zurich/report/_main.html:14 msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:333 #, fuzzy msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" @@ -4392,15 +4559,17 @@ msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" msgid "today" msgstr "heddiw" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "used map" msgstr "" -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/update_edit.html:29 msgid "user is from same council as empty property - %d" msgstr "" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:32 #, fuzzy msgid "user is empty property owner" msgstr "Adroddiadau hŷn o eiddo gwag" @@ -4521,6 +4690,18 @@ msgstr[0] "diwrnod" msgstr[1] "diwrnod" #, fuzzy +#~ msgid "Configuration updated" +#~ msgstr "Cadarnhau" + +#, fuzzy +#~ msgid "Council contacts" +#~ msgstr "Cysylltwch â Ni" + +#, fuzzy +#~ msgid "Councils" +#~ msgstr "cyngor" + +#, fuzzy #~ msgid "reportemptyhomes.com administration" #~ msgstr "Diweddariadau i reportemptyhomes.com" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index 73b99b30f..2582d6df4 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-12-10 13:18+0000\n" +"POT-Creation-Date: 2012-12-21 17:13+0000\n" "PO-Revision-Date: 2012-12-17 16:50+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:560 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid " and " msgstr "und" @@ -26,11 +26,11 @@ msgstr "und" msgid " and <strong>we will now send it to the council</strong>" msgstr "" -#: templates/web/default/report/new/councils_text_all.html:10 -#: templates/web/default/report/new/councils_text_all.html:17 -#: templates/web/default/report/new/councils_text_all.html:3 +#: templates/web/default/report/new/councils_text_all.html:11 +#: templates/web/default/report/new/councils_text_all.html:18 +#: templates/web/default/report/new/councils_text_all.html:4 +#: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:14 -#: templates/web/default/report/new/councils_text_none.html:17 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 @@ -38,7 +38,7 @@ msgstr "" msgid " or " msgstr "oder" -#: templates/web/default/admin/council_list.html:17 +#: templates/web/default/admin/bodies.html:19 msgid "%d addresses" msgstr "%d Adressen" @@ -50,7 +50,7 @@ msgstr "" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" -#: templates/web/default/admin/council_list.html:27 +#: templates/web/default/admin/edit-league.html:5 msgid "%d edits by %s" msgstr "" @@ -73,23 +73,23 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 +#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:496 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "%s, reported anonymously at %s" msgstr "%s, gemeldet um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:498 +#: perllib/FixMyStreet/DB/Result/Problem.pm:502 msgid "%s, reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:306 perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "%s, within %s ward" msgstr "" @@ -98,7 +98,7 @@ msgid "(Don't worry — %s)" msgstr "" #: templates/web/default/admin/report_blocks.html:11 -#: templates/web/default/admin/search_users.html:23 +#: templates/web/default/admin/users.html:23 msgid "(Email in abuse table)" msgstr "" @@ -115,6 +115,7 @@ 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:23 +#: templates/web/zurich/report/_item.html:27 #, fuzzy msgid "(closed)" msgstr "Geschlossen" @@ -122,6 +123,7 @@ msgstr "Geschlossen" #: 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:21 +#: templates/web/zurich/report/_item.html:25 msgid "(fixed)" msgstr "(gelöst)" @@ -132,16 +134,18 @@ msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" #: templates/web/default/reports/_list-entry.html:4 #: templates/web/fixmystreet/report/_item.html:17 +#: templates/web/zurich/report/_item.html:21 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:118 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "(optional)" msgstr "(optional)" #: templates/web/default/reports/_list-entry.html:2 #: templates/web/fixmystreet/report/_item.html:16 +#: templates/web/zurich/report/_item.html:20 msgid "(sent to both)" msgstr "" @@ -153,18 +157,18 @@ 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/Admin.pm:285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 msgid "*unknown*" msgstr "*unbekannt*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:628 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 +#: perllib/FixMyStreet/DB/Result/Problem.pm:356 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:608 -#: perllib/FixMyStreet/DB/Result/Problem.pm:359 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:362 msgid "-- Pick a property type --" msgstr "" @@ -319,7 +323,13 @@ msgstr "" msgid "About us" msgstr "Über uns" -#: templates/web/default/admin/council_contacts.html:72 +#: templates/web/default/admin/bodies.html:31 +#: templates/web/default/admin/body-form.html:77 +#: templates/web/zurich/admin/body-form.html:41 +msgid "Add body" +msgstr "" + +#: templates/web/default/admin/body.html:69 msgid "Add new category" msgstr "Füge neue Kategorie hinzu" @@ -350,10 +360,6 @@ msgstr "" msgid "All Reports" msgstr "Alle Meldungen" -#: templates/web/default/admin/council_list.html:44 -msgid "All confirmed" -msgstr "Alle bestätigten" - #: 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/fiksgatami/footer.html:7 @@ -374,15 +380,15 @@ msgstr "Gemeldet von %s um %s" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/default/report/new/councils_text_all.html:10 -#: templates/web/default/report/new/councils_text_all.html:12 +#: templates/web/default/report/new/councils_text_all.html:11 +#: templates/web/default/report/new/councils_text_all.html:13 msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " "<strong>Roads Service</strong>." msgstr "" -#: templates/web/default/report/new/councils_text_all.html:3 -#: templates/web/default/report/new/councils_text_all.html:5 +#: templates/web/default/report/new/councils_text_all.html:4 +#: templates/web/default/report/new/councils_text_all.html:6 msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " "a relevant local body such as <strong>TfL</strong>, via the London Report-It " @@ -391,8 +397,8 @@ 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:17 -#: templates/web/default/report/new/councils_text_all.html:19 +#: 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 @@ -411,19 +417,26 @@ msgid "" "name if you give us permission." msgstr "" +#: templates/web/zurich/report/new/councils_text_all.html:2 +#: templates/web/zurich/report/new/councils_text_all.html:3 +msgid "" +"All the information you provide here will be sent to <strong>Stadt Zürich</" +"strong>." +msgstr "" + #: templates/web/default/questionnaire/index.html:60 #: templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/default/admin/list_flagged.html:15 +#: templates/web/default/admin/flagged.html:15 #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/search_reports.html:18 +#: templates/web/default/admin/reports.html:18 msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "Anonym:" @@ -443,6 +456,11 @@ msgstr "" msgid "Are you from a council?" msgstr "" +#: templates/web/default/admin/body-form.html:19 +#: templates/web/zurich/admin/body-form.html:19 +msgid "Area covered" +msgstr "" + #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " @@ -454,6 +472,10 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" +#: templates/web/zurich/report/_item.html:9 +msgid "Awaiting moderation" +msgstr "" + #: templates/web/default/admin/report_blocks.html:11 msgid "Ban email address" msgstr "" @@ -464,10 +486,22 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: templates/web/default/admin/bodies.html:1 +#: templates/web/zurich/admin/header.html:13 msgid "Bodies" msgstr "" +#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/users.html:14 +msgid "Body" +msgstr "" + +#: templates/web/default/admin/user_edit.html:12 +#: templates/web/zurich/admin/report_edit.html:17 +msgid "Body:" +msgstr "" + #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 msgid "" @@ -486,15 +520,18 @@ msgstr "" "Karte nicht sichtbar? <a href='%s' rel='nofollow'>Überspringen Sie " "diesen Schritt</a>" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: templates/web/bromley/report/new/fill_in_details_form.html:68 -#: templates/web/default/admin/council_contacts.html:37 +#: 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/list_flagged.html:14 -#: templates/web/default/admin/search_reports.html:17 +#: templates/web/default/admin/reports.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/admin/index-dm.html:12 +#: templates/web/zurich/admin/index-dm.html:39 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/report/new/fill_in_details_form.html:64 msgid "Category" msgstr "Kategorie" @@ -502,14 +539,16 @@ msgstr "Kategorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/default/admin/council_contacts.html:78 -#: templates/web/default/admin/council_edit.html:23 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/body.html:75 +#: templates/web/default/admin/body_edit.html:23 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/report/new/fill_in_details_form.html:67 +#: templates/web/zurich/admin/report_edit-sdm.html:19 +#: templates/web/zurich/admin/report_edit.html:41 msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:336 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 msgid "Category: %s" msgstr "Kategorie: %s" @@ -526,8 +565,8 @@ msgstr "Mangel lokalisieren" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -538,7 +577,7 @@ msgstr "Mangel lokalisieren" msgid "Closed" msgstr "Geschlossen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Closed by council" msgstr "" @@ -546,7 +585,7 @@ msgstr "" msgid "Closed reports" msgstr "" -#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/problem_row.html:27 msgid "Closed:" msgstr "Geschlossen:" @@ -555,47 +594,37 @@ msgstr "Geschlossen:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "Co-ordinates:" msgstr "Koordinaten:" -#: templates/web/default/admin/list_flagged.html:16 +#: templates/web/default/admin/flagged.html:16 #: templates/web/default/admin/list_updates.html:13 -#: templates/web/default/admin/search_reports.html:19 +#: templates/web/default/admin/reports.html:19 msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/update_edit.html:41 +#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:365 -msgid "Configuration updated" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:394 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" -#: templates/web/default/admin/council_edit.html:34 +#: templates/web/default/admin/body_edit.html:40 msgid "Configure Endpoint" msgstr "" -#: templates/web/default/admin/council_contacts.html:168 -msgid "Configure Open311" -msgstr "" - -#: templates/web/default/admin/council_contacts.html:116 -msgid "Configure Open311 integration" -msgstr "" - -#: templates/web/default/admin/council_contacts.html:46 +#: templates/web/default/admin/body.html:44 msgid "Confirm" msgstr "Bestätigen" @@ -619,13 +648,17 @@ msgstr "" #: templates/web/emptyhomes/tokens/confirm_problem.html:3 #: templates/web/southampton/tokens/confirm_problem.html:1 #: templates/web/southampton/tokens/confirm_problem.html:3 +#: templates/web/zurich/tokens/confirm_problem.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Bestätigung" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:88 -#: templates/web/default/admin/council_edit.html:28 -#: templates/web/default/admin/council_edit.html:71 +#: templates/web/default/admin/body.html:37 +#: templates/web/default/admin/body.html:85 +#: templates/web/default/admin/body_edit.html:31 +#: templates/web/default/admin/body_edit.html:77 +#: templates/web/zurich/admin/report_edit-sdm.html:22 +#: templates/web/zurich/admin/report_edit.html:45 msgid "Confirmed" msgstr "Bestätigt" @@ -633,8 +666,8 @@ msgstr "Bestätigt" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/default/admin/problem_row.html:23 -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/report_edit.html:35 msgid "Confirmed:" msgstr "Bestätigt:" @@ -663,36 +696,25 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1159 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1187 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1168 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 msgid "Could not find user" msgstr "" -#: templates/web/default/admin/list_flagged.html:13 +#: templates/web/default/admin/flagged.html:13 #: templates/web/default/admin/list_updates.html:12 -#: templates/web/default/admin/search_reports.html:16 -#: templates/web/default/admin/search_users.html:14 msgid "Council" msgstr "" -#: templates/web/default/admin/council_list.html:1 -msgid "Council contacts" -msgstr "" - -#: templates/web/default/admin/council_contacts.html:1 -#: templates/web/default/admin/council_edit.html:1 +#: templates/web/default/admin/body.html:1 +#: templates/web/default/admin/body_edit.html:1 msgid "Council contacts for %s" msgstr "" #: templates/web/default/admin/stats.html:84 -#: templates/web/default/admin/user_edit.html:12 msgid "Council:" msgstr "" -#: templates/web/default/admin/council_list.html:36 -msgid "Councils" -msgstr "" - #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 msgid "Count" @@ -702,18 +724,24 @@ msgstr "" msgid "Create a report" msgstr "Erfasse eine Meldung" -#: templates/web/default/admin/council_contacts.html:107 +#: templates/web/default/admin/body.html:103 msgid "Create category" msgstr "" -#: templates/web/default/admin/list_flagged.html:17 +#: templates/web/default/admin/flagged.html:17 #: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/search_reports.html:20 +#: templates/web/default/admin/reports.html:20 +#: templates/web/zurich/admin/index-dm.html:14 +#: templates/web/zurich/admin/index-dm.html:40 +#: templates/web/zurich/admin/index-sdm.html:21 msgid "Created" msgstr "Erstellt" -#: templates/web/default/admin/report_edit.html:33 -#: templates/web/default/admin/update_edit.html:42 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:45 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Erstellt:" @@ -721,38 +749,36 @@ msgstr "Erstellt:" msgid "Current state" msgstr "" -#: templates/web/default/admin/council_list.html:40 -msgid "Currently has 1+ deleted" -msgstr "" - #: templates/web/default/dashboard/index.html:5 #: templates/web/default/dashboard/index.html:7 msgid "Dashboard" msgstr "" -#: templates/web/default/admin/council_contacts.html:40 -#: templates/web/default/admin/council_contacts.html:91 -#: templates/web/default/admin/council_edit.html:29 -#: templates/web/default/admin/council_edit.html:72 +#: templates/web/default/admin/body.html:38 +#: templates/web/default/admin/body.html:88 +#: templates/web/default/admin/body_edit.html:33 +#: templates/web/default/admin/body_edit.html:78 msgid "Deleted" msgstr "Gelöscht" #: templates/web/bromley/report/new/fill_in_details_form.html:54 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/zurich/report/new/fill_in_details_form.html:60 +#: templates/web/zurich/report/new/fill_in_details_form.html:56 msgid "Details" 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:13 +#: templates/web/zurich/admin/report_edit.html:14 msgid "Details:" msgstr "Beschreibung:" -#: templates/web/default/admin/council_contacts.html:41 +#: templates/web/default/admin/body.html:39 msgid "Devolved" msgstr "" -#: templates/web/default/admin/council_list.html:23 +#: templates/web/default/admin/edit-league.html:1 msgid "Diligency prize league table" msgstr "Weiss ich nicht" @@ -773,16 +799,26 @@ msgid "Don’t know" msgstr "" #: templates/web/default/admin/list_updates.html:35 -#: templates/web/default/admin/problem_row.html:29 -#: templates/web/default/admin/search_users.html:24 +#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/users.html:24 +#: templates/web/zurich/admin/index-dm.html:24 +#: templates/web/zurich/admin/index-dm.html:49 +#: templates/web/zurich/admin/index-sdm.html:33 msgid "Edit" msgstr "" +#: templates/web/default/admin/body.html:112 +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.html:1 msgid "Editing problem %d" msgstr "" #: templates/web/default/admin/update_edit.html:1 +#: templates/web/zurich/admin/update_edit.html:1 msgid "Editing update %d" msgstr "" @@ -790,28 +826,28 @@ msgstr "" msgid "Editing user %d" msgstr "" -#: templates/web/default/admin/council_edit.html:73 +#: templates/web/default/admin/body_edit.html:79 msgid "Editor" msgstr "" #: templates/web/bromley/report/display.html:126 -#: templates/web/default/admin/council_contacts.html:38 -#: templates/web/default/admin/council_edit.html:70 -#: templates/web/default/admin/list_flagged.html:12 -#: templates/web/default/admin/list_flagged.html:35 +#: templates/web/default/admin/body.html:36 +#: templates/web/default/admin/body_edit.html:76 +#: 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/search_reports.html:15 -#: templates/web/default/admin/search_users.html:13 +#: 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:74 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1141 msgid "Email already in abuse list" msgstr "" @@ -823,25 +859,27 @@ msgstr "" msgid "Email me updates" msgstr "Schicken sie mir Aktualisierungen" -#: templates/web/default/admin/council_contacts.html:83 -#: templates/web/default/admin/council_edit.html:26 -#: templates/web/default/admin/report_edit.html:31 -#: templates/web/default/admin/update_edit.html:24 +#: templates/web/default/admin/body.html:80 +#: templates/web/default/admin/body_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user_edit.html:11 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:44 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty office or other commercial" msgstr "" @@ -849,11 +887,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -869,7 +907,11 @@ msgstr "" msgid "End month:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:9 +#: templates/web/default/admin/body-form.html:40 +msgid "Endpoint" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:11 msgid "Enter a Zürich street name" msgstr "Ungefähre Adresse des Mangels" @@ -923,8 +965,8 @@ msgstr "Beschreiben Sie den Mangel" msgid "Error" msgstr "Fehler" -#: templates/web/default/admin/council_contacts.html:13 -#: templates/web/default/admin/council_edit.html:18 +#: templates/web/default/admin/body.html:11 +#: templates/web/default/admin/body_edit.html:18 msgid "Example postcode %s" msgstr "Beispieladresse" @@ -932,7 +974,7 @@ msgstr "Beispieladresse" msgid "Examples:" msgstr "Beispiele:" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 msgid "Extra data:" msgstr "" @@ -964,6 +1006,7 @@ msgid "FixMyStreet" msgstr "" #: templates/web/default/admin/header.html:10 +#: templates/web/zurich/admin/header.html:10 msgid "FixMyStreet admin:" msgstr "" @@ -994,8 +1037,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1003,16 +1046,19 @@ msgstr "" #: templates/web/fixmystreet/report/banner.html:12 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/report/banner.html:9 msgid "Fixed" msgstr "Gelöst" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 msgid "Fixed - Council" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 msgid "Fixed - User" msgstr "" @@ -1020,7 +1066,7 @@ msgstr "" msgid "Fixed reports" msgstr "" -#: templates/web/default/admin/problem_row.html:24 +#: templates/web/default/admin/problem_row.html:26 msgid "Fixed:" msgstr "" @@ -1028,12 +1074,12 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 -#: templates/web/default/admin/search_users.html:15 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 +#: templates/web/default/admin/users.html:15 msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/admin/user_edit.html:18 msgid "Flagged:" msgstr "" @@ -1044,7 +1090,7 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 msgid "For council(s):" msgstr "" @@ -1102,7 +1148,7 @@ msgstr "" msgid "Go" msgstr "Los" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 msgid "Going to send questionnaire?" msgstr "" @@ -1148,13 +1194,16 @@ msgstr "" #: templates/web/bromley/header.html:99 #: templates/web/fixmybarangay/header.html:64 #: templates/web/fixmystreet/header.html:49 -#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:47 +#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:45 msgid "Hi %s" msgstr "Hallo %s" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/update_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Unsichtbar" @@ -1166,7 +1215,7 @@ msgstr "Alte ausblenden" msgid "Hide pins" msgstr "Stecknadeln ausblenden" -#: templates/web/default/admin/council_edit.html:66 +#: templates/web/default/admin/body_edit.html:72 msgid "History" msgstr "History" @@ -1175,7 +1224,7 @@ msgstr "History" msgid "How to report a problem" msgstr "Erfasse eine neue Meldung:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:648 +#: perllib/FixMyStreet/App/Controller/Admin.pm:656 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1189,7 +1238,7 @@ msgid "" "ago." msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:235 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:255 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" @@ -1198,14 +1247,17 @@ msgstr "" "einer Mail kopiert haben, überprüfen sie bitte ob sie die gesamte " "URL kopiert haben.\n" -#: templates/web/default/admin/list_flagged.html:9 +#: templates/web/default/admin/flagged.html:9 #: templates/web/default/admin/list_updates.html:5 -#: templates/web/default/admin/search_reports.html:12 +#: templates/web/default/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:10 +#: templates/web/zurich/admin/index-dm.html:37 +#: templates/web/zurich/admin/index-sdm.html:18 msgid "ID" msgstr "ID" -#: templates/web/default/report/new/councils_text_none.html:11 -#: templates/web/default/report/new/councils_text_none.html:12 +#: templates/web/default/report/new/councils_text_none.html:8 +#: templates/web/default/report/new/councils_text_none.html:9 msgid "" "If you submit a problem here the subject and details of the problem will be " "public, but the problem will <strong>not</strong> be reported to the council." @@ -1242,19 +1294,6 @@ msgstr "Unbekannt ID" msgid "Illegal feed selection" msgstr "" -#: templates/web/bromley/report/display.html:80 -#: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:138 -#: templates/web/default/dashboard/index.html:140 -#: templates/web/default/report/update-form.html:30 -#: templates/web/default/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 -msgid "In Progress" -msgstr "In Bearbeitung" - #: templates/web/default/open311/index.html:21 msgid "" "In addition, the following attributes that are not part of the Open311 v2 " @@ -1263,7 +1302,20 @@ msgid "" "present if requestor allowed the name to be shown on this site)." msgstr "" +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/report/banner.html:18 msgid "In progress" msgstr "In Bearbeitung" @@ -1271,30 +1323,35 @@ msgstr "In Bearbeitung" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:356 +#: perllib/FixMyStreet/App/Controller/Open311.pm:348 msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:341 +#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit.html:38 +msgid "Internal notes:" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:333 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:952 +#: perllib/FixMyStreet/App/Controller/Admin.pm:961 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:424 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:951 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -1335,28 +1392,28 @@ msgstr "" msgid "Last Name" msgstr "Letzte Bearbeitung" -#: templates/web/default/admin/council_contacts.html:42 +#: templates/web/default/admin/body.html:40 msgid "Last editor" msgstr "Letzter Bearbeiter" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 msgid "Last update:" msgstr "Letzte Bearbeitung" -#: templates/web/default/admin/problem_row.html:26 +#: templates/web/default/admin/problem_row.html:28 #, fuzzy msgid "Last update:" msgstr "Letzte Bearbeitung" -#: templates/web/default/admin/council_contacts.html:16 -#: templates/web/default/admin/council_contacts.html:18 +#: templates/web/default/admin/body.html:14 +#: templates/web/default/admin/body.html:16 msgid "List all reported problems" msgstr "Liste aller Meldungen" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 -#: templates/web/zurich/report/new/fill_in_details_form.html:69 +#: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Loading..." msgstr "" @@ -1414,7 +1471,7 @@ msgstr "Nachricht" msgid "Message:" msgstr "Nachricht:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Missing jurisdiction_id" msgstr "" @@ -1426,11 +1483,12 @@ msgstr "Monat" msgid "More problems nearby" msgstr "Meldungen in der Nähe" -#: templates/web/default/admin/list_flagged.html:11 -#: templates/web/default/admin/list_flagged.html:34 +#: 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/search_reports.html:14 -#: templates/web/default/admin/search_users.html:12 +#: 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 @@ -1440,13 +1498,16 @@ msgstr "Meldungen in der Nähe" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:120 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 #: templates/web/fixmystreet/report/update-form.html:134 -#: templates/web/zurich/report/new/fill_in_details_form.html:118 +#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "Name" msgstr "Name" -#: templates/web/default/admin/report_edit.html:30 -#: templates/web/default/admin/update_edit.html:23 +#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user_edit.html:10 +#: templates/web/zurich/admin/report_edit-sdm.html:20 +#: templates/web/zurich/admin/report_edit.html:43 msgid "Name:" msgstr "Name:" @@ -1462,7 +1523,7 @@ msgid "" "using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:152 +#: perllib/FixMyStreet/Cobrand/UK.pm:148 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" @@ -1475,7 +1536,7 @@ msgid "" "Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:265 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1491,7 +1552,11 @@ msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." msgid "New <br>problems" msgstr "Neue <br>Meldungen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:320 +#: perllib/FixMyStreet/App/Controller/Admin.pm:248 +msgid "New body added" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:350 msgid "New category contact added" msgstr "" @@ -1560,17 +1625,17 @@ msgstr "" msgid "New!" msgstr "Neu!" -#: templates/web/default/admin/council_contacts.html:52 -#: templates/web/default/admin/council_contacts.html:53 -#: templates/web/default/admin/council_contacts.html:54 -#: templates/web/default/admin/council_edit.html:4 +#: 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:19 -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:16 +#: templates/web/default/admin/problem_row.html:21 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:107 #: templates/web/default/questionnaire/index.html:68 @@ -1579,31 +1644,30 @@ msgstr "Neu!" msgid "No" msgstr "Nein" -#: templates/web/default/admin/stats.html:85 #: templates/web/default/admin/user_edit.html:13 +msgid "No body" +msgstr "" + +#: templates/web/default/admin/stats.html:85 msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:336 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 msgid "No council selected" msgstr "" -#: templates/web/default/admin/council_list.html:32 +#: templates/web/default/admin/edit-league.html:10 msgid "No edits have yet been made." msgstr "Noch keine Antwort" -#: templates/web/default/admin/list_flagged.html:26 +#: templates/web/default/admin/flagged.html:26 msgid "No flagged problems found" msgstr "" -#: templates/web/default/admin/list_flagged.html:47 +#: templates/web/default/admin/flagged.html:47 msgid "No flagged users found" msgstr "" -#: templates/web/default/admin/council_list.html:38 -msgid "No info at all" -msgstr "Keine Informationen" - #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 msgid "No problems found." @@ -1618,12 +1682,13 @@ msgstr "Bisher wurden noch keine Meldungen erfasst." msgid "No supporters" msgstr "" -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/body.html:55 msgid "Non Public" msgstr "" -#: templates/web/default/admin/council_list.html:5 -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:47 msgid "None" msgstr "Keine" @@ -1636,8 +1701,8 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/default/admin/council_contacts.html:43 -#: templates/web/default/admin/council_edit.html:74 +#: templates/web/default/admin/body.html:41 +#: templates/web/default/admin/body_edit.html:80 msgid "Note" msgstr "" @@ -1648,8 +1713,8 @@ msgid "" "numbers may jump about a little" msgstr "" -#: templates/web/default/admin/council_contacts.html:95 -#: templates/web/default/admin/council_edit.html:32 +#: templates/web/default/admin/body.html:92 +#: templates/web/default/admin/body_edit.html:37 msgid "Note:" msgstr "" @@ -1715,11 +1780,14 @@ msgid "Older problems" msgstr "" #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "Öffnen" @@ -1751,15 +1819,16 @@ msgid "" "re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1006 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 -#: perllib/FixMyStreet/DB/Result/Problem.pm:505 -#: perllib/FixMyStreet/DB/Result/Problem.pm:515 -#: perllib/FixMyStreet/DB/Result/Problem.pm:525 -#: perllib/FixMyStreet/DB/Result/Problem.pm:537 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/DB/Result/Problem.pm:509 +#: perllib/FixMyStreet/DB/Result/Problem.pm:519 +#: perllib/FixMyStreet/DB/Result/Problem.pm:529 +#: perllib/FixMyStreet/DB/Result/Problem.pm:541 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 +#: templates/web/zurich/report/_main.html:8 msgid "Other" msgstr "" @@ -1778,8 +1847,13 @@ msgstr "Besitzer" msgid "Page Not Found" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/body-form.html:9 +#: templates/web/zurich/admin/body-form.html:9 +msgid "Parent" +msgstr "" + +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 msgid "Partial" msgstr "" @@ -1799,13 +1873,15 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:148 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/report/new/fill_in_details_form.html:124 +#: templates/web/zurich/report/new/fill_in_details_form.html:120 msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 -#: templates/web/default/admin/report_edit.html:32 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 +#: templates/web/default/admin/report_edit.html:33 #: templates/web/default/report/new/fill_in_details_form.html:215 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Phone:" msgstr "Telefonnummer:" @@ -1813,7 +1889,7 @@ msgstr "Telefonnummer:" #: 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:57 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Photo" msgstr "Foto" @@ -1830,8 +1906,8 @@ msgstr "Fotos von neuen Meldungen in der Nähe" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -1868,16 +1944,16 @@ msgstr "Bitte überprüfen sie ihr E-Mail" msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:822 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:829 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 -#: perllib/FixMyStreet/DB/Result/Problem.pm:355 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:828 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:835 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:854 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:897 +#: perllib/FixMyStreet/DB/Result/Problem.pm:358 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" -#: perllib/FixMyStreet/DB/Result/Problem.pm:361 +#: perllib/FixMyStreet/DB/Result/Problem.pm:364 msgid "Please choose a property type" msgstr "" @@ -1902,7 +1978,7 @@ msgid "" "service for all users." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Comment.pm:147 #: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -1913,12 +1989,12 @@ msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:330 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/DB/Result/User.pm:104 +#: perllib/FixMyStreet/DB/Result/User.pm:115 #: templates/web/default/js/validation_strings.html:12 #: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" @@ -1929,13 +2005,13 @@ 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:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:336 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Bitte geben Sie einiges Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 -#: perllib/FixMyStreet/DB/Result/User.pm:101 +#: 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/validation_strings.html:11 @@ -1947,7 +2023,7 @@ msgstr "Bitte geben Sie Ihre E-Mail Adresse an" #: templates/web/bromley/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 -#: templates/web/zurich/report/new/fill_in_details_form.html:110 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 msgid "Please enter your email address" msgstr "Bitte geben Sie Ihre E-Mail Adresse an." @@ -1956,7 +2032,7 @@ msgstr "Bitte geben Sie Ihre E-Mail Adresse an." msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Namen an" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:351 #: templates/web/default/js/validation_strings.html:7 msgid "" "Please enter your full name, councils need this information – if you do not " @@ -1964,9 +2040,9 @@ msgid "" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:143 -#: perllib/FixMyStreet/DB/Result/Problem.pm:341 -#: perllib/FixMyStreet/DB/Result/User.pm:97 +#: perllib/FixMyStreet/DB/Result/Comment.pm:144 +#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" @@ -2034,14 +2110,14 @@ msgstr "" "ein Photo des Mangels hoch." #: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/report/new/fill_in_details_form.html:64 +#: templates/web/zurich/report/new/fill_in_details_form.html:60 msgid "Please fill in details of the problem." msgstr "Beschreiben Sie den Mangel." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 -#: templates/web/zurich/report/new/fill_in_details_form.html:35 +#: templates/web/zurich/report/new/fill_in_details_form.html:34 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -2077,7 +2153,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/fixmystreet/report/new/fill_in_details_form.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:26 +#: templates/web/zurich/report/new/fill_in_details_form.html:25 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2155,16 +2231,18 @@ msgid "Posted anonymously at %s" msgstr "" #: templates/web/default/report/updates.html:21 +#: templates/web/zurich/report/updates.html:11 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "" #: templates/web/default/report/updates.html:23 +#: templates/web/zurich/report/updates.html:13 msgid "Posted by %s at %s" msgstr "" -#: templates/web/default/admin/council_contacts.html:100 -#: templates/web/default/admin/council_edit.html:30 -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/body.html:97 +#: templates/web/default/admin/body_edit.html:35 +#: templates/web/default/admin/report_edit.html:44 msgid "Private" msgstr "" @@ -2184,11 +2262,16 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" +#: templates/web/zurich/admin/index-dm.html:11 +#, fuzzy +msgid "Problem ID" +msgstr "Meldung" + #: templates/web/default/admin/index.html:28 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:849 +#: perllib/FixMyStreet/App/Controller/Admin.pm:863 msgid "Problem marked as open." msgstr "" @@ -2196,7 +2279,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: templates/web/default/admin/list_flagged.html:5 +#: templates/web/default/admin/flagged.html:5 msgid "Problems" msgstr "Meldungen" @@ -2223,15 +2306,15 @@ msgstr "Meldungen, welche kürzlich gelöst wurden" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:612 +#: perllib/FixMyStreet/Cobrand/Default.pm:600 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 +#: perllib/FixMyStreet/Cobrand/UK.pm:227 msgid "Problems within %s" msgstr "Meldungen innerhalb %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:245 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "Problems within %s ward" msgstr "" @@ -2250,7 +2333,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Property type:" msgstr "" @@ -2281,8 +2364,8 @@ msgid "" "report problems, leave updates and manage your reports." msgstr "" -#: templates/web/default/admin/council_contacts.html:44 -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/body.html:42 +#: templates/web/default/admin/body.html:55 msgid "Public" msgstr "" @@ -2322,23 +2405,23 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:274 perllib/FixMyStreet/Cobrand/UK.pm:286 +#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:178 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 -#: perllib/FixMyStreet/Cobrand/UK.pm:300 perllib/FixMyStreet/Cobrand/UK.pm:312 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 +#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:305 perllib/FixMyStreet/Cobrand/UK.pm:317 +#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2351,15 +2434,15 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:613 +#: perllib/FixMyStreet/Cobrand/Default.pm:601 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 -#: perllib/FixMyStreet/Cobrand/UK.pm:238 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 +#: perllib/FixMyStreet/Cobrand/UK.pm:234 msgid "RSS feed of problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:244 +#: perllib/FixMyStreet/Cobrand/UK.pm:240 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2427,8 +2510,10 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:54 -#: templates/web/default/admin/update_edit.html:48 +#: templates/web/default/admin/report_edit.html:55 +#: templates/web/default/admin/update_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2474,45 +2559,55 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:524 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" +#: templates/web/zurich/report/_main.html:11 +#, fuzzy +msgid "Reported at %s" +msgstr "Gemeldet von %s um %s" + #: templates/web/default/admin/questionnaire.html:5 #: templates/web/default/questionnaire/index.html:77 #: templates/web/fixmystreet/questionnaire/index.html:71 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:516 msgid "Reported by %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:543 +#: perllib/FixMyStreet/DB/Result/Problem.pm:547 #: 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:534 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:528 +#: perllib/FixMyStreet/DB/Result/Problem.pm:532 msgid "Reported by %s in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:516 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:538 +#: templates/web/zurich/report/_main.html:9 +#, fuzzy +msgid "Reported in the %s category at %s" +msgstr "Gemeldet von %s um %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:542 msgid "Reported in the %s category by %s at %s" msgstr "" @@ -2528,7 +2623,8 @@ msgstr "" msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1033 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: templates/web/zurich/admin/header.html:14 #, fuzzy msgid "Reports" msgstr "Alle Meldungen" @@ -2537,7 +2633,7 @@ msgstr "Alle Meldungen" msgid "Reports on and around the map" msgstr "" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "Resend report" msgstr "" @@ -2551,24 +2647,34 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: templates/web/default/admin/council_edit.html:63 +#: templates/web/default/admin/body_edit.html:69 msgid "Save changes" msgstr "Änderungen speichern" -#: templates/web/default/admin/list_flagged.html:1 -#: templates/web/default/admin/search_reports.html:1 +#: templates/web/default/admin/flagged.html:1 +#: templates/web/default/admin/reports.html:1 msgid "Search Reports" msgstr "" -#: templates/web/default/admin/search_users.html:1 +#: templates/web/default/admin/users.html:1 msgid "Search Users" msgstr "" -#: templates/web/default/admin/search_reports.html:5 -#: templates/web/default/admin/search_users.html:5 +#: templates/web/default/admin/reports.html:5 +#: templates/web/default/admin/users.html:5 msgid "Search:" msgstr "Suchen:" +#: templates/web/default/admin/body-form.html:11 +#: templates/web/zurich/admin/body-form.html:11 +msgid "Select a body" +msgstr "" + +#: templates/web/default/admin/body-form.html:21 +#: templates/web/zurich/admin/body-form.html:21 +msgid "Select an area" +msgstr "" + #: templates/web/default/alert/_list.html:8 #: templates/web/fixmystreet/alert/_list.html:10 msgid "" @@ -2576,15 +2682,19 @@ msgid "" "or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: templates/web/zurich/admin/report_edit-sdm.html:15 +msgid "Send back to division" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Sent to %s %s later" msgstr "" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "Sent:" msgstr "Gesendet:" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:38 msgid "Service:" msgstr "" @@ -2639,7 +2749,7 @@ msgstr "Zeige Stecknadeln" #: templates/web/fixmystreet/auth/general.html:42 #: templates/web/fixmystreet/auth/general.html:62 #: templates/web/fixmystreet/header.html:53 -#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:51 +#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:49 msgid "Sign in" msgstr "" @@ -2689,11 +2799,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: templates/web/default/admin/council_list.html:42 -msgid "Some unconfirmeds" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/UK.pm:89 +#: perllib/FixMyStreet/Cobrand/UK.pm:93 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2733,20 +2839,22 @@ msgid "Start month:" msgstr "" #: templates/web/bromley/report/display.html:78 -#: templates/web/default/admin/list_flagged.html:18 +#: templates/web/default/admin/flagged.html:18 #: templates/web/default/admin/list_updates.html:6 -#: templates/web/default/admin/search_reports.html:21 +#: 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:17 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1047 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "" @@ -2764,6 +2872,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/zurich/admin/report_edit.html:13 msgid "Subject:" msgstr "Titel:" @@ -2777,13 +2886,16 @@ msgstr "Titel:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:152 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:177 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:222 -#: templates/web/zurich/report/new/fill_in_details_form.html:128 +#: templates/web/zurich/report/new/fill_in_details_form.html:125 msgid "Submit" msgstr "Abschicken" -#: templates/web/default/admin/report_edit.html:57 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:58 +#: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user_edit.html:20 +#: templates/web/zurich/admin/report_edit-sdm.html:31 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2792,6 +2904,13 @@ msgstr "" msgid "Submit questionnaire" msgstr "" +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/report/banner.html:15 +#, fuzzy +msgid "Submitted" +msgstr "Abschicken" + #: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:38 @@ -2810,8 +2929,11 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1031 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 #: templates/web/default/admin/index.html:1 +#: templates/web/zurich/admin/header.html:11 +#: templates/web/zurich/admin/index-dm.html:1 +#: templates/web/zurich/admin/index-sdm.html:1 msgid "Summary" msgstr "Zusammenfassung" @@ -2823,7 +2945,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1044 msgid "Survey" msgstr "" @@ -2832,14 +2954,16 @@ msgid "Survey Results" msgstr "" #: templates/web/default/admin/list_updates.html:14 +#: templates/web/zurich/admin/index-dm.html:13 msgid "Text" msgstr "" -#: templates/web/default/admin/council_contacts.html:20 +#: templates/web/default/admin/body.html:18 msgid "Text only version" msgstr "" -#: templates/web/default/admin/update_edit.html:13 +#: templates/web/default/admin/update_edit.html:14 +#: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "" @@ -2925,11 +3049,11 @@ msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:82 +#: perllib/FixMyStreet/Cobrand/UK.pm:86 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:616 +#: perllib/FixMyStreet/App/Controller/Admin.pm:624 msgid "That problem will now be resent." msgstr "" @@ -2999,8 +3123,7 @@ msgid "" msgstr "" #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:43 -#: perllib/FixMyStreet/App/Controller/Reports.pm:74 +#: perllib/FixMyStreet/App/Controller/Reports.pm:50 msgid "The error was: %s" msgstr "" @@ -3092,13 +3215,13 @@ msgid "" "give us permission." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:271 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:273 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:71 +#: perllib/FixMyStreet/App/Controller/Reports.pm:47 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3107,7 +3230,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:736 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3134,13 +3257,19 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/report/banner.html:12 +msgid "Third party" +msgstr "" + #: templates/web/default/open311/index.html:10 msgid "" "This API implementation is work in progress and not yet stabilized. It will " "change without warnings in the future." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3148,15 +3277,15 @@ msgid "" "problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:345 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:868 -#: perllib/FixMyStreet/Cobrand/UK.pm:54 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3215,6 +3344,10 @@ 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" +#: templates/web/zurich/report/_main.html:21 +msgid "This report is awaiting moderation." +msgstr "" + #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." msgstr "" @@ -3227,18 +3360,20 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:266 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" -#: templates/web/default/admin/list_flagged.html:10 -#: templates/web/default/admin/search_reports.html:13 +#: templates/web/default/admin/flagged.html:10 +#: templates/web/default/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:38 +#: templates/web/zurich/admin/index-sdm.html:19 msgid "Title" msgstr "Titel" @@ -3261,7 +3396,7 @@ msgid "" "street name and area" msgstr "Geben Sie eine Adresse an" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:270 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:272 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3272,13 +3407,10 @@ msgstr "" msgid "Total" msgstr "Total" -#: perllib/FixMyStreet/App/Controller/Reports.pm:42 -msgid "Unable to look up areas in MaPit. Please try again later." -msgstr "" - -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/update_edit.html:22 +#: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Unbestätigt" @@ -3313,6 +3445,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" +#: templates/web/default/admin/body-form.html:77 +#: templates/web/zurich/admin/body-form.html:41 +#, fuzzy +msgid "Update body" +msgstr "Beschreibung" + #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" msgstr "" @@ -3321,29 +3459,32 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/default/admin/update_edit.html:33 +#: templates/web/default/admin/update_edit.html:36 +#: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/default/admin/update_edit.html:35 +#: templates/web/default/admin/update_edit.html:38 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/default/admin/update_edit.html:37 +#: templates/web/default/admin/update_edit.html:40 msgid "Update reopened problem" msgstr "" -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/body.html:65 msgid "Update statuses" msgstr "" #: templates/web/default/report/update-form.html:22 +#: templates/web/zurich/admin/report_edit-sdm.html:26 msgid "Update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:839 -#: perllib/FixMyStreet/App/Controller/Admin.pm:899 +#: perllib/FixMyStreet/App/Controller/Admin.pm:720 +#: perllib/FixMyStreet/App/Controller/Admin.pm:853 +#: perllib/FixMyStreet/App/Controller/Admin.pm:912 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:171 msgid "Updated!" msgstr "" @@ -3366,26 +3507,30 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1163 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1172 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 -#: templates/web/default/admin/list_flagged.html:30 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 +#: templates/web/default/admin/flagged.html:30 +#: templates/web/zurich/admin/header.html:17 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:375 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:12 +#: templates/web/zurich/admin/report_edit.html:12 +#: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "" @@ -3447,7 +3592,7 @@ msgstr "Ihr E-Mail wird nie angezeigt" #: templates/web/bromley/report/new/fill_in_details_form.html:179 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:144 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 -#: templates/web/zurich/report/new/fill_in_details_form.html:114 +#: templates/web/zurich/report/new/fill_in_details_form.html:110 msgid "We never show your email address or phone number." msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" @@ -3494,17 +3639,17 @@ msgid "" "send an email to <a href='mailto:%s'>%s</a>:" msgstr "" -#: templates/web/default/admin/council_contacts.html:45 -#: templates/web/default/admin/council_edit.html:69 +#: templates/web/default/admin/body.html:43 +#: templates/web/default/admin/body_edit.html:75 msgid "When edited" msgstr "Wann editiert" -#: templates/web/default/admin/list_flagged.html:19 -#: templates/web/default/admin/search_reports.html:22 +#: templates/web/default/admin/flagged.html:19 +#: templates/web/default/admin/reports.html:22 msgid "When sent" msgstr "Wann gesendet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 msgid "Whole block of empty flats" msgstr "" @@ -3551,18 +3696,18 @@ msgstr "" msgid "Year" msgstr "Jahr" -#: templates/web/default/admin/council_contacts.html:52 -#: templates/web/default/admin/council_contacts.html:53 -#: templates/web/default/admin/council_contacts.html:54 -#: templates/web/default/admin/council_edit.html:5 +#: 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:19 -#: templates/web/default/admin/report_edit.html:27 -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/search_users.html:23 -#: templates/web/default/admin/update_edit.html:15 +#: templates/web/default/admin/problem_row.html:21 +#: templates/web/default/admin/report_edit.html:28 +#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/users.html:23 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:105 #: templates/web/default/questionnaire/index.html:66 @@ -3598,12 +3743,20 @@ msgid "" "reports\">show all councils</a>." msgstr "" +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:8 +#, fuzzy +msgid "You can <a href=\"%s%s\">view the problem on this site</a>." +msgstr "" +"Danke &mdash; Sie können Ihre aktualisierte Meldung <a href=\"%s" +"\">auf der Webseite anschauen</a>" + #: templates/web/emptyhomes/reports/body.html:66 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "" -#: templates/web/default/report/new/councils_text_none.html:14 -#: templates/web/default/report/new/councils_text_none.html:16 +#: templates/web/default/report/new/councils_text_none.html:11 +#: templates/web/default/report/new/councils_text_none.html:13 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 msgid "" @@ -3622,7 +3775,7 @@ msgstr "" #: 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/zurich/report/new/fill_in_details_form.html:93 +#: templates/web/zurich/report/new/fill_in_details_form.html:89 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -3644,7 +3797,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/fixmystreet/report/new/fill_in_details_form.html:28 -#: templates/web/zurich/report/new/fill_in_details_form.html:28 +#: templates/web/zurich/report/new/fill_in_details_form.html:27 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. " @@ -3656,6 +3809,12 @@ msgstr "" msgid "You have successfully confirmed your alert." msgstr "" +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:6 +#, fuzzy +msgid "You have successfully confirmed your email address." +msgstr "Sie haben Ihre Meldung erfolgreich bestätigt" + #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 msgid "You have successfully confirmed your problem" @@ -3676,7 +3835,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:743 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " @@ -3689,7 +3848,7 @@ msgid "" "do not, %s." msgstr "" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "You really want to resend?" msgstr "" @@ -3711,7 +3870,7 @@ msgstr "" #: templates/web/fixmystreet/report/display.html:55 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:157 -#: templates/web/zurich/report/new/fill_in_details_form.html:106 +#: templates/web/zurich/report/new/fill_in_details_form.html:102 msgid "Your email" msgstr "Ihre E-Mail Adresse" @@ -3760,7 +3919,7 @@ msgstr "Ihr Name" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:202 #: templates/web/fixmystreet/report/update-form.html:138 -#: templates/web/zurich/report/new/fill_in_details_form.html:122 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "Your name" msgstr "Ihr Name" @@ -3787,7 +3946,7 @@ msgstr "Ihr Passwort wurde geändert" #: templates/web/bromley/report/new/fill_in_details_form.html:184 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:216 -#: templates/web/zurich/report/new/fill_in_details_form.html:125 +#: templates/web/zurich/report/new/fill_in_details_form.html:121 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -3823,11 +3982,13 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:609 msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "didn't use map" msgstr "hat Karte nicht verwendet" @@ -3845,6 +4006,7 @@ msgid "less than a minute" msgstr "weniger als einer Minute" #: templates/web/default/report/updates.html:27 +#: templates/web/zurich/report/updates.html:16 msgid "marked as %s" msgstr "" @@ -3852,7 +4014,7 @@ msgstr "" msgid "marked as fixed" msgstr "als gelöst markiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin.pm:127 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" @@ -3868,15 +4030,18 @@ msgstr "oder" msgid "or locate me automatically" msgstr "oder automatisch lokalisieren" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "originally entered" msgstr "" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 msgid "other areas:" msgstr "" #: templates/web/default/report/updates.html:26 +#: templates/web/zurich/report/updates.html:15 msgid "reopened" msgstr "" @@ -3884,7 +4049,7 @@ msgstr "" #: templates/web/bromley/header.html:65 #: templates/web/fixmybarangay/header.html:65 #: templates/web/fixmystreet/header.html:50 -#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:48 +#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:46 msgid "sign out" msgstr "ausloggen" @@ -3900,10 +4065,11 @@ msgid "the local council" msgstr "" #: templates/web/default/report/_main.html:6 +#: templates/web/zurich/report/_main.html:14 msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:333 msgid "this type of local problem" msgstr "" @@ -3911,15 +4077,17 @@ msgstr "" msgid "today" msgstr "heute" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "used map" msgstr "" -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/update_edit.html:29 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:32 msgid "user is problem owner" msgstr "" @@ -4034,6 +4202,15 @@ msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" +#~ msgid "All confirmed" +#~ msgstr "Alle bestätigten" + +#~ msgid "In Progress" +#~ msgstr "In Bearbeitung" + +#~ msgid "No info at all" +#~ msgstr "Keine Informationen" + #~ msgid "All" #~ msgstr "Alle" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index db0887cd7..411687b8b 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: 2012-12-10 13:18+0000\n" +"POT-Creation-Date: 2012-12-21 17:13+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,8 +22,8 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "X-Poedit-Basepath: ../../../\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:560 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid " and " msgstr " og " @@ -32,11 +32,11 @@ msgstr " og " msgid " and <strong>we will now send it to the council</strong>" msgstr " og <strong>vi sender det nå til administrasjonen</strong>" -#: templates/web/default/report/new/councils_text_all.html:10 -#: templates/web/default/report/new/councils_text_all.html:17 -#: templates/web/default/report/new/councils_text_all.html:3 +#: templates/web/default/report/new/councils_text_all.html:11 +#: templates/web/default/report/new/councils_text_all.html:18 +#: templates/web/default/report/new/councils_text_all.html:4 +#: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:14 -#: templates/web/default/report/new/councils_text_none.html:17 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 @@ -44,7 +44,7 @@ msgstr " og <strong>vi sender det nå til administrasjonen</strong>" msgid " or " msgstr " eller " -#: templates/web/default/admin/council_list.html:17 +#: templates/web/default/admin/bodies.html:19 msgid "%d addresses" msgstr "%d adresser" @@ -56,7 +56,7 @@ msgstr "%d bekreftede varsler, %d ubekreftede" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "%d administrasjonskontakter – %d bekreftet, %d ubekreftet" -#: templates/web/default/admin/council_list.html:27 +#: templates/web/default/admin/edit-league.html:5 msgid "%d edits by %s" msgstr "%d redigeringer av %s" @@ -79,23 +79,23 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 +#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:496 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:498 +#: perllib/FixMyStreet/DB/Result/Problem.pm:502 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:306 perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" @@ -104,7 +104,7 @@ msgid "(Don't worry — %s)" msgstr "(Ingen grunn til bekymring — %s)" #: templates/web/default/admin/report_blocks.html:11 -#: templates/web/default/admin/search_users.html:23 +#: templates/web/default/admin/users.html:23 msgid "(Email in abuse table)" msgstr "(Epost i misbrukstabellen)" @@ -121,12 +121,14 @@ 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:23 +#: templates/web/zurich/report/_item.html:27 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:21 +#: templates/web/zurich/report/_item.html:25 msgid "(fixed)" msgstr "(løst)" @@ -137,17 +139,19 @@ 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:17 +#: templates/web/zurich/report/_item.html:21 msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" #: templates/web/default/report/new/fill_in_details_form.html:217 -#: templates/web/zurich/report/new/fill_in_details_form.html:118 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "(optional)" msgstr "(valgfritt)" # Denne teksten er lite forklarende #: templates/web/default/reports/_list-entry.html:2 #: templates/web/fixmystreet/report/_item.html:16 +#: templates/web/zurich/report/_item.html:20 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -159,18 +163,18 @@ 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/Admin.pm:285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 msgid "*unknown*" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:628 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 +#: perllib/FixMyStreet/DB/Result/Problem.pm:356 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:608 -#: perllib/FixMyStreet/DB/Result/Problem.pm:359 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:362 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" @@ -348,7 +352,13 @@ msgstr "<strong>Ja</strong> Jeg har et passord" msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/council_contacts.html:72 +#: templates/web/default/admin/bodies.html:31 +#: templates/web/default/admin/body-form.html:77 +#: templates/web/zurich/admin/body-form.html:41 +msgid "Add body" +msgstr "" + +#: templates/web/default/admin/body.html:69 msgid "Add new category" msgstr "Legg til ny kategori" @@ -379,10 +389,6 @@ msgstr "Send meg varsel ved fremtidige oppdateringer" msgid "All Reports" msgstr "Alle rapporter" -#: templates/web/default/admin/council_list.html:44 -msgid "All confirmed" -msgstr "Alle bekreftet" - #: 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/fiksgatami/footer.html:7 @@ -403,16 +409,16 @@ msgstr "%srapporter mellom %s og %s" msgid "All the information you provide here will be sent to" msgstr "All informasjonen du har lagt inn her vil bli sendt til" -#: templates/web/default/report/new/councils_text_all.html:10 -#: templates/web/default/report/new/councils_text_all.html:12 +#: templates/web/default/report/new/councils_text_all.html:11 +#: templates/web/default/report/new/councils_text_all.html:13 msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " "<strong>Roads Service</strong>." msgstr "" "All informasjon du legger inn her vil bli sendt til <strong>%s</strong>." -#: templates/web/default/report/new/councils_text_all.html:3 -#: templates/web/default/report/new/councils_text_all.html:5 +#: templates/web/default/report/new/councils_text_all.html:4 +#: templates/web/default/report/new/councils_text_all.html:6 msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " "a relevant local body such as <strong>TfL</strong>, via the London Report-It " @@ -424,8 +430,8 @@ 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:17 -#: templates/web/default/report/new/councils_text_all.html:19 +#: 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 @@ -449,19 +455,28 @@ msgstr "" "ditt navn\n" "dersom du gir oss lov." +#: templates/web/zurich/report/new/councils_text_all.html:2 +#: templates/web/zurich/report/new/councils_text_all.html:3 +#, fuzzy +msgid "" +"All the information you provide here will be sent to <strong>Stadt Zürich</" +"strong>." +msgstr "" +"All informasjonen du har lagt inn her vil bli sendt til <strong>%s</strong>." + #: templates/web/default/questionnaire/index.html:60 #: templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this problem as fixed." msgstr "En oppdatering markerte dette problemet som fikset." -#: templates/web/default/admin/list_flagged.html:15 +#: templates/web/default/admin/flagged.html:15 #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/search_reports.html:18 +#: templates/web/default/admin/reports.html:18 msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "Anonym:" @@ -483,6 +498,11 @@ msgstr "Er du en utvikler?" msgid "Are you from a council?" msgstr "Der du fra den lokale administrasjonen?" +#: templates/web/default/admin/body-form.html:19 +#: templates/web/zurich/admin/body-form.html:19 +msgid "Area covered" +msgstr "" + #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " @@ -497,6 +517,10 @@ 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." +#: templates/web/zurich/report/_item.html:9 +msgid "Awaiting moderation" +msgstr "" + #: templates/web/default/admin/report_blocks.html:11 msgid "Ban email address" msgstr "Bannlys epostadresse" @@ -507,10 +531,22 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: templates/web/default/admin/bodies.html:1 +#: templates/web/zurich/admin/header.html:13 msgid "Bodies" msgstr "" +#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/users.html:14 +msgid "Body" +msgstr "" + +#: templates/web/default/admin/user_edit.html:12 +#: templates/web/zurich/admin/report_edit.html:17 +msgid "Body:" +msgstr "" + #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 msgid "" @@ -531,15 +567,18 @@ msgstr "" "Hvis du ikke kan se kartet, <a href='%s' rel='nofollow'>hopp over dette " "steget</a>." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: templates/web/bromley/report/new/fill_in_details_form.html:68 -#: templates/web/default/admin/council_contacts.html:37 +#: 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/list_flagged.html:14 -#: templates/web/default/admin/search_reports.html:17 +#: templates/web/default/admin/reports.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/admin/index-dm.html:12 +#: templates/web/zurich/admin/index-dm.html:39 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/report/new/fill_in_details_form.html:64 msgid "Category" msgstr "Kategori" @@ -547,14 +586,16 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" -#: templates/web/default/admin/council_contacts.html:78 -#: templates/web/default/admin/council_edit.html:23 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/body.html:75 +#: templates/web/default/admin/body_edit.html:23 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/report/new/fill_in_details_form.html:67 +#: templates/web/zurich/admin/report_edit-sdm.html:19 +#: templates/web/zurich/admin/report_edit.html:41 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:336 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 msgid "Category: %s" msgstr "Kategori: %s" @@ -571,8 +612,8 @@ msgstr "Klikk i kartet for å rapportere et problem" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -583,7 +624,7 @@ msgstr "Klikk i kartet for å rapportere et problem" msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" @@ -591,7 +632,7 @@ msgstr "(ikke rapportert til administrasjonen)" msgid "Closed reports" msgstr "Fiksede rapporter" -#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/problem_row.html:27 msgid "Closed:" msgstr "Lukket:" @@ -600,48 +641,38 @@ msgstr "Lukket:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "Co-ordinates:" msgstr "Koordinater:" -#: templates/web/default/admin/list_flagged.html:16 +#: templates/web/default/admin/flagged.html:16 #: templates/web/default/admin/list_updates.html:13 -#: templates/web/default/admin/search_reports.html:19 +#: templates/web/default/admin/reports.html:19 msgid "Cobrand" msgstr "Merkevaresamarbeid" -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/update_edit.html:41 +#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "Merkevaresamarbeidsdata:" -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:365 -msgid "Configuration updated" -msgstr "Oppsett oppdatert" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:394 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontakter vil bli generert automatisk senere" -#: templates/web/default/admin/council_edit.html:34 +#: templates/web/default/admin/body_edit.html:40 #, fuzzy msgid "Configure Endpoint" msgstr "Sett opp Open311" -#: templates/web/default/admin/council_contacts.html:168 -msgid "Configure Open311" -msgstr "Sett opp Open311" - -#: templates/web/default/admin/council_contacts.html:116 -msgid "Configure Open311 integration" -msgstr "Sett opp Open311-integrasjon" - -#: templates/web/default/admin/council_contacts.html:46 +#: templates/web/default/admin/body.html:44 msgid "Confirm" msgstr "Bekreft" @@ -665,13 +696,17 @@ msgstr "" #: templates/web/emptyhomes/tokens/confirm_problem.html:3 #: templates/web/southampton/tokens/confirm_problem.html:1 #: templates/web/southampton/tokens/confirm_problem.html:3 +#: templates/web/zurich/tokens/confirm_problem.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Bekreftelse" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:88 -#: templates/web/default/admin/council_edit.html:28 -#: templates/web/default/admin/council_edit.html:71 +#: templates/web/default/admin/body.html:37 +#: templates/web/default/admin/body.html:85 +#: templates/web/default/admin/body_edit.html:31 +#: templates/web/default/admin/body_edit.html:77 +#: templates/web/zurich/admin/report_edit-sdm.html:22 +#: templates/web/zurich/admin/report_edit.html:45 msgid "Confirmed" msgstr "Bekreftet" @@ -680,8 +715,8 @@ msgstr "Bekreftet" msgid "Confirmed reports between %s and %s" msgstr "%srapporter mellom %s og %s" -#: templates/web/default/admin/problem_row.html:23 -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/report_edit.html:35 msgid "Confirmed:" msgstr "Bekreftet:" @@ -710,36 +745,25 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1159 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1187 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1168 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 msgid "Could not find user" msgstr "Kunne ikke finne bruker" -#: templates/web/default/admin/list_flagged.html:13 +#: templates/web/default/admin/flagged.html:13 #: templates/web/default/admin/list_updates.html:12 -#: templates/web/default/admin/search_reports.html:16 -#: templates/web/default/admin/search_users.html:14 msgid "Council" msgstr "Administrasjon" -#: templates/web/default/admin/council_list.html:1 -msgid "Council contacts" -msgstr "Administrasjonskontakter" - -#: templates/web/default/admin/council_contacts.html:1 -#: templates/web/default/admin/council_edit.html:1 +#: templates/web/default/admin/body.html:1 +#: templates/web/default/admin/body_edit.html:1 msgid "Council contacts for %s" msgstr "Administrasjonskontakter for %s" #: templates/web/default/admin/stats.html:84 -#: templates/web/default/admin/user_edit.html:12 msgid "Council:" msgstr "Administrasjon:" -#: templates/web/default/admin/council_list.html:36 -msgid "Councils" -msgstr "Administrasjoner" - #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 msgid "Count" @@ -749,18 +773,24 @@ msgstr "Antall" msgid "Create a report" msgstr "Lag en rapport" -#: templates/web/default/admin/council_contacts.html:107 +#: templates/web/default/admin/body.html:103 msgid "Create category" msgstr "Lag kategori" -#: templates/web/default/admin/list_flagged.html:17 +#: templates/web/default/admin/flagged.html:17 #: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/search_reports.html:20 +#: templates/web/default/admin/reports.html:20 +#: templates/web/zurich/admin/index-dm.html:14 +#: templates/web/zurich/admin/index-dm.html:40 +#: templates/web/zurich/admin/index-sdm.html:21 msgid "Created" msgstr "Opprettet" -#: templates/web/default/admin/report_edit.html:33 -#: templates/web/default/admin/update_edit.html:42 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:45 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Opprettet:" @@ -768,38 +798,36 @@ msgstr "Opprettet:" msgid "Current state" msgstr "Gjeldende tilstand" -#: templates/web/default/admin/council_list.html:40 -msgid "Currently has 1+ deleted" -msgstr "For tiden har 1+ slettet" - #: templates/web/default/dashboard/index.html:5 #: templates/web/default/dashboard/index.html:7 msgid "Dashboard" msgstr "Oversikt" -#: templates/web/default/admin/council_contacts.html:40 -#: templates/web/default/admin/council_contacts.html:91 -#: templates/web/default/admin/council_edit.html:29 -#: templates/web/default/admin/council_edit.html:72 +#: templates/web/default/admin/body.html:38 +#: templates/web/default/admin/body.html:88 +#: templates/web/default/admin/body_edit.html:33 +#: templates/web/default/admin/body_edit.html:78 msgid "Deleted" msgstr "Slettet" #: templates/web/bromley/report/new/fill_in_details_form.html:54 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/zurich/report/new/fill_in_details_form.html:60 +#: templates/web/zurich/report/new/fill_in_details_form.html:56 msgid "Details" 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:13 +#: templates/web/zurich/admin/report_edit.html:14 msgid "Details:" msgstr "Detaljer:" -#: templates/web/default/admin/council_contacts.html:41 +#: templates/web/default/admin/body.html:39 msgid "Devolved" msgstr "" -#: templates/web/default/admin/council_list.html:23 +#: templates/web/default/admin/edit-league.html:1 msgid "Diligency prize league table" msgstr "Arbeidshester" @@ -821,16 +849,26 @@ msgid "Don’t know" msgstr "Vet ikke" #: templates/web/default/admin/list_updates.html:35 -#: templates/web/default/admin/problem_row.html:29 -#: templates/web/default/admin/search_users.html:24 +#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/users.html:24 +#: templates/web/zurich/admin/index-dm.html:24 +#: templates/web/zurich/admin/index-dm.html:49 +#: templates/web/zurich/admin/index-sdm.html:33 msgid "Edit" msgstr "Rediger" +#: templates/web/default/admin/body.html:112 +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.html:1 msgid "Editing problem %d" msgstr "Rediger problem %d" #: templates/web/default/admin/update_edit.html:1 +#: templates/web/zurich/admin/update_edit.html:1 msgid "Editing update %d" msgstr "Redigerer oppdatering %d" @@ -838,28 +876,28 @@ msgstr "Redigerer oppdatering %d" msgid "Editing user %d" msgstr "Redigerer bruker %d" -#: templates/web/default/admin/council_edit.html:73 +#: templates/web/default/admin/body_edit.html:79 msgid "Editor" msgstr "Oppdatert av" #: templates/web/bromley/report/display.html:126 -#: templates/web/default/admin/council_contacts.html:38 -#: templates/web/default/admin/council_edit.html:70 -#: templates/web/default/admin/list_flagged.html:12 -#: templates/web/default/admin/list_flagged.html:35 +#: templates/web/default/admin/body.html:36 +#: templates/web/default/admin/body_edit.html:76 +#: 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/search_reports.html:15 -#: templates/web/default/admin/search_users.html:13 +#: 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:74 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1141 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" @@ -871,25 +909,27 @@ msgstr "Send meg e-post om lokale problemer" msgid "Email me updates" msgstr "Send meg oppdateringer" -#: templates/web/default/admin/council_contacts.html:83 -#: templates/web/default/admin/council_edit.html:26 -#: templates/web/default/admin/report_edit.html:31 -#: templates/web/default/admin/update_edit.html:24 +#: templates/web/default/admin/body.html:80 +#: templates/web/default/admin/body_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user_edit.html:11 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:44 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Empty flat or maisonette" msgstr "Tom leilighet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 +#: 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:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -897,11 +937,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eiendom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 +#: 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:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sykehos, etc." @@ -917,8 +957,13 @@ msgstr "Slutt-dag:" msgid "End month:" msgstr "Sluttmåned:" +#: templates/web/default/admin/body-form.html:40 +#, fuzzy +msgid "Endpoint" +msgstr "Sett opp Open311" + # Kan "Oppgi" være bedre? -#: perllib/FixMyStreet/Cobrand/Zurich.pm:9 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:11 #, fuzzy msgid "Enter a Zürich street name" msgstr "Skriv inn et veinavn og sted" @@ -974,8 +1019,8 @@ msgstr "Legg inn detaljer om problemet" msgid "Error" msgstr "Feil" -#: templates/web/default/admin/council_contacts.html:13 -#: templates/web/default/admin/council_edit.html:18 +#: templates/web/default/admin/body.html:11 +#: templates/web/default/admin/body_edit.html:18 msgid "Example postcode %s" msgstr "Eksempel-postnummer %s" @@ -983,7 +1028,7 @@ msgstr "Eksempel-postnummer %s" msgid "Examples:" msgstr "Eksempler:" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 msgid "Extra data:" msgstr "Ekstra data:" @@ -1017,6 +1062,7 @@ msgid "FixMyStreet" msgstr "FiksGataMi" #: templates/web/default/admin/header.html:10 +#: templates/web/zurich/admin/header.html:10 msgid "FixMyStreet admin:" msgstr "FiksGataMi-administrator:" @@ -1054,8 +1100,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1063,16 +1109,19 @@ msgstr "" #: templates/web/fixmystreet/report/banner.html:12 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/report/banner.html:9 msgid "Fixed" msgstr "Løst" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 msgid "Fixed - Council" msgstr "Løst - Administrasjon" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 msgid "Fixed - User" msgstr "Løst - Bruker" @@ -1080,7 +1129,7 @@ msgstr "Løst - Bruker" msgid "Fixed reports" msgstr "Fiksede rapporter" -#: templates/web/default/admin/problem_row.html:24 +#: templates/web/default/admin/problem_row.html:26 msgid "Fixed:" msgstr "Løst:" @@ -1088,12 +1137,12 @@ msgstr "Løst:" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 -#: templates/web/default/admin/search_users.html:15 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 +#: templates/web/default/admin/users.html:15 msgid "Flagged" msgstr "Flagget:" -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/admin/user_edit.html:18 msgid "Flagged:" msgstr "Flagget:" @@ -1104,7 +1153,7 @@ msgstr "Flagget:" msgid "Follow a ward link to view only reports within that ward." msgstr "Følg en bydelslenke for å kun se rapporter innenfor den bydelen." -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 msgid "For council(s):" msgstr "For administrasjon(ene):" @@ -1162,7 +1211,7 @@ msgstr "Gi meg en RSS-strøm" msgid "Go" msgstr "Fortsett" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" @@ -1212,13 +1261,16 @@ msgstr "" #: templates/web/bromley/header.html:99 #: templates/web/fixmybarangay/header.html:64 #: templates/web/fixmystreet/header.html:49 -#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:47 +#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:45 msgid "Hi %s" msgstr "Hei, %s" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/update_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjul" @@ -1230,7 +1282,7 @@ msgstr "Skjul gamle" msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/default/admin/council_edit.html:66 +#: templates/web/default/admin/body_edit.html:72 msgid "History" msgstr "Historie" @@ -1239,7 +1291,7 @@ msgstr "Historie" msgid "How to report a problem" msgstr "Hvordan rapportere et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:648 +#: perllib/FixMyStreet/App/Controller/Admin.pm:656 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." @@ -1255,7 +1307,7 @@ msgstr "" "Jeg er redd vi ikke kunne verifisere den referansen, da det er for lenge " "siden rapporten ble laget." -#: perllib/FixMyStreet/App/Controller/Tokens.pm:235 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:255 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" @@ -1263,14 +1315,17 @@ msgstr "" "Jeg er redd vi ikke kunne verifisere den referansen. Hvis du kopierte " "webadressen fra en e-post, sjekk at du har kopiert den korrekt.\n" -#: templates/web/default/admin/list_flagged.html:9 +#: templates/web/default/admin/flagged.html:9 #: templates/web/default/admin/list_updates.html:5 -#: templates/web/default/admin/search_reports.html:12 +#: templates/web/default/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:10 +#: templates/web/zurich/admin/index-dm.html:37 +#: templates/web/zurich/admin/index-sdm.html:18 msgid "ID" msgstr "ID" -#: templates/web/default/report/new/councils_text_none.html:11 -#: templates/web/default/report/new/councils_text_none.html:12 +#: templates/web/default/report/new/councils_text_none.html:8 +#: templates/web/default/report/new/councils_text_none.html:9 msgid "" "If you submit a problem here the subject and details of the problem will be " "public, but the problem will <strong>not</strong> be reported to the council." @@ -1320,19 +1375,6 @@ msgstr "Ugyldig ID" msgid "Illegal feed selection" msgstr "Ugyldig valg av feed" -#: templates/web/bromley/report/display.html:80 -#: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:138 -#: templates/web/default/dashboard/index.html:140 -#: templates/web/default/report/update-form.html:30 -#: templates/web/default/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 -msgid "In Progress" -msgstr "Under arbeid" - #: templates/web/default/open311/index.html:21 msgid "" "In addition, the following attributes that are not part of the Open311 v2 " @@ -1345,7 +1387,20 @@ msgstr "" "del av description), interface_used, comment_count, requestor_name (kun " "tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)." +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/report/banner.html:18 msgid "In progress" msgstr "Under arbeid" @@ -1353,30 +1408,35 @@ msgstr "Under arbeid" msgid "Include unconfirmed reports" msgstr "Inkluder ubekreftede problemer" -#: perllib/FixMyStreet/App/Controller/Open311.pm:356 +#: perllib/FixMyStreet/App/Controller/Open311.pm:348 msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" -#: perllib/FixMyStreet/App/Controller/Open311.pm:341 +#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit.html:38 +msgid "Internal notes:" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:333 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:952 +#: perllib/FixMyStreet/App/Controller/Admin.pm:961 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:424 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:951 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -1416,27 +1476,27 @@ msgstr "Husk min innlogging på denne datamaskinen" msgid "Last Name" msgstr "Etternavn" -#: templates/web/default/admin/council_contacts.html:42 +#: templates/web/default/admin/body.html:40 msgid "Last editor" msgstr "Sist redigert av" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 msgid "Last update:" msgstr "Siste oppdatering:" -#: templates/web/default/admin/problem_row.html:26 +#: templates/web/default/admin/problem_row.html:28 msgid "Last update:" msgstr "Siste oppdatering:" -#: templates/web/default/admin/council_contacts.html:16 -#: templates/web/default/admin/council_contacts.html:18 +#: templates/web/default/admin/body.html:14 +#: templates/web/default/admin/body.html:16 msgid "List all reported problems" msgstr "List alle rapporterte problemer" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 -#: templates/web/zurich/report/new/fill_in_details_form.html:69 +#: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Loading..." msgstr "Laster..." @@ -1497,7 +1557,7 @@ msgstr "Melding" msgid "Message:" msgstr "Melding:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" @@ -1509,11 +1569,12 @@ msgstr "Måned" msgid "More problems nearby" msgstr "Flere problemer i nærheten" -#: templates/web/default/admin/list_flagged.html:11 -#: templates/web/default/admin/list_flagged.html:34 +#: 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/search_reports.html:14 -#: templates/web/default/admin/search_users.html:12 +#: 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 @@ -1523,13 +1584,16 @@ msgstr "Flere problemer i nærheten" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:120 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 #: templates/web/fixmystreet/report/update-form.html:134 -#: templates/web/zurich/report/new/fill_in_details_form.html:118 +#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "Name" msgstr "Navn" -#: templates/web/default/admin/report_edit.html:30 -#: templates/web/default/admin/update_edit.html:23 +#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user_edit.html:10 +#: templates/web/zurich/admin/report_edit-sdm.html:20 +#: templates/web/zurich/admin/report_edit.html:43 msgid "Name:" msgstr "Navn:" @@ -1547,7 +1611,7 @@ msgstr "" "Nærmeste navngitte vei til nålen plassert på kartet (automatisk generert ved " "hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:152 +#: perllib/FixMyStreet/Cobrand/UK.pm:148 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" @@ -1564,7 +1628,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:265 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1583,7 +1647,12 @@ msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." msgid "New <br>problems" msgstr "Nye <br>problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:320 +#: perllib/FixMyStreet/App/Controller/Admin.pm:248 +#, fuzzy +msgid "New body added" +msgstr "Ny kategorikontakt lagt til" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:350 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1653,17 +1722,17 @@ msgstr "Ny tilstand" msgid "New!" msgstr "Ny!" -#: templates/web/default/admin/council_contacts.html:52 -#: templates/web/default/admin/council_contacts.html:53 -#: templates/web/default/admin/council_contacts.html:54 -#: templates/web/default/admin/council_edit.html:4 +#: 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:19 -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:16 +#: templates/web/default/admin/problem_row.html:21 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:107 #: templates/web/default/questionnaire/index.html:68 @@ -1672,31 +1741,30 @@ msgstr "Ny!" msgid "No" msgstr "Nei" -#: templates/web/default/admin/stats.html:85 #: templates/web/default/admin/user_edit.html:13 +msgid "No body" +msgstr "" + +#: templates/web/default/admin/stats.html:85 msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:336 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 msgid "No council selected" msgstr "Ingen administrasjon er valgt" -#: templates/web/default/admin/council_list.html:32 +#: templates/web/default/admin/edit-league.html:10 msgid "No edits have yet been made." msgstr "Ingenting endringer har blitt gjort." -#: templates/web/default/admin/list_flagged.html:26 +#: templates/web/default/admin/flagged.html:26 msgid "No flagged problems found" msgstr "Ingen flaggede problemer ble funnet" -#: templates/web/default/admin/list_flagged.html:47 +#: templates/web/default/admin/flagged.html:47 msgid "No flagged users found" msgstr "Ingen flaggede brukere ble funnet" -#: templates/web/default/admin/council_list.html:38 -msgid "No info at all" -msgstr "Helt uten informasjon" - #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 msgid "No problems found." @@ -1711,12 +1779,13 @@ msgstr "Ingen problemer er rapportert" msgid "No supporters" msgstr "" -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/body.html:55 msgid "Non Public" msgstr "" -#: templates/web/default/admin/council_list.html:5 -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:47 msgid "None" msgstr "Ingen" @@ -1729,8 +1798,8 @@ msgstr "Ikke rapportert tidligere" msgid "Not reported to council" msgstr "Ikke rapportert til administrasjonen" -#: templates/web/default/admin/council_contacts.html:43 -#: templates/web/default/admin/council_edit.html:74 +#: templates/web/default/admin/body.html:41 +#: templates/web/default/admin/body_edit.html:80 msgid "Note" msgstr "Merk" @@ -1744,8 +1813,8 @@ msgstr "" "opprettet, hvilket ikke trenger være den samme måneden som rapporten var " "bekreftet, så tallene kan hoppe litt opp og ned." -#: templates/web/default/admin/council_contacts.html:95 -#: templates/web/default/admin/council_edit.html:32 +#: templates/web/default/admin/body.html:92 +#: templates/web/default/admin/body_edit.html:37 msgid "Note:" msgstr "Merk:" @@ -1812,11 +1881,14 @@ msgid "Older problems" msgstr "Eldre problemer" #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "Åpen" @@ -1850,15 +1922,16 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1006 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 -#: perllib/FixMyStreet/DB/Result/Problem.pm:505 -#: perllib/FixMyStreet/DB/Result/Problem.pm:515 -#: perllib/FixMyStreet/DB/Result/Problem.pm:525 -#: perllib/FixMyStreet/DB/Result/Problem.pm:537 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/DB/Result/Problem.pm:509 +#: perllib/FixMyStreet/DB/Result/Problem.pm:519 +#: perllib/FixMyStreet/DB/Result/Problem.pm:529 +#: perllib/FixMyStreet/DB/Result/Problem.pm:541 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 +#: templates/web/zurich/report/_main.html:8 msgid "Other" msgstr "Annet" @@ -1879,8 +1952,13 @@ msgstr "Eier" msgid "Page Not Found" msgstr "Fant ikke siden" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/body-form.html:9 +#: templates/web/zurich/admin/body-form.html:9 +msgid "Parent" +msgstr "" + +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 msgid "Partial" msgstr "Delvis" @@ -1900,13 +1978,15 @@ msgstr "Passord:" #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:148 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/report/new/fill_in_details_form.html:124 +#: templates/web/zurich/report/new/fill_in_details_form.html:120 msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 -#: templates/web/default/admin/report_edit.html:32 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 +#: templates/web/default/admin/report_edit.html:33 #: templates/web/default/report/new/fill_in_details_form.html:215 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Phone:" msgstr "Telefon:" @@ -1914,7 +1994,7 @@ msgstr "Telefon:" #: 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:57 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Photo" msgstr "Bilde" @@ -1931,8 +2011,8 @@ msgstr "Bilder av nye problemer i nærheten" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -1971,16 +2051,16 @@ msgstr "Vennligst sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:822 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:829 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 -#: perllib/FixMyStreet/DB/Result/Problem.pm:355 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:828 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:835 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:854 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:897 +#: perllib/FixMyStreet/DB/Result/Problem.pm:358 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:361 +#: perllib/FixMyStreet/DB/Result/Problem.pm:364 msgid "Please choose a property type" msgstr "Velg en type egenskap" @@ -2015,7 +2095,7 @@ msgstr "" "Ikke vær ufin — å kjefte på din administrasjon skader verdien av " "tjenesten for alle brukerne." -#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Comment.pm:147 #: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "Vennligst legg til en melding" @@ -2026,12 +2106,12 @@ msgid "Please enter a password" msgstr "Skriv inn et passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:330 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" -#: perllib/FixMyStreet/DB/Result/User.pm:104 +#: perllib/FixMyStreet/DB/Result/User.pm:115 #: templates/web/default/js/validation_strings.html:12 #: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" @@ -2042,13 +2122,13 @@ 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:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:336 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 -#: perllib/FixMyStreet/DB/Result/User.pm:101 +#: 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/validation_strings.html:11 @@ -2060,7 +2140,7 @@ msgstr "Legg inn din e-post" #: templates/web/bromley/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 -#: templates/web/zurich/report/new/fill_in_details_form.html:110 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 msgid "Please enter your email address" msgstr "Vennligst tast inn din e-postadresse" @@ -2068,7 +2148,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:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:351 #: templates/web/default/js/validation_strings.html:7 msgid "" "Please enter your full name, councils need this information – if you do not " @@ -2079,9 +2159,9 @@ msgstr "" "under" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:143 -#: perllib/FixMyStreet/DB/Result/Problem.pm:341 -#: perllib/FixMyStreet/DB/Result/User.pm:97 +#: perllib/FixMyStreet/DB/Result/Comment.pm:144 +#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "Legg inn ditt navn" @@ -2150,14 +2230,14 @@ msgstr "" "vært der, en beskrivelse (og et bilde av problemet hvis du har et), osv." #: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/report/new/fill_in_details_form.html:64 +#: templates/web/zurich/report/new/fill_in_details_form.html:60 msgid "Please fill in details of the problem." msgstr "Vennligst fyll ut detaljer om problemet." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 -#: templates/web/zurich/report/new/fill_in_details_form.html:35 +#: templates/web/zurich/report/new/fill_in_details_form.html:34 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -2200,7 +2280,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/fixmystreet/report/new/fill_in_details_form.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:26 +#: templates/web/zurich/report/new/fill_in_details_form.html:25 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2284,16 +2364,18 @@ msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" #: templates/web/default/report/updates.html:21 +#: templates/web/zurich/report/updates.html:11 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Lagt inn av %s (<strong>%s</strong>) %s" #: templates/web/default/report/updates.html:23 +#: templates/web/zurich/report/updates.html:13 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: templates/web/default/admin/council_contacts.html:100 -#: templates/web/default/admin/council_edit.html:30 -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/body.html:97 +#: templates/web/default/admin/body_edit.html:35 +#: templates/web/default/admin/report_edit.html:44 msgid "Private" msgstr "" @@ -2313,11 +2395,16 @@ msgstr "Problem %s bekreftet" msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" +#: templates/web/zurich/admin/index-dm.html:11 +#, fuzzy +msgid "Problem ID" +msgstr "Problem" + #: templates/web/default/admin/index.html:28 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:849 +#: perllib/FixMyStreet/App/Controller/Admin.pm:863 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -2325,7 +2412,7 @@ msgstr "Problem markert som åpent." msgid "Problem state change based on survey results" msgstr "Problemtilstandsendring basert på spørreundersøkelsesresultater" -#: templates/web/default/admin/list_flagged.html:5 +#: templates/web/default/admin/flagged.html:5 msgid "Problems" msgstr "Problemer" @@ -2352,15 +2439,15 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problemer innenfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:612 +#: perllib/FixMyStreet/Cobrand/Default.pm:600 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 +#: perllib/FixMyStreet/Cobrand/UK.pm:227 msgid "Problems within %s" msgstr "Problemer innenfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:245 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "Problems within %s ward" msgstr "Problemer innenfor %s bydel" @@ -2380,7 +2467,7 @@ 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:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Property type:" msgstr "Type egenskap:" @@ -2417,8 +2504,8 @@ msgstr "" "for deg å rapportere problemer, legge inn oppdateringer og holde oversikt " "over dine rapporter" -#: templates/web/default/admin/council_contacts.html:44 -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/body.html:42 +#: templates/web/default/admin/body.html:55 msgid "Public" msgstr "" @@ -2458,23 +2545,23 @@ msgstr "Spørreskjema fylt inn av feilrapportøren" msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/UK.pm:274 perllib/FixMyStreet/Cobrand/UK.pm:286 +#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 msgid "RSS feed for %s" msgstr "RSS-strøm for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm for %s bydel, %s" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:178 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 -#: perllib/FixMyStreet/Cobrand/UK.pm:300 perllib/FixMyStreet/Cobrand/UK.pm:312 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 +#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:305 perllib/FixMyStreet/Cobrand/UK.pm:317 +#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm av %s, innenfor %s bydel" @@ -2487,15 +2574,15 @@ msgstr "RSS-strøm med problemer i nærheten" msgid "RSS feed of problems in this %s" msgstr "RSS-strøm for problemer i denne %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:613 +#: perllib/FixMyStreet/Cobrand/Default.pm:601 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 -#: perllib/FixMyStreet/Cobrand/UK.pm:238 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 +#: perllib/FixMyStreet/Cobrand/UK.pm:234 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer innenfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:244 +#: perllib/FixMyStreet/Cobrand/UK.pm:240 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer innenfor %s bydel" @@ -2562,8 +2649,10 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:54 -#: templates/web/default/admin/update_edit.html:48 +#: templates/web/default/admin/report_edit.html:55 +#: templates/web/default/admin/update_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilde (kan ikke gjøres om!)" @@ -2609,45 +2698,55 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:524 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" +#: templates/web/zurich/report/_main.html:11 +#, fuzzy +msgid "Reported at %s" +msgstr "Rapportert %s" + #: templates/web/default/admin/questionnaire.html:5 #: templates/web/default/questionnaire/index.html:77 #: templates/web/fixmystreet/questionnaire/index.html:71 msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:516 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:543 +#: perllib/FixMyStreet/DB/Result/Problem.pm:547 #: 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:534 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported by %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 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:528 +#: perllib/FixMyStreet/DB/Result/Problem.pm:532 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:516 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:538 +#: templates/web/zurich/report/_main.html:9 +#, fuzzy +msgid "Reported in the %s category at %s" +msgstr "Rapportert i kategorien %s av %s %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:542 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2663,7 +2762,8 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1033 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: templates/web/zurich/admin/header.html:14 #, fuzzy msgid "Reports" msgstr "Alle rapporter" @@ -2672,7 +2772,7 @@ msgstr "Alle rapporter" msgid "Reports on and around the map" msgstr "Problemer i og rundt kartet" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "Resend report" msgstr "Send rapport på nytt" @@ -2688,24 +2788,34 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" -#: templates/web/default/admin/council_edit.html:63 +#: templates/web/default/admin/body_edit.html:69 msgid "Save changes" msgstr "Lagre endringer" -#: templates/web/default/admin/list_flagged.html:1 -#: templates/web/default/admin/search_reports.html:1 +#: templates/web/default/admin/flagged.html:1 +#: templates/web/default/admin/reports.html:1 msgid "Search Reports" msgstr "Søk i rapporter" -#: templates/web/default/admin/search_users.html:1 +#: templates/web/default/admin/users.html:1 msgid "Search Users" msgstr "Søk i brukere" -#: templates/web/default/admin/search_reports.html:5 -#: templates/web/default/admin/search_users.html:5 +#: templates/web/default/admin/reports.html:5 +#: templates/web/default/admin/users.html:5 msgid "Search:" msgstr "Søk:" +#: templates/web/default/admin/body-form.html:11 +#: templates/web/zurich/admin/body-form.html:11 +msgid "Select a body" +msgstr "" + +#: templates/web/default/admin/body-form.html:21 +#: templates/web/zurich/admin/body-form.html:21 +msgid "Select an area" +msgstr "" + #: templates/web/default/alert/_list.html:8 #: templates/web/fixmystreet/alert/_list.html:10 msgid "" @@ -2715,15 +2825,19 @@ 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:623 +#: templates/web/zurich/admin/report_edit-sdm.html:15 +msgid "Send back to division" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "Sent:" msgstr "Sendt:" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:38 msgid "Service:" msgstr "Tjeneste:" @@ -2778,7 +2892,7 @@ msgstr "Vis nåler" #: templates/web/fixmystreet/auth/general.html:42 #: templates/web/fixmystreet/auth/general.html:62 #: templates/web/fixmystreet/header.html:53 -#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:51 +#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:49 msgid "Sign in" msgstr "Logg inn" @@ -2828,11 +2942,7 @@ msgstr "Noen bilder av nylig meldte problemer" msgid "Some text to localize" msgstr "Noe tekst å oversette" -#: templates/web/default/admin/council_list.html:42 -msgid "Some unconfirmeds" -msgstr "Noen ubekreftede" - -#: perllib/FixMyStreet/Cobrand/UK.pm:89 +#: perllib/FixMyStreet/Cobrand/UK.pm:93 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2876,20 +2986,22 @@ msgid "Start month:" msgstr "Startmåned:" #: templates/web/bromley/report/display.html:78 -#: templates/web/default/admin/list_flagged.html:18 +#: templates/web/default/admin/flagged.html:18 #: templates/web/default/admin/list_updates.html:6 -#: templates/web/default/admin/search_reports.html:21 +#: templates/web/default/admin/reports.html:21 #: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "Tilstand" -#: templates/web/default/admin/report_edit.html:17 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1047 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" @@ -2907,6 +3019,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/zurich/admin/report_edit.html:13 msgid "Subject:" msgstr "Emne:" @@ -2920,13 +3033,16 @@ msgstr "Emne:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:152 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:177 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:222 -#: templates/web/zurich/report/new/fill_in_details_form.html:128 +#: templates/web/zurich/report/new/fill_in_details_form.html:125 msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:57 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:58 +#: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user_edit.html:20 +#: templates/web/zurich/admin/report_edit-sdm.html:31 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringer" @@ -2935,6 +3051,13 @@ msgstr "Send inn endringer" msgid "Submit questionnaire" msgstr "Send inn spørreskjema" +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/report/banner.html:15 +#, fuzzy +msgid "Submitted" +msgstr "Send inn" + #: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:38 @@ -2956,8 +3079,11 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1031 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 #: templates/web/default/admin/index.html:1 +#: templates/web/zurich/admin/header.html:11 +#: templates/web/zurich/admin/index-dm.html:1 +#: templates/web/zurich/admin/index-sdm.html:1 msgid "Summary" msgstr "Oppsummering" @@ -2969,7 +3095,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1044 #, fuzzy msgid "Survey" msgstr "Resultater fra spørreundersøkelsen" @@ -2979,14 +3105,16 @@ msgid "Survey Results" msgstr "Resultater fra spørreundersøkelsen" #: templates/web/default/admin/list_updates.html:14 +#: templates/web/zurich/admin/index-dm.html:13 msgid "Text" msgstr "Tekst" -#: templates/web/default/admin/council_contacts.html:20 +#: templates/web/default/admin/body.html:18 msgid "Text only version" msgstr "Tekst-versjon" -#: templates/web/default/admin/update_edit.html:13 +#: templates/web/default/admin/update_edit.html:14 +#: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "Tekst:" @@ -3087,11 +3215,11 @@ msgid "That location does not appear to be in the UK; please try again." msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:82 +#: perllib/FixMyStreet/Cobrand/UK.pm:86 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:616 +#: perllib/FixMyStreet/App/Controller/Admin.pm:624 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." @@ -3171,8 +3299,7 @@ msgstr "" "Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:43 -#: perllib/FixMyStreet/App/Controller/Reports.pm:74 +#: perllib/FixMyStreet/App/Controller/Reports.pm:50 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3276,7 +3403,7 @@ msgstr "" "Tittelen og detaljene for problemet vil bli offentlig, pluss navnet ditt\n" "hvis du gir oss tillatelse til det." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:271 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:273 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -3284,7 +3411,7 @@ msgstr "" "Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt " "stedet de skrev inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:71 +#: perllib/FixMyStreet/App/Controller/Reports.pm:47 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3295,7 +3422,7 @@ 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:736 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3327,6 +3454,12 @@ msgstr "Det var problemer med din rapport. Vennligst se under." msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/report/banner.html:12 +msgid "Third party" +msgstr "" + #: templates/web/default/open311/index.html:10 msgid "" "This API implementation is work in progress and not yet stabilized. It will " @@ -3335,7 +3468,7 @@ msgstr "" "Denne API-implementasjonen er under arbeid og ennå ikke stabil. Den vil " "endre seg uten advarsel i fremtiden." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3348,7 +3481,7 @@ msgstr "" "eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan " "legge det til i vårt system." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:345 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 " @@ -3359,8 +3492,8 @@ msgstr "" "snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å " "håndtere denne saken." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:868 -#: perllib/FixMyStreet/Cobrand/UK.pm:54 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Denne informasjonen er påkrevd" @@ -3426,6 +3559,11 @@ msgstr "Dette problemet er under arbeid" msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammel og med ukjent status." +#: templates/web/zurich/report/_main.html:21 +#, fuzzy +msgid "This report is awaiting moderation." +msgstr "Denne rapporten er for tiden markert som åpen." + #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tiden markert som lukket." @@ -3438,19 +3576,21 @@ msgstr "Denne rapporten er for tiden markert som fikset." msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:266 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" -#: templates/web/default/admin/list_flagged.html:10 -#: templates/web/default/admin/search_reports.html:13 +#: templates/web/default/admin/flagged.html:10 +#: templates/web/default/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:38 +#: templates/web/zurich/admin/index-sdm.html:19 msgid "Title" msgstr "Tittel" @@ -3475,7 +3615,7 @@ msgid "" msgstr "" "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:270 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:272 msgid "To view a map of the precise location of this issue" msgstr "For å se en kart med en mer presis plassering for dette problemet." @@ -3486,13 +3626,10 @@ msgstr "For å se en kart med en mer presis plassering for dette problemet." msgid "Total" msgstr "Totalt" -#: perllib/FixMyStreet/App/Controller/Reports.pm:42 -msgid "Unable to look up areas in MaPit. Please try again later." -msgstr "Klarte ikke slå opp områder i MaPit. Vennligst forsøk igjen senere." - -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/update_edit.html:22 +#: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Ubekreftet" @@ -3527,6 +3664,12 @@ msgstr "Oppdateringen under lagt inn anonymt %s" msgid "Update below added by %s at %s" msgstr "Oppdateringen under lagt til av %s %s" +#: templates/web/default/admin/body-form.html:77 +#: templates/web/zurich/admin/body-form.html:41 +#, fuzzy +msgid "Update body" +msgstr "Oppdatert!" + #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" msgstr "Tilstandsfordeling for oppdateringer" @@ -3535,29 +3678,32 @@ msgstr "Tilstandsfordeling for oppdateringer" msgid "Update by {{name}}" msgstr "Oppdatert av {{name}}" -#: templates/web/default/admin/update_edit.html:33 +#: templates/web/default/admin/update_edit.html:36 +#: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "En oppdatering endret problemets status til %s" -#: templates/web/default/admin/update_edit.html:35 +#: templates/web/default/admin/update_edit.html:38 msgid "Update marked problem as fixed" msgstr "En oppdatering markerte dette problemet som fikset." -#: templates/web/default/admin/update_edit.html:37 +#: templates/web/default/admin/update_edit.html:40 msgid "Update reopened problem" msgstr "En oppdatering gjennåpnet problemet" -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/body.html:65 msgid "Update statuses" msgstr "Oppdater tilstanden" #: templates/web/default/report/update-form.html:22 +#: templates/web/zurich/admin/report_edit-sdm.html:26 msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:839 -#: perllib/FixMyStreet/App/Controller/Admin.pm:899 +#: perllib/FixMyStreet/App/Controller/Admin.pm:720 +#: perllib/FixMyStreet/App/Controller/Admin.pm:853 +#: perllib/FixMyStreet/App/Controller/Admin.pm:912 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:171 msgid "Updated!" msgstr "Oppdatert!" @@ -3580,26 +3726,30 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1163 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1172 msgid "User flagged" msgstr "Bruker flagget" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 -#: templates/web/default/admin/list_flagged.html:30 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 +#: templates/web/default/admin/flagged.html:30 +#: templates/web/zurich/admin/header.html:17 msgid "Users" msgstr "Brukere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:375 msgid "Values updated" 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:12 +#: templates/web/zurich/admin/report_edit.html:12 +#: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Se rapport på nettstedet" @@ -3664,7 +3814,7 @@ msgstr "Vi viser aldri din e-postadresse" #: templates/web/bromley/report/new/fill_in_details_form.html:179 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:144 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 -#: templates/web/zurich/report/new/fill_in_details_form.html:114 +#: templates/web/zurich/report/new/fill_in_details_form.html:110 msgid "We never show your email address or phone number." msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" @@ -3720,17 +3870,17 @@ msgstr "" "Vi ønsker å få din tilbakemelding om hva du mener om denne tjenesten. Bare " "fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:45 -#: templates/web/default/admin/council_edit.html:69 +#: templates/web/default/admin/body.html:43 +#: templates/web/default/admin/body_edit.html:75 msgid "When edited" msgstr "Når redigert" -#: templates/web/default/admin/list_flagged.html:19 -#: templates/web/default/admin/search_reports.html:22 +#: templates/web/default/admin/flagged.html:19 +#: templates/web/default/admin/reports.html:22 msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 msgid "Whole block of empty flats" msgstr "Hel blokk med tomme leiligheter" @@ -3787,18 +3937,18 @@ msgstr "" msgid "Year" msgstr "År" -#: templates/web/default/admin/council_contacts.html:52 -#: templates/web/default/admin/council_contacts.html:53 -#: templates/web/default/admin/council_contacts.html:54 -#: templates/web/default/admin/council_edit.html:5 +#: 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:19 -#: templates/web/default/admin/report_edit.html:27 -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/search_users.html:23 -#: templates/web/default/admin/update_edit.html:15 +#: templates/web/default/admin/problem_row.html:21 +#: templates/web/default/admin/report_edit.html:28 +#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/users.html:23 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:105 #: templates/web/default/questionnaire/index.html:66 @@ -3840,12 +3990,19 @@ msgstr "" "Du kan <a href=\"%s\">se alle rapporter for administrasjonen</a> eller <a " "href=\"/reports\">se alle administrasjonene</a>." +# Trenger kontekst for bedre oversettelse +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:8 +#, fuzzy +msgid "You can <a href=\"%s%s\">view the problem on this site</a>." +msgstr ". Du kan <a href=\"%s\">lese om problemet på denne siden</a>." + #: templates/web/emptyhomes/reports/body.html:66 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Du kan <a href=\"/reports/\">se alle administrasjoner</a>." -#: templates/web/default/report/new/councils_text_none.html:14 -#: templates/web/default/report/new/councils_text_none.html:16 +#: templates/web/default/report/new/councils_text_none.html:11 +#: templates/web/default/report/new/councils_text_none.html:13 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 msgid "" @@ -3869,7 +4026,7 @@ msgstr "" #: 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/zurich/report/new/fill_in_details_form.html:93 +#: templates/web/zurich/report/new/fill_in_details_form.html:89 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -3895,7 +4052,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/fixmystreet/report/new/fill_in_details_form.html:28 -#: templates/web/zurich/report/new/fill_in_details_form.html:28 +#: templates/web/zurich/report/new/fill_in_details_form.html:27 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. " @@ -3907,6 +4064,12 @@ msgstr "" msgid "You have successfully confirmed your alert." msgstr "Du har nå lykkes med å bekrefte ditt varsel." +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:6 +#, fuzzy +msgid "You have successfully confirmed your email address." +msgstr "Du har nå lykkes med å bekrefte ditt varsel." + #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 msgid "You have successfully confirmed your problem" @@ -3930,7 +4093,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:743 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " @@ -3947,7 +4110,7 @@ msgstr "" "Du må nå åpne lenken i e-posten vi akkurat sendte deg — dersom du ikke " "gjør det, %s" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "You really want to resend?" msgstr "Ønsker du virkelig å sende på nytt?" @@ -3969,7 +4132,7 @@ msgstr "Dine rapporter" #: templates/web/fixmystreet/report/display.html:55 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:157 -#: templates/web/zurich/report/new/fill_in_details_form.html:106 +#: templates/web/zurich/report/new/fill_in_details_form.html:102 msgid "Your email" msgstr "Din e-post" @@ -4015,7 +4178,7 @@ msgstr "Ditt etternavn" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:202 #: templates/web/fixmystreet/report/update-form.html:138 -#: templates/web/zurich/report/new/fill_in_details_form.html:122 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "Your name" msgstr "Ditt navn" @@ -4042,7 +4205,7 @@ msgstr "Ditt passord har blitt endret" #: templates/web/bromley/report/new/fill_in_details_form.html:184 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:216 -#: templates/web/zurich/report/new/fill_in_details_form.html:125 +#: templates/web/zurich/report/new/fill_in_details_form.html:121 msgid "Your phone number" msgstr "Ditt telefonnummer" @@ -4078,12 +4241,14 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:609 #, fuzzy msgid "council ref: %s" msgstr "%s ref: %s" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "didn't use map" msgstr "brukte ikke kart" @@ -4101,6 +4266,7 @@ msgid "less than a minute" msgstr "mindre enn et minutt" #: templates/web/default/report/updates.html:27 +#: templates/web/zurich/report/updates.html:16 msgid "marked as %s" msgstr "markert som %s" @@ -4108,7 +4274,7 @@ msgstr "markert som %s" msgid "marked as fixed" msgstr "markert som fikset" -#: perllib/FixMyStreet/App/Controller/Admin.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin.pm:127 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" @@ -4124,15 +4290,18 @@ msgstr "eller" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "originally entered" msgstr "søkte etter" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 msgid "other areas:" msgstr "andre områder:" #: templates/web/default/report/updates.html:26 +#: templates/web/zurich/report/updates.html:15 msgid "reopened" msgstr "åpnet på nytt" @@ -4140,7 +4309,7 @@ msgstr "åpnet på nytt" #: templates/web/bromley/header.html:65 #: templates/web/fixmybarangay/header.html:65 #: templates/web/fixmystreet/header.html:50 -#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:48 +#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:46 msgid "sign out" msgstr "logg ut" @@ -4156,10 +4325,11 @@ msgid "the local council" msgstr "den lokale administrasjonen" #: templates/web/default/report/_main.html:6 +#: templates/web/zurich/report/_main.html:14 msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:333 msgid "this type of local problem" msgstr "denne type lokalt problem" @@ -4167,15 +4337,17 @@ msgstr "denne type lokalt problem" msgid "today" msgstr "idag" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "used map" msgstr "brukte kart" -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/update_edit.html:29 msgid "user is from same council as problem - %d" msgstr "bruker er fra samme administrasjon som problemet - %d" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:32 msgid "user is problem owner" msgstr "bruker er eier av problemet" @@ -4297,6 +4469,40 @@ msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dag" +#~ msgid "All confirmed" +#~ msgstr "Alle bekreftet" + +#~ msgid "Configuration updated" +#~ msgstr "Oppsett oppdatert" + +#~ msgid "Configure Open311" +#~ msgstr "Sett opp Open311" + +#~ msgid "Configure Open311 integration" +#~ msgstr "Sett opp Open311-integrasjon" + +#~ msgid "Council contacts" +#~ msgstr "Administrasjonskontakter" + +#~ msgid "Councils" +#~ msgstr "Administrasjoner" + +#~ msgid "Currently has 1+ deleted" +#~ msgstr "For tiden har 1+ slettet" + +#~ msgid "In Progress" +#~ msgstr "Under arbeid" + +#~ msgid "No info at all" +#~ msgstr "Helt uten informasjon" + +#~ msgid "Some unconfirmeds" +#~ msgstr "Noen ubekreftede" + +#~ msgid "Unable to look up areas in MaPit. Please try again later." +#~ msgstr "" +#~ "Klarte ikke slå opp områder i MaPit. Vennligst forsøk igjen senere." + #~ msgid "FixMyStreet administration" #~ msgstr "Fiksgatami-administrasjon" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index e8b2ee555..0f0c816fd 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: 2012-12-10 13:18+0000\n" +"POT-Creation-Date: 2012-12-21 17:13+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,8 +21,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:560 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid " and " msgstr " og " @@ -31,11 +31,11 @@ msgstr " og " msgid " and <strong>we will now send it to the council</strong>" msgstr " og <strong>vi sender det no til administrasjonen</strong>" -#: templates/web/default/report/new/councils_text_all.html:10 -#: templates/web/default/report/new/councils_text_all.html:17 -#: templates/web/default/report/new/councils_text_all.html:3 +#: templates/web/default/report/new/councils_text_all.html:11 +#: templates/web/default/report/new/councils_text_all.html:18 +#: templates/web/default/report/new/councils_text_all.html:4 +#: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:14 -#: templates/web/default/report/new/councils_text_none.html:17 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 @@ -43,7 +43,7 @@ msgstr " og <strong>vi sender det no til administrasjonen</strong>" msgid " or " msgstr " eller " -#: templates/web/default/admin/council_list.html:17 +#: templates/web/default/admin/bodies.html:19 msgid "%d addresses" msgstr "%d adresser" @@ -55,7 +55,7 @@ msgstr "%d stadfesta varsel, %d ikkje stadfesta" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "%d administrasjonskontaktar – %d stadfesta, %d ikkje stadfesta" -#: templates/web/default/admin/council_list.html:27 +#: templates/web/default/admin/edit-league.html:5 msgid "%d edits by %s" msgstr "%d redigeringar av %s" @@ -78,23 +78,23 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s – oppsummeringsrapportar" -#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 +#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:496 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:498 +#: perllib/FixMyStreet/DB/Result/Problem.pm:502 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:306 perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314 msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" @@ -103,7 +103,7 @@ msgid "(Don't worry — %s)" msgstr "(Ingen grunn til å uroa seg — %s)" #: templates/web/default/admin/report_blocks.html:11 -#: templates/web/default/admin/search_users.html:23 +#: templates/web/default/admin/users.html:23 msgid "(Email in abuse table)" msgstr "(Epost i misbruktabellen)" @@ -120,6 +120,7 @@ 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:23 +#: templates/web/zurich/report/_item.html:27 #, fuzzy msgid "(closed)" msgstr "Lukka" @@ -127,6 +128,7 @@ 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:21 +#: templates/web/zurich/report/_item.html:25 msgid "(fixed)" msgstr "(løyst)" @@ -137,16 +139,18 @@ 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:17 +#: templates/web/zurich/report/_item.html:21 msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" #: templates/web/default/report/new/fill_in_details_form.html:217 -#: templates/web/zurich/report/new/fill_in_details_form.html:118 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "(optional)" msgstr "(valfritt)" #: templates/web/default/reports/_list-entry.html:2 #: templates/web/fixmystreet/report/_item.html:16 +#: templates/web/zurich/report/_item.html:20 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -158,18 +162,18 @@ 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/Admin.pm:285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 msgid "*unknown*" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:628 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 +#: perllib/FixMyStreet/DB/Result/Problem.pm:356 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:608 -#: perllib/FixMyStreet/DB/Result/Problem.pm:359 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:362 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" @@ -352,7 +356,13 @@ msgstr "<strong>Ja</strong>, eg har eit passord:" msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/council_contacts.html:72 +#: templates/web/default/admin/bodies.html:31 +#: templates/web/default/admin/body-form.html:77 +#: templates/web/zurich/admin/body-form.html:41 +msgid "Add body" +msgstr "" + +#: templates/web/default/admin/body.html:69 msgid "Add new category" msgstr "Legg til ny kategori" @@ -384,10 +394,6 @@ msgstr "Send meg varsel ved framtidige oppdateringar" msgid "All Reports" msgstr "Alle rapportar" -#: templates/web/default/admin/council_list.html:44 -msgid "All confirmed" -msgstr "Alle stadfesta" - #: 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/fiksgatami/footer.html:7 @@ -408,8 +414,8 @@ msgstr "%srapportar mellom %s og %s" msgid "All the information you provide here will be sent to" msgstr "All informasjonen du har lagt inn her vil sendast til" -#: templates/web/default/report/new/councils_text_all.html:10 -#: templates/web/default/report/new/councils_text_all.html:12 +#: templates/web/default/report/new/councils_text_all.html:11 +#: templates/web/default/report/new/councils_text_all.html:13 #, fuzzy msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " @@ -418,8 +424,8 @@ msgstr "" "All informasjonen du har lagt inn her vil sendast til <strong>%s</strong>." # TfL? skal ikkje det omsetjast? --KBU -#: templates/web/default/report/new/councils_text_all.html:3 -#: templates/web/default/report/new/councils_text_all.html:5 +#: templates/web/default/report/new/councils_text_all.html:4 +#: templates/web/default/report/new/councils_text_all.html:6 msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " "a relevant local body such as <strong>TfL</strong>, via the London Report-It " @@ -431,8 +437,8 @@ 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:17 -#: templates/web/default/report/new/councils_text_all.html:19 +#: 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 @@ -455,19 +461,28 @@ msgstr "" "På dette nettestedet vil vi visa emne og detaljar om problemet,\n" "inkludert namnet ditt dersom du gjev oss lov." +#: templates/web/zurich/report/new/councils_text_all.html:2 +#: templates/web/zurich/report/new/councils_text_all.html:3 +#, fuzzy +msgid "" +"All the information you provide here will be sent to <strong>Stadt Zürich</" +"strong>." +msgstr "" +"All informasjonen du har lagt inn her vil sendast til <strong>%s</strong>." + #: templates/web/default/questionnaire/index.html:60 #: templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this problem as fixed." msgstr "Ei oppdatering markerte dette problemet som løyst." -#: templates/web/default/admin/list_flagged.html:15 +#: templates/web/default/admin/flagged.html:15 #: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/search_reports.html:18 +#: templates/web/default/admin/reports.html:18 msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "Anonym:" @@ -489,6 +504,11 @@ msgstr "" msgid "Are you from a council?" msgstr "den lokale administrasjonen" +#: templates/web/default/admin/body-form.html:19 +#: templates/web/zurich/admin/body-form.html:19 +msgid "Area covered" +msgstr "" + #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " @@ -503,6 +523,10 @@ 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." +#: templates/web/zurich/report/_item.html:9 +msgid "Awaiting moderation" +msgstr "" + #: templates/web/default/admin/report_blocks.html:11 msgid "Ban email address" msgstr "Bannlys e-postadresse" @@ -513,10 +537,22 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: templates/web/default/admin/bodies.html:1 +#: templates/web/zurich/admin/header.html:13 msgid "Bodies" msgstr "" +#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/users.html:14 +msgid "Body" +msgstr "" + +#: templates/web/default/admin/user_edit.html:12 +#: templates/web/zurich/admin/report_edit.html:17 +msgid "Body:" +msgstr "" + #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 msgid "" @@ -538,15 +574,18 @@ 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:631 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:665 #: templates/web/bromley/report/new/fill_in_details_form.html:68 -#: templates/web/default/admin/council_contacts.html:37 +#: 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/list_flagged.html:14 -#: templates/web/default/admin/search_reports.html:17 +#: templates/web/default/admin/reports.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/admin/index-dm.html:12 +#: templates/web/zurich/admin/index-dm.html:39 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/report/new/fill_in_details_form.html:64 msgid "Category" msgstr "Kategori" @@ -554,14 +593,16 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" -#: templates/web/default/admin/council_contacts.html:78 -#: templates/web/default/admin/council_edit.html:23 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/body.html:75 +#: templates/web/default/admin/body_edit.html:23 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/report/new/fill_in_details_form.html:67 +#: templates/web/zurich/admin/report_edit-sdm.html:19 +#: templates/web/zurich/admin/report_edit.html:41 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:336 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 msgid "Category: %s" msgstr "Kategori: %s" @@ -579,8 +620,8 @@ msgstr "Korleis rapportera eit problem" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -592,7 +633,7 @@ msgid "Closed" msgstr "Lukka" # skal det vera forskjellig tyding frå engelsken her? --KBU -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -600,7 +641,7 @@ msgstr "(ikkje rapportert til administrasjonen)" msgid "Closed reports" msgstr "Lukka rapportar" -#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/problem_row.html:27 msgid "Closed:" msgstr "Lukka:" @@ -609,48 +650,38 @@ msgstr "Lukka:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dei næraste problema <small>(innanfor %skm)</small>" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "Co-ordinates:" msgstr "Koordinatar:" -#: templates/web/default/admin/list_flagged.html:16 +#: templates/web/default/admin/flagged.html:16 #: templates/web/default/admin/list_updates.html:13 -#: templates/web/default/admin/search_reports.html:19 +#: templates/web/default/admin/reports.html:19 msgid "Cobrand" msgstr "Merkevaresamarbeid" -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/admin/update_edit.html:41 +#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "Data om merkevaresamarbeid:" -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/admin/update_edit.html:40 +#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:365 -msgid "Configuration updated" -msgstr "Oppsett oppdatert" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:394 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontaktar vil genererast automatisk seinare" -#: templates/web/default/admin/council_edit.html:34 +#: templates/web/default/admin/body_edit.html:40 #, fuzzy msgid "Configure Endpoint" msgstr "Sett opp Open311" -#: templates/web/default/admin/council_contacts.html:168 -msgid "Configure Open311" -msgstr "Sett opp Open311" - -#: templates/web/default/admin/council_contacts.html:116 -msgid "Configure Open311 integration" -msgstr "Sett opp Open311-integrasjon" - -#: templates/web/default/admin/council_contacts.html:46 +#: templates/web/default/admin/body.html:44 msgid "Confirm" msgstr "Stadfest" @@ -674,13 +705,17 @@ msgstr "" #: templates/web/emptyhomes/tokens/confirm_problem.html:3 #: templates/web/southampton/tokens/confirm_problem.html:1 #: templates/web/southampton/tokens/confirm_problem.html:3 +#: templates/web/zurich/tokens/confirm_problem.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Stadfesting" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:88 -#: templates/web/default/admin/council_edit.html:28 -#: templates/web/default/admin/council_edit.html:71 +#: templates/web/default/admin/body.html:37 +#: templates/web/default/admin/body.html:85 +#: templates/web/default/admin/body_edit.html:31 +#: templates/web/default/admin/body_edit.html:77 +#: templates/web/zurich/admin/report_edit-sdm.html:22 +#: templates/web/zurich/admin/report_edit.html:45 msgid "Confirmed" msgstr "Stadfesta" @@ -689,8 +724,8 @@ msgstr "Stadfesta" msgid "Confirmed reports between %s and %s" msgstr "%srapportar mellom %s og %s" -#: templates/web/default/admin/problem_row.html:23 -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/report_edit.html:35 msgid "Confirmed:" msgstr "Stadfesta:" @@ -719,36 +754,25 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppa" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1159 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1187 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1168 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" -#: templates/web/default/admin/list_flagged.html:13 +#: templates/web/default/admin/flagged.html:13 #: templates/web/default/admin/list_updates.html:12 -#: templates/web/default/admin/search_reports.html:16 -#: templates/web/default/admin/search_users.html:14 msgid "Council" msgstr "Administrasjon" -#: templates/web/default/admin/council_list.html:1 -msgid "Council contacts" -msgstr "Administrasjonskontaktar" - -#: templates/web/default/admin/council_contacts.html:1 -#: templates/web/default/admin/council_edit.html:1 +#: templates/web/default/admin/body.html:1 +#: templates/web/default/admin/body_edit.html:1 msgid "Council contacts for %s" msgstr "Administrasjonskontaktar for %s" #: templates/web/default/admin/stats.html:84 -#: templates/web/default/admin/user_edit.html:12 msgid "Council:" msgstr "Administrasjon:" -#: templates/web/default/admin/council_list.html:36 -msgid "Councils" -msgstr "Administrasjonar" - #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 msgid "Count" @@ -758,18 +782,24 @@ msgstr "Mengd" msgid "Create a report" msgstr "Lag ein rapport" -#: templates/web/default/admin/council_contacts.html:107 +#: templates/web/default/admin/body.html:103 msgid "Create category" msgstr "Lag kategori" -#: templates/web/default/admin/list_flagged.html:17 +#: templates/web/default/admin/flagged.html:17 #: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/search_reports.html:20 +#: templates/web/default/admin/reports.html:20 +#: templates/web/zurich/admin/index-dm.html:14 +#: templates/web/zurich/admin/index-dm.html:40 +#: templates/web/zurich/admin/index-sdm.html:21 msgid "Created" msgstr "Oppretta" -#: templates/web/default/admin/report_edit.html:33 -#: templates/web/default/admin/update_edit.html:42 +#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/update_edit.html:45 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Oppretta:" @@ -777,39 +807,37 @@ msgstr "Oppretta:" msgid "Current state" msgstr "Gjeldande tilstand" -#: templates/web/default/admin/council_list.html:40 -msgid "Currently has 1+ deleted" -msgstr "For tida har 1+ sletta" - #: templates/web/default/dashboard/index.html:5 #: templates/web/default/dashboard/index.html:7 msgid "Dashboard" msgstr "" -#: templates/web/default/admin/council_contacts.html:40 -#: templates/web/default/admin/council_contacts.html:91 -#: templates/web/default/admin/council_edit.html:29 -#: templates/web/default/admin/council_edit.html:72 +#: templates/web/default/admin/body.html:38 +#: templates/web/default/admin/body.html:88 +#: templates/web/default/admin/body_edit.html:33 +#: templates/web/default/admin/body_edit.html:78 msgid "Deleted" msgstr "Sletta" #: templates/web/bromley/report/new/fill_in_details_form.html:54 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/zurich/report/new/fill_in_details_form.html:60 +#: templates/web/zurich/report/new/fill_in_details_form.html:56 #, fuzzy msgid "Details" 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:13 +#: templates/web/zurich/admin/report_edit.html:14 msgid "Details:" msgstr "Detaljar:" -#: templates/web/default/admin/council_contacts.html:41 +#: templates/web/default/admin/body.html:39 msgid "Devolved" msgstr "" -#: templates/web/default/admin/council_list.html:23 +#: templates/web/default/admin/edit-league.html:1 msgid "Diligency prize league table" msgstr "Arbeidshestar" @@ -831,16 +859,26 @@ msgid "Don’t know" msgstr "Veit ikkje" #: templates/web/default/admin/list_updates.html:35 -#: templates/web/default/admin/problem_row.html:29 -#: templates/web/default/admin/search_users.html:24 +#: templates/web/default/admin/problem_row.html:31 +#: templates/web/default/admin/users.html:24 +#: templates/web/zurich/admin/index-dm.html:24 +#: templates/web/zurich/admin/index-dm.html:49 +#: templates/web/zurich/admin/index-sdm.html:33 msgid "Edit" msgstr "Rediger" +#: templates/web/default/admin/body.html:112 +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.html:1 msgid "Editing problem %d" msgstr "Rediger problem %d" #: templates/web/default/admin/update_edit.html:1 +#: templates/web/zurich/admin/update_edit.html:1 msgid "Editing update %d" msgstr "Redigerer oppdatering %d" @@ -848,28 +886,28 @@ msgstr "Redigerer oppdatering %d" msgid "Editing user %d" msgstr "Redigerer brukar %d" -#: templates/web/default/admin/council_edit.html:73 +#: templates/web/default/admin/body_edit.html:79 msgid "Editor" msgstr "Oppdatert av" #: templates/web/bromley/report/display.html:126 -#: templates/web/default/admin/council_contacts.html:38 -#: templates/web/default/admin/council_edit.html:70 -#: templates/web/default/admin/list_flagged.html:12 -#: templates/web/default/admin/list_flagged.html:35 +#: templates/web/default/admin/body.html:36 +#: templates/web/default/admin/body_edit.html:76 +#: 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/search_reports.html:15 -#: templates/web/default/admin/search_users.html:13 +#: 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:74 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1141 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" @@ -881,25 +919,27 @@ msgstr "Send meg e-post om lokale problem" msgid "Email me updates" msgstr "Send meg oppdateringar" -#: templates/web/default/admin/council_contacts.html:83 -#: templates/web/default/admin/council_edit.html:26 -#: templates/web/default/admin/report_edit.html:31 -#: templates/web/default/admin/update_edit.html:24 +#: templates/web/default/admin/body.html:80 +#: templates/web/default/admin/body_edit.html:26 +#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user_edit.html:11 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:44 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Empty flat or maisonette" msgstr "Tom leilegheit" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 +#: 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:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -907,11 +947,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eigedom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 +#: 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:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentleg bygning – skule, sjukehus, osb." @@ -927,7 +967,12 @@ msgstr "Sluttdag:" msgid "End month:" msgstr "Sluttmånad:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:9 +#: templates/web/default/admin/body-form.html:40 +#, fuzzy +msgid "Endpoint" +msgstr "Sett opp Open311" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:11 #, fuzzy msgid "Enter a Zürich street name" msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" @@ -985,8 +1030,8 @@ msgstr "Legg inn detaljar om problemet" msgid "Error" msgstr "Feil" -#: templates/web/default/admin/council_contacts.html:13 -#: templates/web/default/admin/council_edit.html:18 +#: templates/web/default/admin/body.html:11 +#: templates/web/default/admin/body_edit.html:18 msgid "Example postcode %s" msgstr "Postnummerdøme %s" @@ -994,7 +1039,7 @@ msgstr "Postnummerdøme %s" msgid "Examples:" msgstr "Døme:" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 #, fuzzy msgid "Extra data:" msgstr "Data om merkevaresamarbeid:" @@ -1031,6 +1076,7 @@ msgid "FixMyStreet" msgstr "FiksGataMi-administrator:" #: templates/web/default/admin/header.html:10 +#: templates/web/zurich/admin/header.html:10 msgid "FixMyStreet admin:" msgstr "FiksGataMi-administrator:" @@ -1068,8 +1114,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1077,16 +1123,19 @@ msgstr "" #: templates/web/fixmystreet/report/banner.html:12 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:30 +#: templates/web/zurich/report/banner.html:9 msgid "Fixed" msgstr "Løyst" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 msgid "Fixed - Council" msgstr "Løyst – Administrasjon" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 msgid "Fixed - User" msgstr "Løyst – Brukar" @@ -1094,7 +1143,7 @@ msgstr "Løyst – Brukar" msgid "Fixed reports" msgstr "Løyste rapportar" -#: templates/web/default/admin/problem_row.html:24 +#: templates/web/default/admin/problem_row.html:26 msgid "Fixed:" msgstr "Løyst:" @@ -1102,12 +1151,12 @@ msgstr "Løyst:" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 -#: templates/web/default/admin/search_users.html:15 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 +#: templates/web/default/admin/users.html:15 msgid "Flagged" msgstr "Flagga:" -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/admin/user_edit.html:18 msgid "Flagged:" msgstr "Flagga:" @@ -1118,7 +1167,7 @@ msgstr "Flagga:" msgid "Follow a ward link to view only reports within that ward." msgstr "Følg ei bydellenkje for å berre sjå rapportar innanfor den bydelen." -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 msgid "For council(s):" msgstr "For administrasjon(ane):" @@ -1179,7 +1228,7 @@ msgstr "Gje meg ein RSS-straum" msgid "Go" msgstr "Hald fram" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" @@ -1228,13 +1277,16 @@ msgstr "Her er dei ulike typane lokale problemvarsel for «%s»." #: templates/web/bromley/header.html:99 #: templates/web/fixmybarangay/header.html:64 #: templates/web/fixmystreet/header.html:49 -#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:47 +#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:45 msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/update_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjult" @@ -1246,7 +1298,7 @@ msgstr "" msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/default/admin/council_edit.html:66 +#: templates/web/default/admin/body_edit.html:72 msgid "History" msgstr "Historie" @@ -1255,7 +1307,7 @@ msgstr "Historie" msgid "How to report a problem" msgstr "Korleis rapportera eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:648 +#: perllib/FixMyStreet/App/Controller/Admin.pm:656 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." @@ -1271,7 +1323,7 @@ msgstr "" "Eg er redd vi ikkje kunne verifisera den referansen, då det er for lenge " "sidan rapporten vart laga." -#: perllib/FixMyStreet/App/Controller/Tokens.pm:235 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:255 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" @@ -1279,14 +1331,17 @@ msgstr "" "Eg er redd vi ikkje kunne verifisera den referansen. Viss du kopierte " "nettadressa frå ein e-post, sjekk at du har kopiert ho korrekt.\n" -#: templates/web/default/admin/list_flagged.html:9 +#: templates/web/default/admin/flagged.html:9 #: templates/web/default/admin/list_updates.html:5 -#: templates/web/default/admin/search_reports.html:12 +#: templates/web/default/admin/reports.html:12 +#: templates/web/zurich/admin/index-dm.html:10 +#: templates/web/zurich/admin/index-dm.html:37 +#: templates/web/zurich/admin/index-sdm.html:18 msgid "ID" msgstr "ID" -#: templates/web/default/report/new/councils_text_none.html:11 -#: templates/web/default/report/new/councils_text_none.html:12 +#: templates/web/default/report/new/councils_text_none.html:8 +#: templates/web/default/report/new/councils_text_none.html:9 msgid "" "If you submit a problem here the subject and details of the problem will be " "public, but the problem will <strong>not</strong> be reported to the council." @@ -1336,19 +1391,6 @@ msgstr "Ugyldig ID" msgid "Illegal feed selection" msgstr "Ugyldig val av straum" -#: templates/web/bromley/report/display.html:80 -#: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:138 -#: templates/web/default/dashboard/index.html:140 -#: templates/web/default/report/update-form.html:30 -#: templates/web/default/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 -msgid "In Progress" -msgstr "Under arbeid" - #: templates/web/default/open311/index.html:21 msgid "" "In addition, the following attributes that are not part of the Open311 v2 " @@ -1361,7 +1403,20 @@ msgstr "" "av description), interface_used, comment_count, requestor_name (berre " "tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)." +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/report/banner.html:18 #, fuzzy msgid "In progress" msgstr "Under arbeid" @@ -1370,30 +1425,35 @@ msgstr "Under arbeid" msgid "Include unconfirmed reports" msgstr "Inkluder ikkje-stadfesta problem" -#: perllib/FixMyStreet/App/Controller/Open311.pm:356 +#: perllib/FixMyStreet/App/Controller/Open311.pm:348 msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi «%s»" -#: perllib/FixMyStreet/App/Controller/Open311.pm:341 +#: templates/web/zurich/admin/report_edit-sdm.html:18 +#: templates/web/zurich/admin/report_edit.html:38 +msgid "Internal notes:" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:333 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:952 +#: perllib/FixMyStreet/App/Controller/Admin.pm:961 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:424 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:951 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -1434,27 +1494,27 @@ msgstr "Hugs mi innlogging på denne datamaskina" msgid "Last Name" msgstr "Siste oppdatering:" -#: templates/web/default/admin/council_contacts.html:42 +#: templates/web/default/admin/body.html:40 msgid "Last editor" msgstr "Sist redigert av" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:37 msgid "Last update:" msgstr "Siste oppdatering:" -#: templates/web/default/admin/problem_row.html:26 +#: templates/web/default/admin/problem_row.html:28 msgid "Last update:" msgstr "Siste oppdatering:" -#: templates/web/default/admin/council_contacts.html:16 -#: templates/web/default/admin/council_contacts.html:18 +#: templates/web/default/admin/body.html:14 +#: templates/web/default/admin/body.html:16 msgid "List all reported problems" msgstr "Vis alle rapporterte problem" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 -#: templates/web/zurich/report/new/fill_in_details_form.html:69 +#: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Loading..." msgstr "Lastar …" @@ -1516,7 +1576,7 @@ msgstr "Melding:" msgid "Message:" msgstr "Melding:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" @@ -1528,11 +1588,12 @@ msgstr "Månad" msgid "More problems nearby" msgstr "Fleire problem i nærleiken" -#: templates/web/default/admin/list_flagged.html:11 -#: templates/web/default/admin/list_flagged.html:34 +#: 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/search_reports.html:14 -#: templates/web/default/admin/search_users.html:12 +#: 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 @@ -1542,13 +1603,16 @@ msgstr "Fleire problem i nærleiken" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:120 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 #: templates/web/fixmystreet/report/update-form.html:134 -#: templates/web/zurich/report/new/fill_in_details_form.html:118 +#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "Name" msgstr "Namn" -#: templates/web/default/admin/report_edit.html:30 -#: templates/web/default/admin/update_edit.html:23 +#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user_edit.html:10 +#: templates/web/zurich/admin/report_edit-sdm.html:20 +#: templates/web/zurich/admin/report_edit.html:43 msgid "Name:" msgstr "Namn:" @@ -1566,7 +1630,7 @@ msgstr "" "Næraste namngjevne veg til nålen plassert på kartet (automatisk generert ved " "hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:152 +#: perllib/FixMyStreet/Cobrand/UK.pm:148 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" @@ -1583,7 +1647,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:265 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 #, fuzzy msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " @@ -1603,7 +1667,12 @@ msgstr "Nesten ferdig! No må du sjekka e-posten din …" msgid "New <br>problems" msgstr "Nye problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:320 +#: perllib/FixMyStreet/App/Controller/Admin.pm:248 +#, fuzzy +msgid "New body added" +msgstr "Ny kategorikontakt lagt til" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:350 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1673,17 +1742,17 @@ msgstr "Ny tilstand" msgid "New!" msgstr "Ny!" -#: templates/web/default/admin/council_contacts.html:52 -#: templates/web/default/admin/council_contacts.html:53 -#: templates/web/default/admin/council_contacts.html:54 -#: templates/web/default/admin/council_edit.html:4 +#: 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:19 -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/update_edit.html:16 +#: templates/web/default/admin/problem_row.html:21 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:107 #: templates/web/default/questionnaire/index.html:68 @@ -1692,31 +1761,30 @@ msgstr "Ny!" msgid "No" msgstr "Nei" -#: templates/web/default/admin/stats.html:85 #: templates/web/default/admin/user_edit.html:13 +msgid "No body" +msgstr "" + +#: templates/web/default/admin/stats.html:85 msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:336 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 msgid "No council selected" msgstr "Ingen administrasjon er vald" -#: templates/web/default/admin/council_list.html:32 +#: templates/web/default/admin/edit-league.html:10 msgid "No edits have yet been made." msgstr "Ingen endringar er gjort." -#: templates/web/default/admin/list_flagged.html:26 +#: templates/web/default/admin/flagged.html:26 msgid "No flagged problems found" msgstr "Fann ingen flagga problem" -#: templates/web/default/admin/list_flagged.html:47 +#: templates/web/default/admin/flagged.html:47 msgid "No flagged users found" msgstr "Fann ingen flagga brukarar" -#: templates/web/default/admin/council_list.html:38 -msgid "No info at all" -msgstr "Heilt utan informasjon" - #: templates/web/default/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 msgid "No problems found." @@ -1731,12 +1799,13 @@ msgstr "Ingen problem er rapporterte" msgid "No supporters" msgstr "" -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/body.html:55 msgid "Non Public" msgstr "" -#: templates/web/default/admin/council_list.html:5 -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:47 msgid "None" msgstr "Ingen" @@ -1749,8 +1818,8 @@ msgstr "Ikkje rapportert tidlegare" msgid "Not reported to council" msgstr "Ikkje rapportert til administrasjonen" -#: templates/web/default/admin/council_contacts.html:43 -#: templates/web/default/admin/council_edit.html:74 +#: templates/web/default/admin/body.html:41 +#: templates/web/default/admin/body_edit.html:80 msgid "Note" msgstr "Merk" @@ -1764,8 +1833,8 @@ msgstr "" "var oppretta. Det treng vera den same månaden som rapporten var stadfesta, " "så tala kan hoppa litt opp og ned." -#: templates/web/default/admin/council_contacts.html:95 -#: templates/web/default/admin/council_edit.html:32 +#: templates/web/default/admin/body.html:92 +#: templates/web/default/admin/body_edit.html:37 msgid "Note:" msgstr "Merk:" @@ -1836,11 +1905,14 @@ msgid "Older problems" msgstr "Eldre problem" #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "Opne" @@ -1874,15 +1946,16 @@ msgstr "" "Eller du kan abonnera på varsel basert på bydel eller administrasjon du " "høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1006 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 -#: perllib/FixMyStreet/DB/Result/Problem.pm:505 -#: perllib/FixMyStreet/DB/Result/Problem.pm:515 -#: perllib/FixMyStreet/DB/Result/Problem.pm:525 -#: perllib/FixMyStreet/DB/Result/Problem.pm:537 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:664 +#: perllib/FixMyStreet/DB/Result/Problem.pm:509 +#: perllib/FixMyStreet/DB/Result/Problem.pm:519 +#: perllib/FixMyStreet/DB/Result/Problem.pm:529 +#: perllib/FixMyStreet/DB/Result/Problem.pm:541 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 +#: templates/web/zurich/report/_main.html:8 msgid "Other" msgstr "Anna" @@ -1903,8 +1976,13 @@ msgstr "Eigar" msgid "Page Not Found" msgstr "Fann ikkje sida" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/body-form.html:9 +#: templates/web/zurich/admin/body-form.html:9 +msgid "Parent" +msgstr "" + +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 msgid "Partial" msgstr "Delvis" @@ -1925,14 +2003,16 @@ msgstr "Passord:" #: templates/web/bromley/report/new/fill_in_details_form.html:183 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:148 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/report/new/fill_in_details_form.html:124 +#: templates/web/zurich/report/new/fill_in_details_form.html:120 #, fuzzy msgid "Phone number (optional)" msgstr "(valfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 -#: templates/web/default/admin/report_edit.html:32 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 +#: templates/web/default/admin/report_edit.html:33 #: templates/web/default/report/new/fill_in_details_form.html:215 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:47 msgid "Phone:" msgstr "Telefon:" @@ -1940,7 +2020,7 @@ msgstr "Telefon:" #: 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:57 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 #, fuzzy msgid "Photo" msgstr "Bilete:" @@ -1958,8 +2038,8 @@ msgstr "Bilete av nye problem i nærleiken" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:20 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -1997,16 +2077,16 @@ msgstr "Ver venleg og sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:822 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:829 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 -#: perllib/FixMyStreet/DB/Result/Problem.pm:355 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:828 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:835 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:854 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:897 +#: perllib/FixMyStreet/DB/Result/Problem.pm:358 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:361 +#: perllib/FixMyStreet/DB/Result/Problem.pm:364 msgid "Please choose a property type" msgstr "Vel ein type eigenskap" @@ -2038,7 +2118,7 @@ msgstr "" "Ikkje ver ufin — å kjefta på administrasjonen din skader verdet av " "tenesta for alle brukarane." -#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Comment.pm:147 #: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" @@ -2049,12 +2129,12 @@ msgid "Please enter a password" msgstr "Skriv inn eit passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:330 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" -#: perllib/FixMyStreet/DB/Result/User.pm:104 +#: perllib/FixMyStreet/DB/Result/User.pm:115 #: templates/web/default/js/validation_strings.html:12 #: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" @@ -2065,13 +2145,13 @@ 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:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:336 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 -#: perllib/FixMyStreet/DB/Result/User.pm:101 +#: 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/validation_strings.html:11 @@ -2083,7 +2163,7 @@ msgstr "Ver venleg og legg inn e-posten din" #: templates/web/bromley/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 -#: templates/web/zurich/report/new/fill_in_details_form.html:110 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 #, fuzzy msgid "Please enter your email address" msgstr "Ver venleg og legg inn e-posten din" @@ -2093,7 +2173,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:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:351 #: templates/web/default/js/validation_strings.html:7 #, fuzzy msgid "" @@ -2105,9 +2185,9 @@ msgstr "" "visast." #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:143 -#: perllib/FixMyStreet/DB/Result/Problem.pm:341 -#: perllib/FixMyStreet/DB/Result/User.pm:97 +#: perllib/FixMyStreet/DB/Result/Comment.pm:144 +#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "Ver venleg og legg inn namnet ditt" @@ -2176,7 +2256,7 @@ msgstr "" "skildring (og eit bilete av problemet viss du har eit), osb." #: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/report/new/fill_in_details_form.html:64 +#: templates/web/zurich/report/new/fill_in_details_form.html:60 #, fuzzy msgid "Please fill in details of the problem." msgstr "Ver venleg og fyll ut detaljar om problemet under." @@ -2184,7 +2264,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/fixmystreet/report/new/fill_in_details_form.html:35 -#: templates/web/zurich/report/new/fill_in_details_form.html:35 +#: templates/web/zurich/report/new/fill_in_details_form.html:34 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -2226,7 +2306,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/fixmystreet/report/new/fill_in_details_form.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:26 +#: templates/web/zurich/report/new/fill_in_details_form.html:25 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2312,16 +2392,18 @@ msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" #: templates/web/default/report/updates.html:21 +#: templates/web/zurich/report/updates.html:11 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Lagt inn av %s (<strong>%s</strong>) %s" #: templates/web/default/report/updates.html:23 +#: templates/web/zurich/report/updates.html:13 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: templates/web/default/admin/council_contacts.html:100 -#: templates/web/default/admin/council_edit.html:30 -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/body.html:97 +#: templates/web/default/admin/body_edit.html:35 +#: templates/web/default/admin/report_edit.html:44 msgid "Private" msgstr "" @@ -2341,11 +2423,16 @@ msgstr "Problem %s stadfesta" msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" +#: templates/web/zurich/admin/index-dm.html:11 +#, fuzzy +msgid "Problem ID" +msgstr "Problem" + #: templates/web/default/admin/index.html:28 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:849 +#: perllib/FixMyStreet/App/Controller/Admin.pm:863 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2353,7 +2440,7 @@ msgstr "Problem markert som ope." msgid "Problem state change based on survey results" msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat" -#: templates/web/default/admin/list_flagged.html:5 +#: templates/web/default/admin/flagged.html:5 msgid "Problems" msgstr "Problem" @@ -2382,15 +2469,15 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:612 +#: perllib/FixMyStreet/Cobrand/Default.pm:600 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 +#: perllib/FixMyStreet/Cobrand/UK.pm:227 msgid "Problems within %s" msgstr "Problem innanfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:245 +#: perllib/FixMyStreet/Cobrand/UK.pm:241 msgid "Problems within %s ward" msgstr "Problem innanfor %s bydel" @@ -2409,7 +2496,7 @@ msgstr "Problem innanfor grensene av:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Eigedomar nyleg rapportert som tilbake i bruk på reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 msgid "Property type:" msgstr "Type eigenskap:" @@ -2448,8 +2535,8 @@ msgstr "" "enklare for deg å rapportera problem, leggja inn oppdateringar og halda " "oversyn over rapportane dine" -#: templates/web/default/admin/council_contacts.html:44 -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/body.html:42 +#: templates/web/default/admin/body.html:55 msgid "Public" msgstr "" @@ -2489,23 +2576,23 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren" msgid "RSS feed" msgstr "RSS-straum" -#: perllib/FixMyStreet/Cobrand/UK.pm:274 perllib/FixMyStreet/Cobrand/UK.pm:286 +#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 msgid "RSS feed for %s" msgstr "RSS-straum for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed for %s ward, %s" msgstr "RSS-straum for %s bydel, %s" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:178 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 -#: perllib/FixMyStreet/Cobrand/UK.pm:300 perllib/FixMyStreet/Cobrand/UK.pm:312 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 +#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 msgid "RSS feed of %s" msgstr "RSS-straum frå %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:305 perllib/FixMyStreet/Cobrand/UK.pm:317 +#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:313 msgid "RSS feed of %s, within %s ward" msgstr "RSS-straum av %s, innanfor %s bydel" @@ -2518,15 +2605,15 @@ msgstr "RSS-straum med problem i nærleiken" msgid "RSS feed of problems in this %s" msgstr "RSS-straum for problem i denne %s-en" -#: perllib/FixMyStreet/Cobrand/Default.pm:613 +#: perllib/FixMyStreet/Cobrand/Default.pm:601 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 -#: perllib/FixMyStreet/Cobrand/UK.pm:238 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 +#: perllib/FixMyStreet/Cobrand/UK.pm:234 msgid "RSS feed of problems within %s" msgstr "RSS-straum for problem innanfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:244 +#: perllib/FixMyStreet/Cobrand/UK.pm:240 msgid "RSS feed of problems within %s ward" msgstr "RSS-straum for problem innanfor %s bydel" @@ -2594,8 +2681,10 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:54 -#: templates/web/default/admin/update_edit.html:48 +#: templates/web/default/admin/report_edit.html:55 +#: templates/web/default/admin/update_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilete (kan ikkje gjerast om!)" @@ -2643,45 +2732,55 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:524 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" +#: templates/web/zurich/report/_main.html:11 +#, fuzzy +msgid "Reported at %s" +msgstr "Rapportert %s" + #: templates/web/default/admin/questionnaire.html:5 #: templates/web/default/questionnaire/index.html:77 #: templates/web/fixmystreet/questionnaire/index.html:71 msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:516 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:543 +#: perllib/FixMyStreet/DB/Result/Problem.pm:547 #: 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:534 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported by %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 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:528 +#: perllib/FixMyStreet/DB/Result/Problem.pm:532 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:516 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:538 +#: templates/web/zurich/report/_main.html:9 +#, fuzzy +msgid "Reported in the %s category at %s" +msgstr "Rapportert i kategorien %s av %s %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:542 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2697,7 +2796,8 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1033 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: templates/web/zurich/admin/header.html:14 #, fuzzy msgid "Reports" msgstr "Alle rapportar" @@ -2706,7 +2806,7 @@ msgstr "Alle rapportar" msgid "Reports on and around the map" msgstr "Problem i og rundt kartet" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "Resend report" msgstr "Send rapport på nytt" @@ -2722,24 +2822,34 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" -#: templates/web/default/admin/council_edit.html:63 +#: templates/web/default/admin/body_edit.html:69 msgid "Save changes" msgstr "Lagra endringar" -#: templates/web/default/admin/list_flagged.html:1 -#: templates/web/default/admin/search_reports.html:1 +#: templates/web/default/admin/flagged.html:1 +#: templates/web/default/admin/reports.html:1 msgid "Search Reports" msgstr "Søk i rapportar" -#: templates/web/default/admin/search_users.html:1 +#: templates/web/default/admin/users.html:1 msgid "Search Users" msgstr "Søk i brukarar" -#: templates/web/default/admin/search_reports.html:5 -#: templates/web/default/admin/search_users.html:5 +#: templates/web/default/admin/reports.html:5 +#: templates/web/default/admin/users.html:5 msgid "Search:" msgstr "Søk:" +#: templates/web/default/admin/body-form.html:11 +#: templates/web/zurich/admin/body-form.html:11 +msgid "Select a body" +msgstr "" + +#: templates/web/default/admin/body-form.html:21 +#: templates/web/zurich/admin/body-form.html:21 +msgid "Select an area" +msgstr "" + #: templates/web/default/alert/_list.html:8 #: templates/web/fixmystreet/alert/_list.html:10 msgid "" @@ -2749,15 +2859,19 @@ 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:623 +#: templates/web/zurich/admin/report_edit-sdm.html:15 +msgid "Send back to division" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "Sent:" msgstr "Sendt:" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:38 msgid "Service:" msgstr "Teneste:" @@ -2812,7 +2926,7 @@ msgstr "Vis nåler" #: templates/web/fixmystreet/auth/general.html:42 #: templates/web/fixmystreet/auth/general.html:62 #: templates/web/fixmystreet/header.html:53 -#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:51 +#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:49 msgid "Sign in" msgstr "Logg inn" @@ -2862,11 +2976,7 @@ msgstr "Nokre bilete av nyleg melde problem" msgid "Some text to localize" msgstr "Noko tekst å omsetja" -#: templates/web/default/admin/council_list.html:42 -msgid "Some unconfirmeds" -msgstr "Nokre ustadfesta" - -#: perllib/FixMyStreet/Cobrand/UK.pm:89 +#: perllib/FixMyStreet/Cobrand/UK.pm:93 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2911,20 +3021,22 @@ msgid "Start month:" msgstr "Startmånad:" #: templates/web/bromley/report/display.html:78 -#: templates/web/default/admin/list_flagged.html:18 +#: templates/web/default/admin/flagged.html:18 #: templates/web/default/admin/list_updates.html:6 -#: templates/web/default/admin/search_reports.html:21 +#: templates/web/default/admin/reports.html:21 #: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "Tilstand" -#: templates/web/default/admin/report_edit.html:17 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1047 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" @@ -2944,6 +3056,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/zurich/admin/report_edit.html:13 msgid "Subject:" msgstr "Emne:" @@ -2957,13 +3070,16 @@ msgstr "Emne:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:152 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:177 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:222 -#: templates/web/zurich/report/new/fill_in_details_form.html:128 +#: templates/web/zurich/report/new/fill_in_details_form.html:125 msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:57 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/report_edit.html:58 +#: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user_edit.html:20 +#: templates/web/zurich/admin/report_edit-sdm.html:31 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringar" @@ -2972,6 +3088,13 @@ msgstr "Send inn endringar" msgid "Submit questionnaire" msgstr "Send inn spørjeskjema" +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/report/banner.html:15 +#, fuzzy +msgid "Submitted" +msgstr "Send inn" + #: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:38 @@ -2993,8 +3116,11 @@ msgstr "" "Eller du kan abonnera på varsel basert på bydel eller administrasjon du " "høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1031 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 #: templates/web/default/admin/index.html:1 +#: templates/web/zurich/admin/header.html:11 +#: templates/web/zurich/admin/index-dm.html:1 +#: templates/web/zurich/admin/index-sdm.html:1 msgid "Summary" msgstr "Oppsummering" @@ -3006,7 +3132,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1044 #, fuzzy msgid "Survey" msgstr "Resultat frå spørjeundersøkinga" @@ -3016,14 +3142,16 @@ msgid "Survey Results" msgstr "Resultat frå spørjeundersøkinga" #: templates/web/default/admin/list_updates.html:14 +#: templates/web/zurich/admin/index-dm.html:13 msgid "Text" msgstr "Tekst" -#: templates/web/default/admin/council_contacts.html:20 +#: templates/web/default/admin/body.html:18 msgid "Text only version" msgstr "Tekst-utgåve" -#: templates/web/default/admin/update_edit.html:13 +#: templates/web/default/admin/update_edit.html:14 +#: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "Tekst:" @@ -3129,11 +3257,11 @@ msgstr "" "Den staden synest ikkje å vera i Storbritannia. Ver venleg og prøv igjen." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:82 +#: perllib/FixMyStreet/Cobrand/UK.pm:86 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:616 +#: perllib/FixMyStreet/App/Controller/Admin.pm:624 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." @@ -3213,8 +3341,7 @@ msgstr "" "Detaljane om problemet ditt er tilgjengelege på høgre kant av denne sida." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:43 -#: perllib/FixMyStreet/App/Controller/Reports.pm:74 +#: perllib/FixMyStreet/App/Controller/Reports.pm:50 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3319,7 +3446,7 @@ msgstr "" "Tittelen og detaljane for problemet vil verta offentlege, pluss namnet ditt\n" "viss du gjev oss lov til det." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:271 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:273 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -3327,7 +3454,7 @@ msgstr "" "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt " "staden dei skreiv inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:71 +#: perllib/FixMyStreet/App/Controller/Reports.pm:47 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3341,7 +3468,7 @@ msgstr "" "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv " "igjen seinare." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:736 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3375,6 +3502,12 @@ msgstr "Det var problem med rapporten din. Ver venleg og sjå under." msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." +#: templates/web/zurich/admin/report_edit.html:26 +#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/report/banner.html:12 +msgid "Third party" +msgstr "" + #: templates/web/default/open311/index.html:10 msgid "" "This API implementation is work in progress and not yet stabilized. It will " @@ -3383,7 +3516,7 @@ msgstr "" "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil " "endra seg utan åtvaring i framtida." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3396,7 +3529,7 @@ msgstr "" "eller gjev oss melding om kva for ein kategori av problem dette er så vi kan " "leggja det til i systemet vårt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:345 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 " @@ -3407,8 +3540,8 @@ msgstr "" "og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera " "denne saka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:868 -#: perllib/FixMyStreet/Cobrand/UK.pm:54 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 +#: perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -3474,6 +3607,11 @@ msgstr "Dette problemet er under arbeid" msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammalt og med ukjend status." +#: templates/web/zurich/report/_main.html:21 +#, fuzzy +msgid "This report is awaiting moderation." +msgstr "Denne rapporten er for tida markert som open." + #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tida markert som lukka." @@ -3486,19 +3624,21 @@ msgstr "Denne rapporten er for tida markert som fiksa." msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:266 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" -#: templates/web/default/admin/list_flagged.html:10 -#: templates/web/default/admin/search_reports.html:13 +#: templates/web/default/admin/flagged.html:10 +#: templates/web/default/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:38 +#: templates/web/zurich/admin/index-sdm.html:19 msgid "Title" msgstr "Tittel" @@ -3527,7 +3667,7 @@ msgid "" msgstr "" "Du finn lokale problem ved å søkja på postnummeret ditt, vegnamn eller stad:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:270 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:272 msgid "To view a map of the precise location of this issue" msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" @@ -3538,14 +3678,10 @@ msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" msgid "Total" msgstr "Totalt" -#: perllib/FixMyStreet/App/Controller/Reports.pm:42 -msgid "Unable to look up areas in MaPit. Please try again later." -msgstr "" -"Klarte ikkje slå opp område i MaPit. Ver venleg og prøv igjen seinare." - -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:21 -#: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/update_edit.html:22 +#: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Ikkje stadfesta" @@ -3582,6 +3718,12 @@ msgstr "Oppdateringa under vart lagt inn anonymt %s" msgid "Update below added by %s at %s" msgstr "Oppdateringa under vart lagt til av %s %s" +#: templates/web/default/admin/body-form.html:77 +#: templates/web/zurich/admin/body-form.html:41 +#, fuzzy +msgid "Update body" +msgstr "Oppdatert!" + #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" msgstr "Tilstandsfordeling for oppdateringar" @@ -3590,29 +3732,32 @@ msgstr "Tilstandsfordeling for oppdateringar" msgid "Update by {{name}}" msgstr "Oppdatert av {{name}}" -#: templates/web/default/admin/update_edit.html:33 +#: templates/web/default/admin/update_edit.html:36 +#: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Ei oppdatering endra problemstatusen til %s" -#: templates/web/default/admin/update_edit.html:35 +#: templates/web/default/admin/update_edit.html:38 msgid "Update marked problem as fixed" msgstr "Ei oppdatering markerte dette problemet som fiksa." -#: templates/web/default/admin/update_edit.html:37 +#: templates/web/default/admin/update_edit.html:40 msgid "Update reopened problem" msgstr "Ei oppdatering gjenopna problemet" -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/body.html:65 msgid "Update statuses" msgstr "Oppdater tilstanden" #: templates/web/default/report/update-form.html:22 +#: templates/web/zurich/admin/report_edit-sdm.html:26 msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:839 -#: perllib/FixMyStreet/App/Controller/Admin.pm:899 +#: perllib/FixMyStreet/App/Controller/Admin.pm:720 +#: perllib/FixMyStreet/App/Controller/Admin.pm:853 +#: perllib/FixMyStreet/App/Controller/Admin.pm:912 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:171 msgid "Updated!" msgstr "Oppdatert!" @@ -3635,26 +3780,30 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringar til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1163 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1172 msgid "User flagged" msgstr "Brukar flagga" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 -#: templates/web/default/admin/list_flagged.html:30 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 +#: templates/web/default/admin/flagged.html:30 +#: templates/web/zurich/admin/header.html:17 msgid "Users" msgstr "Brukarar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:375 msgid "Values updated" 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:12 +#: templates/web/zurich/admin/report_edit.html:12 +#: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Sjå rapport på nettstaden" @@ -3722,7 +3871,7 @@ msgstr "(vi viser aldri e-postadressa di)" #: templates/web/bromley/report/new/fill_in_details_form.html:179 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:144 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 -#: templates/web/zurich/report/new/fill_in_details_form.html:114 +#: templates/web/zurich/report/new/fill_in_details_form.html:110 #, fuzzy msgid "We never show your email address or phone number." msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" @@ -3780,17 +3929,17 @@ msgstr "" "Vi ynskjer å få tilbakemelding frå deg om kva du meiner om denne tenesta. " "Berre fyll ut skjemaet, eller send ein e-post <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:45 -#: templates/web/default/admin/council_edit.html:69 +#: templates/web/default/admin/body.html:43 +#: templates/web/default/admin/body_edit.html:75 msgid "When edited" msgstr "Når redigert" -#: templates/web/default/admin/list_flagged.html:19 -#: templates/web/default/admin/search_reports.html:22 +#: templates/web/default/admin/flagged.html:19 +#: templates/web/default/admin/reports.html:22 msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 msgid "Whole block of empty flats" msgstr "Heil blokk med tomme leilegheiter" @@ -3846,18 +3995,18 @@ msgstr "" msgid "Year" msgstr "År" -#: templates/web/default/admin/council_contacts.html:52 -#: templates/web/default/admin/council_contacts.html:53 -#: templates/web/default/admin/council_contacts.html:54 -#: templates/web/default/admin/council_edit.html:5 +#: 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:19 -#: templates/web/default/admin/report_edit.html:27 -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/search_users.html:23 -#: templates/web/default/admin/update_edit.html:15 +#: templates/web/default/admin/problem_row.html:21 +#: templates/web/default/admin/report_edit.html:28 +#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/users.html:23 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:105 #: templates/web/default/questionnaire/index.html:66 @@ -3900,12 +4049,18 @@ msgstr "" "Du kan <a href=\"%s\">sjå alle rapportar for administrasjonen</a> eller <a " "href=\"/reports\">sjå alle administrasjonane</a>." +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:8 +#, fuzzy +msgid "You can <a href=\"%s%s\">view the problem on this site</a>." +msgstr ". Du kan <a href=\"%s\">lesa om problemet på portalen</a>." + #: templates/web/emptyhomes/reports/body.html:66 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Du kan <a href=\"/reports/\">sjå alle administrasjonar</a>." -#: templates/web/default/report/new/councils_text_none.html:14 -#: templates/web/default/report/new/councils_text_none.html:16 +#: templates/web/default/report/new/councils_text_none.html:11 +#: templates/web/default/report/new/councils_text_none.html:13 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 msgid "" @@ -3929,7 +4084,7 @@ msgstr "" #: 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/zurich/report/new/fill_in_details_form.html:93 +#: templates/web/zurich/report/new/fill_in_details_form.html:89 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -3955,7 +4110,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/fixmystreet/report/new/fill_in_details_form.html:28 -#: templates/web/zurich/report/new/fill_in_details_form.html:28 +#: templates/web/zurich/report/new/fill_in_details_form.html:27 #, fuzzy msgid "" "You have located the problem at the point marked with a green pin on the " @@ -3968,6 +4123,12 @@ msgstr "" msgid "You have successfully confirmed your alert." msgstr "Du har no stadfesta varselet ditt." +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:6 +#, fuzzy +msgid "You have successfully confirmed your email address." +msgstr "Du har no stadfesta varselet ditt." + #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 msgid "You have successfully confirmed your problem" @@ -3990,7 +4151,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:743 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " @@ -4007,7 +4168,7 @@ msgstr "" "Du må no opna lenkja i e-posten vi akkurat sende deg — dersom du ikkje " "gjer det, %s" -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:36 msgid "You really want to resend?" msgstr "Ynskjer du verkeleg å senda på nytt?" @@ -4029,7 +4190,7 @@ msgstr "Rapportane dine" #: templates/web/fixmystreet/report/display.html:55 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:157 -#: templates/web/zurich/report/new/fill_in_details_form.html:106 +#: templates/web/zurich/report/new/fill_in_details_form.html:102 #, fuzzy msgid "Your email" msgstr "E-posten din" @@ -4080,7 +4241,7 @@ msgstr "Namnet ditt:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:202 #: templates/web/fixmystreet/report/update-form.html:138 -#: templates/web/zurich/report/new/fill_in_details_form.html:122 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 #, fuzzy msgid "Your name" msgstr "Namnet ditt:" @@ -4109,7 +4270,7 @@ msgstr "Passordet ditt har vorte endra" #: templates/web/bromley/report/new/fill_in_details_form.html:184 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:216 -#: templates/web/zurich/report/new/fill_in_details_form.html:125 +#: templates/web/zurich/report/new/fill_in_details_form.html:121 msgid "Your phone number" msgstr "" @@ -4146,11 +4307,13 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:609 msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "didn't use map" msgstr "brukte ikkje kart" @@ -4168,6 +4331,7 @@ msgid "less than a minute" msgstr "mindre enn eitt minutt" #: templates/web/default/report/updates.html:27 +#: templates/web/zurich/report/updates.html:16 msgid "marked as %s" msgstr "markert som %s" @@ -4175,7 +4339,7 @@ msgstr "markert som %s" msgid "marked as fixed" msgstr "markert som løyst" -#: perllib/FixMyStreet/App/Controller/Admin.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin.pm:127 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" @@ -4191,15 +4355,18 @@ msgstr "eller" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "originally entered" msgstr "søkte etter" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 msgid "other areas:" msgstr "andre område:" #: templates/web/default/report/updates.html:26 +#: templates/web/zurich/report/updates.html:15 msgid "reopened" msgstr "opna på nytt" @@ -4207,7 +4374,7 @@ msgstr "opna på nytt" #: templates/web/bromley/header.html:65 #: templates/web/fixmybarangay/header.html:65 #: templates/web/fixmystreet/header.html:50 -#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:48 +#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:46 #, fuzzy msgid "sign out" msgstr "Logg ut" @@ -4224,10 +4391,11 @@ msgid "the local council" msgstr "den lokale administrasjonen" #: templates/web/default/report/_main.html:6 +#: templates/web/zurich/report/_main.html:14 msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:333 msgid "this type of local problem" msgstr "denne typen lokalt problem" @@ -4235,15 +4403,17 @@ msgstr "denne typen lokalt problem" msgid "today" msgstr "i dag" -#: templates/web/default/admin/report_edit.html:15 +#: templates/web/default/admin/report_edit.html:16 +#: templates/web/zurich/admin/report_edit-sdm.html:14 +#: templates/web/zurich/admin/report_edit.html:16 msgid "used map" msgstr "brukte kart" -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/update_edit.html:29 msgid "user is from same council as problem - %d" msgstr "brukaren er frå same administrasjon som problemet – %d" -#: templates/web/default/admin/update_edit.html:29 +#: templates/web/default/admin/update_edit.html:32 msgid "user is problem owner" msgstr "brukaren er eigaren av problemet" @@ -4365,6 +4535,40 @@ msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dag" +#~ msgid "All confirmed" +#~ msgstr "Alle stadfesta" + +#~ msgid "Configuration updated" +#~ msgstr "Oppsett oppdatert" + +#~ msgid "Configure Open311" +#~ msgstr "Sett opp Open311" + +#~ msgid "Configure Open311 integration" +#~ msgstr "Sett opp Open311-integrasjon" + +#~ msgid "Council contacts" +#~ msgstr "Administrasjonskontaktar" + +#~ msgid "Councils" +#~ msgstr "Administrasjonar" + +#~ msgid "Currently has 1+ deleted" +#~ msgstr "For tida har 1+ sletta" + +#~ msgid "In Progress" +#~ msgstr "Under arbeid" + +#~ msgid "No info at all" +#~ msgstr "Heilt utan informasjon" + +#~ msgid "Some unconfirmeds" +#~ msgstr "Nokre ustadfesta" + +#~ msgid "Unable to look up areas in MaPit. Please try again later." +#~ msgstr "" +#~ "Klarte ikkje slå opp område i MaPit. Ver venleg og prøv igjen seinare." + #~ msgid "FixMyStreet administration" #~ msgstr "Fiksgatami-administrasjon" |